Bump ffmpeg; gain-correct new LUFS/LRA.

diff --git a/cscript b/cscript
index d8736cb5e77bb66d21c0753de603ffab79a2e475..c2b4d2fa7ba18107cf902bd7ffaf2c3506d55bf9 100644 (file)
--- a/cscript
+++ b/cscript
@@ -278,7 +278,7 @@ def dependencies(target):
     else:
         ffmpeg_options = {}
 
     else:
         ffmpeg_options = {}
 

-    return (('ffmpeg-cdist', 'b9d9b12', ffmpeg_options),
+    return (('ffmpeg-cdist', 'b00b74a', ffmpeg_options),

             ('libdcp', '960fa45'),
             ('libsub', '8b82c40'))
 
             ('libdcp', '960fa45'),
             ('libsub', '8b82c40'))
 

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index e9dee3dacfe7fa96c37a601c653eb8a3e8796817..2117963f62569e0ad9e06f653f8065e544651495 100644 (file)
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -298,12 +298,24 @@ AudioDialog::setup_statistics ()
                }
        }
 
                }
        }
 

+       /* XXX: check whether it's ok to add dB gain to these quantities */
+

        if (static_cast<bool>(_analysis->integrated_loudness ())) {
        if (static_cast<bool>(_analysis->integrated_loudness ())) {

-               _integrated_loudness->SetLabel (wxString::Format (_("Integrated loudness %.2f LUFS"), _analysis->integrated_loudness().get()));
+               _integrated_loudness->SetLabel (
+                       wxString::Format (
+                               _("Integrated loudness %.2f LUFS"),
+                               _analysis->integrated_loudness().get() + _analysis->gain_correction (_playlist)
+                               )
+                       );

        }
 
        if (static_cast<bool>(_analysis->loudness_range ())) {
        }
 
        if (static_cast<bool>(_analysis->loudness_range ())) {

-               _loudness_range->SetLabel (wxString::Format (_("Loudness range %.2f LRA"), _analysis->loudness_range().get()));
+               _loudness_range->SetLabel (
+                       wxString::Format (
+                               _("Loudness range %.2f LU"),
+                               _analysis->loudness_range().get() + _analysis->gain_correction (_playlist)
+                               )
+                       );

        }
 }
 
        }
 }