Logging improvements to allow prettier displays in the server GUI.

[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 b17dd07dcb0869cb1891aecbe7068319a433a1f0..525ac6c911d9940fb0eb09ece3c2a344cda3d7b0 100644 (file)
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -20,10 +20,13 @@
 #include "audio_analysis.h"
 #include "audio_buffers.h"
 #include "analyse_audio_job.h"
+#include "audio_content.h"
 #include "compose.hpp"
 #include "film.h"
 #include "player.h"
+#include "playlist.h"
 #include <boost/foreach.hpp>
+#include <iostream>
 
 #include "i18n.h"
 
@@ -36,17 +39,23 @@ using boost::dynamic_pointer_cast;
 
 int const AnalyseAudioJob::_num_points = 1024;
 
-AnalyseAudioJob::AnalyseAudioJob (shared_ptr<const Film> f, shared_ptr<const Playlist> p)
-       : Job (f)
-       , _playlist (p)
+AnalyseAudioJob::AnalyseAudioJob (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist)
+       : Job (film)
+       , _playlist (playlist)
        , _done (0)
        , _samples_per_point (1)
+       , _current (0)
        , _overall_peak (0)
        , _overall_peak_frame (0)
 {
 
 }
 
+AnalyseAudioJob::~AnalyseAudioJob ()
+{
+       delete[] _current;
+}
+
 string
 AnalyseAudioJob::name () const
 {
@@ -64,15 +73,21 @@ AnalyseAudioJob::run ()
 {
        shared_ptr<Player> player (new Player (_film, _playlist));
        player->set_ignore_video ();
-       
-       int64_t const len = _film->length().frames (_film->audio_frame_rate());
+       player->set_fast ();
+       player->set_play_referenced ();
+
+       DCPTime const start = _playlist->start().get_value_or (DCPTime ());
+       DCPTime const length = _playlist->length ();
+
+       Frame const len = DCPTime (length - start).frames_round (_film->audio_frame_rate());
        _samples_per_point = max (int64_t (1), len / _num_points);
 
-       _current.resize (_film->audio_channels ());
+       delete[] _current;
+       _current = new AudioPoint[_film->audio_channels ()];
        _analysis.reset (new AudioAnalysis (_film->audio_channels ()));
 
        bool has_any_audio = false;
-       BOOST_FOREACH (shared_ptr<Content> c, _film->content ()) {
+       BOOST_FOREACH (shared_ptr<Content> c, _playlist->content ()) {
                if (dynamic_pointer_cast<AudioContent> (c)) {
                        has_any_audio = true;
                }
@@ -81,15 +96,25 @@ AnalyseAudioJob::run ()
        if (has_any_audio) {
                _done = 0;
                DCPTime const block = DCPTime::from_seconds (1.0 / 8);
-               for (DCPTime t; t < _film->length(); t += block) {
+               for (DCPTime t = start; t < length; t += block) {
                        analyse (player->get_audio (t, block, false));
-                       set_progress (t.seconds() / _film->length().seconds());
+                       set_progress ((t.seconds() - start.seconds()) / (length.seconds() - start.seconds()));
                }
        }
 
        _analysis->set_peak (_overall_peak, DCPTime::from_frames (_overall_peak_frame, _film->audio_frame_rate ()));
+
+       if (_playlist->content().size() == 1) {
+               /* If there was only one piece of content in this analysis we may later need to know what its
+                  gain was when we analysed it.
+               */
+               shared_ptr<const AudioContent> ac = dynamic_pointer_cast<const AudioContent> (_playlist->content().front ());
+               DCPOMATIC_ASSERT (ac);
+               _analysis->set_analysis_gain (ac->audio_gain ());
+       }
+
        _analysis->write (_film->audio_analysis_path (_playlist));
-       
+
        set_progress (1);
        set_state (FINISHED_OK);
 }
@@ -97,19 +122,20 @@ AnalyseAudioJob::run ()
 void
 AnalyseAudioJob::analyse (shared_ptr<const AudioBuffers> b)
 {
-       for (int i = 0; i < b->frames(); ++i) {
-               for (int j = 0; j < b->channels(); ++j) {
-                       float s = b->data(j)[i];
-                       if (fabsf (s) < 10e-7) {
+       int const frames = b->frames ();
+       int const channels = b->channels ();
+
+       for (int j = 0; j < channels; ++j) {
+               float* data = b->data(j);
+               for (int i = 0; i < frames; ++i) {
+                       float s = data[i];
+                       float as = fabsf (s);
+                       if (as < 10e-7) {
                                /* SafeStringStream can't serialise and recover inf or -inf, so prevent such
                                   values by replacing with this (140dB down) */
-                               s = 10e-7;
+                               s = as = 10e-7;
                        }
                        _current[j][AudioPoint::RMS] += pow (s, 2);
-                       _current[j][AudioPoint::PEAK] = max (_current[j][AudioPoint::PEAK], fabsf (s));
-
-                       float const as = fabs (s);
-
                        _current[j][AudioPoint::PEAK] = max (_current[j][AudioPoint::PEAK], as);
 
                        if (as > _overall_peak) {
@@ -117,15 +143,13 @@ AnalyseAudioJob::analyse (shared_ptr<const AudioBuffers> b)
                                _overall_peak_frame = _done + i;
                        }
 
-                       if ((_done % _samples_per_point) == 0) {
+                       if (((_done + i) % _samples_per_point) == 0) {
                                _current[j][AudioPoint::RMS] = sqrt (_current[j][AudioPoint::RMS] / _samples_per_point);
                                _analysis->add_point (j, _current[j]);
-
                                _current[j] = AudioPoint ();
                        }
                }
-
-               ++_done;
        }
-}
 
+       _done += frames;
+}