X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fanalyse_audio_job.cc;h=31b9dccae953e4ced010feeab571e5a12fadd3a6;hb=6e10de6161f783de85bbaf59824a29026d524e55;hp=60b10e7b6e05ba69dc418894fa10b4ca8ef7781e;hpb=39029279954b1f346d3ba28ec12c58211bfa7436;p=dcpomatic.git

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index 60b10e7b6..31b9dccae 100644
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -34,11 +34,13 @@ using boost::shared_ptr;
 
 int const AnalyseAudioJob::_num_points = 1024;
 
-AnalyseAudioJob::AnalyseAudioJob (shared_ptr<const Film> f, shared_ptr<AudioContent> c)
+AnalyseAudioJob::AnalyseAudioJob (shared_ptr<const Film> f, shared_ptr<const Playlist> p)
 	: Job (f)
-	, _content (c)
+	, _playlist (p)
 	, _done (0)
 	, _samples_per_point (1)
+	, _overall_peak (0)
+	, _overall_peak_frame (0)
 {
 
 }
@@ -49,17 +51,17 @@ AnalyseAudioJob::name () const
 	return _("Analyse audio");
 }
 
+string
+AnalyseAudioJob::json_name () const
+{
+	return N_("analyse_audio");
+}
+
 void
 AnalyseAudioJob::run ()
 {
-	shared_ptr<AudioContent> content = _content.lock ();
-	if (!content) {
-		return;
-	}
-
-	shared_ptr<Playlist> playlist (new Playlist);
-	playlist->add (content);
-	shared_ptr<Player> player (new Player (_film, playlist));
+	shared_ptr<Player> player (new Player (_film, _playlist));
+	player->set_ignore_video ();
 	
 	int64_t const len = _film->length().frames (_film->audio_frame_rate());
 	_samples_per_point = max (int64_t (1), len / _num_points);
@@ -74,7 +76,8 @@ AnalyseAudioJob::run ()
 		set_progress (t.seconds() / _film->length().seconds());
 	}
 
-	_analysis->write (content->audio_analysis_path ());
+	_analysis->set_peak (_overall_peak, DCPTime::from_frames (_overall_peak_frame, _film->audio_frame_rate ()));
+	_analysis->write (_film->audio_analysis_path (_playlist));
 	
 	set_progress (1);
 	set_state (FINISHED_OK);
@@ -94,6 +97,15 @@ AnalyseAudioJob::analyse (shared_ptr<const AudioBuffers> b)
 			_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) {
+				_overall_peak = as;
+				_overall_peak_frame = _done + i;
+			}
+
 			if ((_done % _samples_per_point) == 0) {
 				_current[j][AudioPoint::RMS] = sqrt (_current[j][AudioPoint::RMS] / _samples_per_point);
 				_analysis->add_point (j, _current[j]);