X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fanalyse_audio_job.cc;h=9d0882b3ad22b3061f243d53ae78f91146042d3d;hb=2fc2c321a45f9cfb1d1e09989f346ee6d44c0fa4;hp=fe56b3b6c9265005f8ba9c6e9dd427a6250246e1;hpb=366910025ce80231f1192662efe79f76d78ff572;p=dcpomatic.git

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index fe56b3b6c..9d0882b3a 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.
 
@@ -47,12 +47,16 @@ using std::min;
 using std::cout;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
+using namespace dcpomatic;
 
 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)
@@ -71,6 +75,10 @@ AnalyseAudioJob::AnalyseAudioJob (shared_ptr<const Film> film, shared_ptr<const
 		_sample_peak[i] = 0;
 		_sample_peak_frame[i] = 0;
 	}
+
+	if (!_from_zero) {
+		_start = _playlist->start().get_value_or(DCPTime());
+	}
 }
 
 AnalyseAudioJob::~AnalyseAudioJob ()
@@ -86,7 +94,7 @@ AnalyseAudioJob::~AnalyseAudioJob ()
 string
 AnalyseAudioJob::name () const
 {
-	return _("Analyse audio");
+	return _("Analysing audio");
 }
 
 string
@@ -100,15 +108,14 @@ AnalyseAudioJob::run ()
 {
 	shared_ptr<Player> player (new Player (_film, _playlist));
 	player->set_ignore_video ();
-	player->set_ignore_subtitle ();
+	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;
@@ -123,6 +130,7 @@ AnalyseAudioJob::run ()
 	}
 
 	if (has_any_audio) {
+		player->seek (_start, true);
 		_done = 0;
 		while (!player->pass ()) {}
 	}
@@ -153,11 +161,14 @@ 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);
@@ -166,6 +177,8 @@ AnalyseAudioJob::run ()
 void
 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);
@@ -203,7 +216,6 @@ AnalyseAudioJob::analyse (shared_ptr<const AudioBuffers> b, DCPTime time)
 
 	_done += frames;
 
-	DCPTime const start = _playlist->start().get_value_or (DCPTime ());
-	DCPTime const length = _playlist->length ();
-	set_progress ((time.seconds() - start.seconds()) / (length.seconds() - start.seconds()));
+	DCPTime const length = _playlist->length (_film);
+	set_progress ((time.seconds() - _start.seconds()) / (length.seconds() - _start.seconds()));
 }