Check for patched version of FFmpeg before using extra functions (#773).

diff --git a/cscript b/cscript
index 9e045f8ebc9f68a200a5422fdb67c743abb13d84..9bee9b4973a75f8ccd920934586c4620ada62591 100644 (file)
--- a/cscript
+++ b/cscript
@@ -278,7 +278,7 @@ def dependencies(target):
     else:
         ffmpeg_options = {}
 
-    return (('ffmpeg-cdist', '0e31e4b', ffmpeg_options),
+    return (('ffmpeg-cdist', 'b559555', ffmpeg_options),
             ('libdcp', 'fb03c08'),
             ('libsub', 'f368daf'))
 

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index 5dba56598d9196f78fe2efab0466d587f45d1d65..769f3762bee98ee214c9972ddb0c6018c0cc8767 100644 (file)
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -29,6 +29,9 @@
 #include "audio_filter_graph.h"
 extern "C" {
 #include <libavutil/channel_layout.h>
+#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG
+#include <libavfilter/f_ebur128.h>
+#endif
 }
 #include <boost/foreach.hpp>
 #include <iostream>
@@ -44,16 +47,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 +55,14 @@ AnalyseAudioJob::AnalyseAudioJob (shared_ptr<const Film> film, shared_ptr<const
        , _current (0)
        , _sample_peak (0)
        , _sample_peak_frame (0)
+#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG
        , _ebur128 (new AudioFilterGraph (film->audio_frame_rate(), av_get_default_channel_layout(film->audio_channels())))
+#endif
 {
+#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG
        _filters.push_back (new Filter ("ebur128", "ebur128", "audio", "ebur128=peak=true"));
        _ebur128->setup (_filters);
+#endif
 }
 
 AnalyseAudioJob::~AnalyseAudioJob ()
@@ -118,7 +115,9 @@ 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);
+#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG
                        _ebur128->process (audio);
+#endif
                        analyse (audio);
                        set_progress ((t.seconds() - start.seconds()) / (length.seconds() - start.seconds()));
                }
@@ -126,6 +125,7 @@ AnalyseAudioJob::run ()
 
        _analysis->set_sample_peak (_sample_peak, DCPTime::from_frames (_sample_peak_frame, _film->audio_frame_rate ()));
 
+#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG
        void* eb = _ebur128->get("Parsed_ebur128_0")->priv;
        double true_peak = 0;
        for (int i = 0; i < _film->audio_channels(); ++i) {
@@ -134,6 +134,7 @@ AnalyseAudioJob::run ()
        _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

diff --git a/src/wx/wscript b/src/wx/wscript
index 8dc3e972e546557623d7cee975f33010c8b22f5f..b78ccc9282adb546ecd4f2e06833941263de4f03 100644 (file)
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -100,7 +100,7 @@ sources = """
 def configure(conf):
     try:
         wx_config = 'wx-config-3.0-gtk2'
-        conf.check_cfg(msg='Checking for wxWidgets',
+        conf.check_cfg(msg='Checking for wxWidgets using wx-config-3.0-gtk2',
                        package='',
                        path=wx_config,
                        args='--cppflags --cxxflags --libs std,richtext',
@@ -108,7 +108,7 @@ def configure(conf):
                        mandatory=True)
     except:
         wx_config = 'wx-config'
-        conf.check_cfg(msg='Checking for wxWidgets',
+        conf.check_cfg(msg='Checking for wxWidgets using wx-config',
                        package='',
                        path=wx_config,
                        args='--cppflags --cxxflags --libs std,richtext',

diff --git a/wscript b/wscript
index d3f611374415fb3ea1120ebace78b11223a86528..177d459bece196f32f1db130a87838b808ffb76d 100644 (file)
--- a/wscript
+++ b/wscript
@@ -299,6 +299,20 @@ def configure(conf):
         conf.check_cfg(package='libswscale', args='--cflags --libs', uselib_store='SWSCALE', mandatory=True)
         conf.check_cfg(package='libpostproc', args='--cflags --libs', uselib_store='POSTPROC', mandatory=True)
 
+    # Check to see if we have our version of FFmpeg that allows us to get at EBUR128 results
+    conf.check_cxx(fragment="""
+                            extern "C" {\n
+                            #include <libavfilter/f_ebur128.h>\n
+                            }\n
+                            int main () { av_ebur128_get_true_peaks (0); }\n
+                            """,
+                   msg='Checking for patched FFmpeg',
+                   libpath='/usr/local/lib',
+                   lib=['avfilter'],
+                   uselib_store='PATCHED_FFMPEG',
+                   defines_name='DCPOMATIC_HAVE_PATCHED_FFMPEG',
+                   mandatory=False)
+
     # Boost
     if conf.options.static_boost:
         conf.env.STLIB_BOOST_THREAD = ['boost_thread']