summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-11-18 20:49:39 +0000
committerCarl Hetherington <cth@carlh.net>2015-11-18 20:52:36 +0000
commit6a33727b656e3adb9bf3a8fb5a6998e0b4906db7 (patch)
tree01dbd70449666e78ed9291ce634a63d8c3e995f3
parent987bd787fcbecdb845e5e9bdf8435122841e7779 (diff)
Bump ffmpeg; gain-correct new LUFS/LRA.
-rw-r--r--cscript2
-rw-r--r--src/wx/audio_dialog.cc16
2 files changed, 15 insertions, 3 deletions
diff --git a/cscript b/cscript
index d8736cb5e..c2b4d2fa7 100644
--- a/cscript
+++ b/cscript
@@ -278,7 +278,7 @@ def dependencies(target):
else:
ffmpeg_options = {}
- return (('ffmpeg-cdist', 'b9d9b12', ffmpeg_options),
+ return (('ffmpeg-cdist', 'b00b74a', ffmpeg_options),
('libdcp', '960fa45'),
('libsub', '8b82c40'))
diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index e9dee3dac..2117963f6 100644
--- 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 ())) {
- _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 ())) {
- _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)
+ )
+ );
}
}