Runs.

[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 5623fdfcc8a462d68e95f53771983e2ceeae6a0b..74491943b2eb8d0d3ebbc27a49f37e36b8b45937 100644 (file)
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -22,18 +22,20 @@
 #include "compose.hpp"
 #include "film.h"
 #include "options.h"
-#include "decoder_factory.h"
-#include "audio_decoder.h"
+#include "playlist.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,35 +45,24 @@ 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
 AnalyseAudioJob::run ()
 {
-       if (!_film->audio_stream () || !_film->length()) {
-               set_progress (1);
-               set_state (FINISHED_ERROR);
-               return;
-       }
-               
-       DecodeOptions options;
-       options.decode_video = false;
-
-       Decoders decoders = decoder_factory (_film, options);
-       assert (decoders.audio);
+       shared_ptr<Playlist> playlist = _film->playlist ();
+       playlist->disable_video ();
        
-       decoders.audio->set_audio_stream (_film->audio_stream ());
-       decoders.audio->Audio.connect (bind (&AnalyseAudioJob::audio, this, _1));
+       playlist->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;
+       _samples_per_point = max (int64_t (1), playlist->audio_length() / _num_points);
 
-       _current.resize (_film->audio_stream()->channels ());
-       _analysis.reset (new AudioAnalysis (_film->audio_stream()->channels()));
+       _current.resize (playlist->audio_channels ());
+       _analysis.reset (new AudioAnalysis (playlist->audio_channels()));
                         
-       while (!decoders.audio->pass()) {
-               set_progress (float (_done) / total_audio_frames);
+       while (!playlist->pass()) {
+               set_progress (float (_done) / playlist->audio_length ());
        }
 
        _analysis->write (_film->audio_analysis_path ());
@@ -85,24 +76,24 @@ AnalyseAudioJob::audio (shared_ptr<AudioBuffers> b)
 {
        for (int i = 0; i < b->frames(); ++i) {
                for (int j = 0; j < b->channels(); ++j) {
-                       float const s = b->data(j)[i];
+                       float s = b->data(j)[i];
+                       if (fabsf (s) < 10e-7) {
+                               /* stringstream can't serialise and recover inf or -inf, so prevent such
+                                  values by replacing with this (140dB down) */
+                               s = 10e-7;
+                       }
                        _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;
+       }
 }