X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fanalyse_audio_job.cc;h=525ac6c911d9940fb0eb09ece3c2a344cda3d7b0;hp=af58e77ac59058097be12614c8c8499656ccff93;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hpb=d2137ac5db409e686b4d9b3fa567935a5e416d41

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index af58e77ac..525ac6c91 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
@@ -20,9 +20,13 @@
 #include "audio_analysis.h"
 #include "audio_buffers.h"
 #include "analyse_audio_job.h"
+#include "audio_content.h"
 #include "compose.hpp"
 #include "film.h"
 #include "player.h"
+#include "playlist.h"
+#include <boost/foreach.hpp>
+#include <iostream>
 
 #include "i18n.h"
 
@@ -31,18 +35,27 @@ 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, shared_ptr<const Playlist> playlist)
+	: Job (film)
+	, _playlist (playlist)
 	, _done (0)
 	, _samples_per_point (1)
+	, _current (0)
+	, _overall_peak (0)
+	, _overall_peak_frame (0)
 {
 
 }
 
+AnalyseAudioJob::~AnalyseAudioJob ()
+{
+	delete[] _current;
+}
+
 string
 AnalyseAudioJob::name () const
 {
@@ -58,30 +71,50 @@ AnalyseAudioJob::json_name () const
 void
 AnalyseAudioJob::run ()
 {
-	shared_ptr<AudioContent> content = _content.lock ();
-	if (!content) {
-		return;
-	}
+	shared_ptr<Player> player (new Player (_film, _playlist));
+	player->set_ignore_video ();
+	player->set_fast ();
+	player->set_play_referenced ();
+
+	DCPTime const start = _playlist->start().get_value_or (DCPTime ());
+	DCPTime const length = _playlist->length ();
 
-	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());
+	Frame const len = DCPTime (length - start).frames_round (_film->audio_frame_rate());
 	_samples_per_point = max (int64_t (1), len / _num_points);
 
-	_current.resize (_film->audio_channels ());
+	delete[] _current;
+	_current = new AudioPoint[_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, _playlist->content ()) {
+		if (dynamic_pointer_cast<AudioContent> (c)) {
+			has_any_audio = true;
+		}
 	}
 
-	_analysis->write (content->audio_analysis_path ());
-	
+	if (has_any_audio) {
+		_done = 0;
+		DCPTime const block = DCPTime::from_seconds (1.0 / 8);
+		for (DCPTime t = start; t < length; t += block) {
+			analyse (player->get_audio (t, block, false));
+			set_progress ((t.seconds() - start.seconds()) / (length.seconds() - start.seconds()));
+		}
+	}
+
+	_analysis->set_peak (_overall_peak, DCPTime::from_frames (_overall_peak_frame, _film->audio_frame_rate ()));
+
+	if (_playlist->content().size() == 1) {
+		/* If there was only one piece of content in this analysis we may later need to know what its
+		   gain was when we analysed it.
+		*/
+		shared_ptr<const AudioContent> ac = dynamic_pointer_cast<const AudioContent> (_playlist->content().front ());
+		DCPOMATIC_ASSERT (ac);
+		_analysis->set_analysis_gain (ac->audio_gain ());
+	}
+
+	_analysis->write (_film->audio_analysis_path (_playlist));
+
 	set_progress (1);
 	set_state (FINISHED_OK);
 }
@@ -89,26 +122,34 @@ AnalyseAudioJob::run ()
 void
 AnalyseAudioJob::analyse (shared_ptr<const AudioBuffers> b)
 {
-	for (int i = 0; i < b->frames(); ++i) {
-		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
+	int const frames = b->frames ();
+	int const channels = b->channels ();
+
+	for (int j = 0; j < channels; ++j) {
+		float* data = b->data(j);
+		for (int i = 0; i < frames; ++i) {
+			float s = data[i];
+			float as = fabsf (s);
+			if (as < 10e-7) {
+				/* SafeStringStream can't serialise and recover inf or -inf, so prevent such
 				   values by replacing with this (140dB down) */
-				s = 10e-7;
+				s = as = 10e-7;
 			}
 			_current[j][AudioPoint::RMS] += pow (s, 2);
-			_current[j][AudioPoint::PEAK] = max (_current[j][AudioPoint::PEAK], fabsf (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) {
+			if (((_done + i) % _samples_per_point) == 0) {
 				_current[j][AudioPoint::RMS] = sqrt (_current[j][AudioPoint::RMS] / _samples_per_point);
 				_analysis->add_point (j, _current[j]);
-
 				_current[j] = AudioPoint ();
 			}
 		}
-
-		++_done;
 	}
-}
 
+	_done += frames;
+}