X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Flib%2Fanalyse_audio_job.cc;h=8d0accf0f62804bd4dfc44604621470774b9d681;hb=d38a77e10fb310d421ad1b5322ffa5d97bbd1629;hp=5dba56598d9196f78fe2efab0466d587f45d1d65;hpb=419afb743ad2aaf1ea301356ac09f9a26ee15567;p=dcpomatic.git

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index 5dba56598..8d0accf0f 100644
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -27,8 +28,12 @@
 #include "playlist.h"
 #include "filter.h"
 #include "audio_filter_graph.h"
+#include "config.h"
 extern "C" {
 #include <libavutil/channel_layout.h>
+#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
+#include <libavfilter/f_ebur128.h>
+#endif
 }
 #include <boost/foreach.hpp>
 #include <iostream>
@@ -44,16 +49,6 @@ using boost::dynamic_pointer_cast;
 
 int const AnalyseAudioJob::_num_points = 1024;
 
-extern "C" {
-/* I added these functions to the FFmpeg that DCP-o-matic is built with, but there isn't an
-   existing header file to put the prototype in.  Cheat by putting it in here.
-*/
-double* av_ebur128_get_true_peaks         (void* context);
-double* av_ebur128_get_sample_peaks       (void* context);
-double  av_ebur128_get_integrated_loudness(void* context);
-double  av_ebur128_get_loudness_range     (void* context);
-}
-
 AnalyseAudioJob::AnalyseAudioJob (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist)
 	: Job (film)
 	, _playlist (playlist)
@@ -62,10 +57,14 @@ AnalyseAudioJob::AnalyseAudioJob (shared_ptr<const Film> film, shared_ptr<const
 	, _current (0)
 	, _sample_peak (0)
 	, _sample_peak_frame (0)
-	, _ebur128 (new AudioFilterGraph (film->audio_frame_rate(), av_get_default_channel_layout(film->audio_channels())))
+#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
+	, _ebur128 (new AudioFilterGraph (film->audio_frame_rate(), film->audio_channels()))
+#endif
 {
+#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
 	_filters.push_back (new Filter ("ebur128", "ebur128", "audio", "ebur128=peak=true"));
 	_ebur128->setup (_filters);
+#endif
 }
 
 AnalyseAudioJob::~AnalyseAudioJob ()
@@ -108,7 +107,7 @@ AnalyseAudioJob::run ()
 
 	bool has_any_audio = false;
 	BOOST_FOREACH (shared_ptr<Content> c, _playlist->content ()) {
-		if (dynamic_pointer_cast<AudioContent> (c)) {
+		if (c->audio) {
 			has_any_audio = true;
 		}
 	}
@@ -118,7 +117,11 @@ AnalyseAudioJob::run ()
 		DCPTime const block = DCPTime::from_seconds (1.0 / 8);
 		for (DCPTime t = start; t < length; t += block) {
 			shared_ptr<const AudioBuffers> audio = player->get_audio (t, block, false);
-			_ebur128->process (audio);
+#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
+			if (Config::instance()->analyse_ebur128 ()) {
+				_ebur128->process (audio);
+			}
+#endif
 			analyse (audio);
 			set_progress ((t.seconds() - start.seconds()) / (length.seconds() - start.seconds()));
 		}
@@ -126,22 +129,26 @@ AnalyseAudioJob::run ()
 
 	_analysis->set_sample_peak (_sample_peak, DCPTime::from_frames (_sample_peak_frame, _film->audio_frame_rate ()));
 
-	void* eb = _ebur128->get("Parsed_ebur128_0")->priv;
-	double true_peak = 0;
-	for (int i = 0; i < _film->audio_channels(); ++i) {
-		true_peak = max (true_peak, av_ebur128_get_true_peaks(eb)[i]);
+#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
+	if (Config::instance()->analyse_ebur128 ()) {
+		void* eb = _ebur128->get("Parsed_ebur128_0")->priv;
+		double true_peak = 0;
+		for (int i = 0; i < _film->audio_channels(); ++i) {
+			true_peak = max (true_peak, av_ebur128_get_true_peaks(eb)[i]);
+		}
+		_analysis->set_true_peak (true_peak);
+		_analysis->set_integrated_loudness (av_ebur128_get_integrated_loudness(eb));
+		_analysis->set_loudness_range (av_ebur128_get_loudness_range(eb));
 	}
-	_analysis->set_true_peak (true_peak);
-	_analysis->set_integrated_loudness (av_ebur128_get_integrated_loudness(eb));
-	_analysis->set_loudness_range (av_ebur128_get_loudness_range(eb));
+#endif
 
 	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 ());
+		shared_ptr<const AudioContent> ac = _playlist->content().front()->audio;
 		DCPOMATIC_ASSERT (ac);
-		_analysis->set_analysis_gain (ac->audio_gain ());
+		_analysis->set_analysis_gain (ac->gain ());
 	}
 
 	_analysis->write (_film->audio_analysis_path (_playlist));