X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fanalyse_audio_job.cc;h=e4a100c4a3fd92265635448538ec4b2f3f894551;hp=9fce354df81d13054c5bc1efea2240c0db267a5a;hb=a5be11a965c2c38442e4e069874e7e21b5b43a5c;hpb=54038beb4437c027e584fc95110f6fd4dbf2207d

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index 9fce354df..e4a100c4a 100644
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -50,9 +50,12 @@ using boost::dynamic_pointer_cast;
 
 int const AnalyseAudioJob::_num_points = 1024;
 
-AnalyseAudioJob::AnalyseAudioJob (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist)
+/** @param from_zero true to analyse audio from time 0 in the playlist, otherwise begin at Playlist::start */
+AnalyseAudioJob::AnalyseAudioJob (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist, bool from_zero)
 	: Job (film)
 	, _playlist (playlist)
+	, _path (film->audio_analysis_path(playlist))
+	, _from_zero (from_zero)
 	, _done (0)
 	, _samples_per_point (1)
 	, _current (0)
@@ -66,6 +69,15 @@ AnalyseAudioJob::AnalyseAudioJob (shared_ptr<const Film> film, shared_ptr<const
 	_filters.push_back (new Filter ("ebur128", "ebur128", "audio", "ebur128=peak=true"));
 	_ebur128->setup (_filters);
 #endif
+
+	for (int i = 0; i < film->audio_channels(); ++i) {
+		_sample_peak[i] = 0;
+		_sample_peak_frame[i] = 0;
+	}
+
+	if (!_from_zero) {
+		_start = _playlist->start().get_value_or(DCPTime());
+	}
 }
 
 AnalyseAudioJob::~AnalyseAudioJob ()
@@ -81,7 +93,7 @@ AnalyseAudioJob::~AnalyseAudioJob ()
 string
 AnalyseAudioJob::name () const
 {
-	return _("Analyse audio");
+	return _("Analysing audio");
 }
 
 string
@@ -95,13 +107,14 @@ AnalyseAudioJob::run ()
 {
 	shared_ptr<Player> player (new Player (_film, _playlist));
 	player->set_ignore_video ();
+	player->set_ignore_text ();
 	player->set_fast ();
 	player->set_play_referenced ();
+	player->Audio.connect (bind (&AnalyseAudioJob::analyse, this, _1, _2));
 
-	DCPTime const start = _playlist->start().get_value_or (DCPTime ());
-	DCPTime const length = _playlist->length ();
+	DCPTime const length = _playlist->length (_film);
 
-	Frame const len = DCPTime (length - start).frames_round (_film->audio_frame_rate());
+	Frame const len = DCPTime (length - _start).frames_round (_film->audio_frame_rate());
 	_samples_per_point = max (int64_t (1), len / _num_points);
 
 	delete[] _current;
@@ -116,18 +129,9 @@ AnalyseAudioJob::run ()
 	}
 
 	if (has_any_audio) {
+		player->seek (_start, true);
 		_done = 0;
-		DCPTime const block = DCPTime::from_seconds (1.0 / 8);
-		for (DCPTime t = start; t < length; t += block) {
-			shared_ptr<const AudioBuffers> audio = player->get_audio (t, block, false);
-#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
-			if (Config::instance()->analyse_ebur128 ()) {
-				_ebur128->process (audio);
-			}
-#endif
-			analyse (audio);
-			set_progress ((t.seconds() - start.seconds()) / (length.seconds() - start.seconds()));
-		}
+		while (!player->pass ()) {}
 	}
 
 	vector<AudioAnalysis::PeakTime> sample_peak;
@@ -156,19 +160,30 @@ AnalyseAudioJob::run ()
 		   gain was when we analysed it.
 		*/
 		shared_ptr<const AudioContent> ac = _playlist->content().front()->audio;
-		DCPOMATIC_ASSERT (ac);
-		_analysis->set_analysis_gain (ac->gain ());
+		if (ac) {
+			_analysis->set_analysis_gain (ac->gain());
+		}
 	}
 
-	_analysis->write (_film->audio_analysis_path (_playlist));
+	_analysis->set_samples_per_point (_samples_per_point);
+	_analysis->set_sample_rate (_film->audio_frame_rate ());
+	_analysis->write (_path);
 
 	set_progress (1);
 	set_state (FINISHED_OK);
 }
 
 void
-AnalyseAudioJob::analyse (shared_ptr<const AudioBuffers> b)
+AnalyseAudioJob::analyse (shared_ptr<const AudioBuffers> b, DCPTime time)
 {
+	DCPOMATIC_ASSERT (time >= _start);
+
+#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
+	if (Config::instance()->analyse_ebur128 ()) {
+		_ebur128->process (b);
+	}
+#endif
+
 	int const frames = b->frames ();
 	int const channels = b->channels ();
 
@@ -199,4 +214,7 @@ AnalyseAudioJob::analyse (shared_ptr<const AudioBuffers> b)
 	}
 
 	_done += frames;
+
+	DCPTime const length = _playlist->length (_film);
+	set_progress ((time.seconds() - _start.seconds()) / (length.seconds() - _start.seconds()));
 }