X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fanalyse_audio_job.cc;h=8f9b1501067ee5bb7404317270df645daa64ff12;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=af58e77ac59058097be12614c8c8499656ccff93;hpb=8d58a7c5f4320ad5c111e336c45e44d6b51ab509;p=dcpomatic.git

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index af58e77ac..8f9b15010 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
@@ -23,6 +23,7 @@
 #include "compose.hpp"
 #include "film.h"
 #include "player.h"
+#include <boost/foreach.hpp>
 
 #include "i18n.h"
 
@@ -31,14 +32,16 @@ using std::max;
 using std::min;
 using std::cout;
 using boost::shared_ptr;
+using boost::dynamic_pointer_cast;
 
 int const AnalyseAudioJob::_num_points = 1024;
 
-AnalyseAudioJob::AnalyseAudioJob (shared_ptr<const Film> f, shared_ptr<AudioContent> c)
-	: Job (f)
-	, _content (c)
+AnalyseAudioJob::AnalyseAudioJob (shared_ptr<const Film> film)
+	: Job (film)
 	, _done (0)
 	, _samples_per_point (1)
+	, _overall_peak (0)
+	, _overall_peak_frame (0)
 {
 
 }
@@ -58,30 +61,34 @@ AnalyseAudioJob::json_name () const
 void
 AnalyseAudioJob::run ()
 {
-	shared_ptr<AudioContent> content = _content.lock ();
-	if (!content) {
-		return;
-	}
+	shared_ptr<Player> player (new Player (_film));
+	player->set_ignore_video ();
 
-	shared_ptr<Playlist> playlist (new Playlist);
-	playlist->add (content);
-	shared_ptr<Player> player (new Player (_film, playlist));
-	
 	int64_t const len = _film->length().frames (_film->audio_frame_rate());
 	_samples_per_point = max (int64_t (1), len / _num_points);
 
 	_current.resize (_film->audio_channels ());
 	_analysis.reset (new AudioAnalysis (_film->audio_channels ()));
 
-	_done = 0;
-	DCPTime const block = DCPTime::from_seconds (1.0 / 8);
-	for (DCPTime t; t < _film->length(); t += block) {
-		analyse (player->get_audio (t, block, false));
-		set_progress (t.seconds() / _film->length().seconds());
+	bool has_any_audio = false;
+	BOOST_FOREACH (shared_ptr<Content> c, _film->content ()) {
+		if (dynamic_pointer_cast<AudioContent> (c)) {
+			has_any_audio = true;
+		}
+	}
+
+	if (has_any_audio) {
+		_done = 0;
+		DCPTime const block = DCPTime::from_seconds (1.0 / 8);
+		for (DCPTime t; t < _film->length(); t += block) {
+			analyse (player->get_audio (t, block, false));
+			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 ());
+
 	set_progress (1);
 	set_state (FINISHED_OK);
 }
@@ -93,13 +100,22 @@ AnalyseAudioJob::analyse (shared_ptr<const AudioBuffers> b)
 		for (int j = 0; j < b->channels(); ++j) {
 			float s = b->data(j)[i];
 			if (fabsf (s) < 10e-7) {
-				/* stringstream can't serialise and recover inf or -inf, so prevent such
+				/* SafeStringStream can't serialise and recover inf or -inf, so prevent such
 				   values by replacing with this (140dB down) */
 				s = 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) {
+				_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]);