Merge master.

[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 588e9fc3d2632c645cff1fa9d2585141f3b76fdc..f3c55b208db152bd866eed8a44f550ff2c20c957 100644 (file)
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -21,12 +21,13 @@
 #include "analyse_audio_job.h"
 #include "compose.hpp"
 #include "film.h"
-#include "options.h"
-#include "decoder_factory.h"
-#include "audio_decoder.h"
+#include "player.h"
+
+#include "i18n.h"
 
 using std::string;
 using std::max;
+using std::min;
 using std::cout;
 using boost::shared_ptr;
 
@@ -43,35 +44,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<Player> player = _film->player ();
+       player->disable_video ();
        
-       decoders.audio->set_audio_stream (_film->audio_stream ());
-       decoders.audio->Audio.connect (bind (&AnalyseAudioJob::audio, this, _1));
+       player->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), _film->audio_length() / _num_points);
 
-       _current.resize (_film->audio_stream()->channels ());
-       _analysis.reset (new AudioAnalysis (_film->audio_stream()->channels()));
+       _current.resize (MAX_AUDIO_CHANNELS);
+       _analysis.reset (new AudioAnalysis (MAX_AUDIO_CHANNELS));
                         
-       while (!decoders.audio->pass()) {
-               set_progress (float (_done) / total_audio_frames);
+       while (!player->pass()) {
+               set_progress (float (_done) / _film->audio_length ());
        }
 
        _analysis->write (_film->audio_analysis_path ());
@@ -81,7 +71,7 @@ AnalyseAudioJob::run ()
 }
 
 void
-AnalyseAudioJob::audio (shared_ptr<AudioBuffers> b)
+AnalyseAudioJob::audio (shared_ptr<const AudioBuffers> b)
 {
        for (int i = 0; i < b->frames(); ++i) {
                for (int j = 0; j < b->channels(); ++j) {
@@ -95,8 +85,7 @@ AnalyseAudioJob::audio (shared_ptr<AudioBuffers> b)
                        _current[j][AudioPoint::PEAK] = max (_current[j][AudioPoint::PEAK], fabsf (s));
 
                        if ((_done % _samples_per_point) == 0) {
-                               _current[j][AudioPoint::RMS] = 20 * log10 (sqrt (_current[j][AudioPoint::RMS] / _samples_per_point));
-                               _current[j][AudioPoint::PEAK] = 20 * log10 (_current[j][AudioPoint::PEAK]);
+                               _current[j][AudioPoint::RMS] = sqrt (_current[j][AudioPoint::RMS] / _samples_per_point);
                                _analysis->add_point (j, _current[j]);
                                
                                _current[j] = AudioPoint ();