Optimise checking of existing image data.

[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 1cec15c2af94a0aadecbfe91480a3681b81920d4..c863c6c68529366bb6403b0b2222cf662fc95cff 100644 (file)
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -20,6 +20,7 @@
 #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"
@@ -42,12 +43,18 @@ AnalyseAudioJob::AnalyseAudioJob (shared_ptr<const Film> film, shared_ptr<const
        , _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
 {
@@ -65,11 +72,13 @@ AnalyseAudioJob::run ()
 {
        shared_ptr<Player> player (new Player (_film, _playlist));
        player->set_ignore_video ();
+       player->set_fast ();
 
-       int64_t const len = _playlist->length().frames (_film->audio_frame_rate());
+       int64_t const len = _playlist->length().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;
@@ -89,6 +98,16 @@ AnalyseAudioJob::run ()
        }
 
        _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);
@@ -98,19 +117,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) {
@@ -118,14 +138,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;
 }