Merge branch 'master' of /home/carl/git/dvdomatic

[dcpomatic.git] / src / lib / analyse_audio_job.cc

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index 190d2a5d96ace73ae7b34dccdbab876cd3333859..92c3cdd4e5a88709b94c285c91bc67b0659a2415 100644 (file)
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -25,15 +25,18 @@
 #include "decoder_factory.h"
 #include "audio_decoder.h"
 
+#include "i18n.h"
+
 using std::string;
 using std::max;
+using std::min;
+using std::cout;
 using boost::shared_ptr;
 
 int const AnalyseAudioJob::_num_points = 1024;
 
 AnalyseAudioJob::AnalyseAudioJob (shared_ptr<Film> f)
        : Job (f)
-       , _done_for_this_point (0)
        , _done (0)
        , _samples_per_point (1)
 {
@@ -43,7 +46,7 @@ AnalyseAudioJob::AnalyseAudioJob (shared_ptr<Film> f)
 string
 AnalyseAudioJob::name () const
 {
-       return String::compose ("Analyse audio of %1", _film->name());
+       return String::compose (_("Analyse audio of %1"), _film->name());
 }
 
 void
@@ -64,8 +67,8 @@ AnalyseAudioJob::run ()
        decoders.audio->set_audio_stream (_film->audio_stream ());
        decoders.audio->Audio.connect (bind (&AnalyseAudioJob::audio, this, _1));
 
-       int64_t total_audio_frames = video_frames_to_audio_frames (_film->length().get(), _film->audio_stream()->sample_rate(), _film->frames_per_second());
-       _samples_per_point = total_audio_frames / _num_points;
+       int64_t total_audio_frames = video_frames_to_audio_frames (_film->length().get(), _film->audio_stream()->sample_rate(), _film->source_frame_rate());
+       _samples_per_point = max (1L, total_audio_frames / _num_points);
 
        _current.resize (_film->audio_stream()->channels ());
        _analysis.reset (new AudioAnalysis (_film->audio_stream()->channels()));
@@ -94,20 +97,15 @@ AnalyseAudioJob::audio (shared_ptr<AudioBuffers> b)
                        _current[j][AudioPoint::RMS] += pow (s, 2);
                        _current[j][AudioPoint::PEAK] = max (_current[j][AudioPoint::PEAK], fabsf (s));
 
-                       if (_done_for_this_point == _samples_per_point) {
-                               _current[j][AudioPoint::RMS] = 20 * log10 (sqrt (_current[j][AudioPoint::RMS] / _samples_per_point));
-                               _current[j][AudioPoint::PEAK] = 20 * log10 (_current[j][AudioPoint::PEAK]);
-                               
+                       if ((_done % _samples_per_point) == 0) {
+                               _current[j][AudioPoint::RMS] = sqrt (_current[j][AudioPoint::RMS] / _samples_per_point);
                                _analysis->add_point (j, _current[j]);
                                
-                               _done_for_this_point = 0;
                                _current[j] = AudioPoint ();
                        }
                }
-               
-               ++_done_for_this_point;
-       }
 
-       _done += b->frames ();
+               ++_done;
+       }
 }