X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fanalyse_audio_job.cc;h=461b84b4f5dbaf4c2d6884770156550520ae29d2;hb=8414829693900c3d6362a4f15d677bb7e1462c3e;hp=1378b66a433fc0fa5a531d4db682f4f26ea3de31;hpb=de2af791bdfdcd653752cba970e59efc7bf810c7;p=dcpomatic.git

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index 1378b66a4..461b84b4f 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,11 @@ 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)
+	, _from_zero (from_zero)
 	, _done (0)
 	, _samples_per_point (1)
 	, _current (0)
@@ -71,6 +73,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 ()
@@ -100,14 +106,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 ();
 
-	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;
@@ -122,6 +128,7 @@ AnalyseAudioJob::run ()
 	}
 
 	if (has_any_audio) {
+		player->seek (_start, true);
 		_done = 0;
 		while (!player->pass ()) {}
 	}
@@ -156,6 +163,8 @@ AnalyseAudioJob::run ()
 		_analysis->set_analysis_gain (ac->gain ());
 	}
 
+	_analysis->set_samples_per_point (_samples_per_point);
+	_analysis->set_sample_rate (_film->audio_frame_rate ());
 	_analysis->write (_film->audio_analysis_path (_playlist));
 
 	set_progress (1);
@@ -165,6 +174,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);
@@ -202,7 +213,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()));
+	set_progress ((time.seconds() - _start.seconds()) / (length.seconds() - _start.seconds()));
 }