From fa5f3a8bf77209da27acc33cf144e2e4500a2600 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 20 Apr 2020 00:10:31 +0200 Subject: [PATCH] Add LEQ(m) when analysing audio (#1382). --- cscript | 1 + src/lib/analyse_audio_job.cc | 40 ++++++++++++++++++++++++++++++++++++ src/lib/analyse_audio_job.h | 6 +++++- src/lib/audio_analysis.cc | 7 +++++++ src/lib/audio_analysis.h | 9 ++++++++ src/lib/wscript | 2 +- src/tools/wscript | 2 +- src/wx/audio_dialog.cc | 10 +++++++++ src/wx/audio_dialog.h | 1 + test/audio_analysis_test.cc | 22 +++++++++++++++++++- test/wscript | 1 + wscript | 3 +++ 12 files changed, 100 insertions(+), 4 deletions(-) diff --git a/cscript b/cscript index aeddb1cdd..b10a7fc82 100644 --- a/cscript +++ b/cscript @@ -368,6 +368,7 @@ def dependencies(target, options): deps.append(('libdcp', None, cpp_lib_options)) deps.append(('libsub', None, cpp_lib_options)) + deps.append(('leqm-nrt', 'carl')) deps.append(('rtaudio', 'carl')) # We get our OpenSSL libraries from the environment, but we # also need a patched openssl binary to make certificates. diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc index 1fc09b905..ead36bca1 100644 --- a/src/lib/analyse_audio_job.cc +++ b/src/lib/analyse_audio_job.cc @@ -30,6 +30,7 @@ #include "audio_filter_graph.h" #include "config.h" extern "C" { +#include #include #ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG #include @@ -51,6 +52,13 @@ using namespace dcpomatic; int const AnalyseAudioJob::_num_points = 1024; +static void add_if_required(vector& v, size_t i, double db) +{ + if (v.size() > i) { + v[i] = pow(10, db / 20); + } +} + /** @param from_zero true to analyse audio from time 0 in the playlist, otherwise begin at Playlist::start */ AnalyseAudioJob::AnalyseAudioJob (shared_ptr film, shared_ptr playlist, bool from_zero) : Job (film) @@ -79,6 +87,31 @@ AnalyseAudioJob::AnalyseAudioJob (shared_ptr film, shared_ptrstart().get_value_or(DCPTime()); } + + /* XXX: is this right? Especially for more than 5.1? */ + vector channel_corrections(film->audio_channels(), 1); + add_if_required (channel_corrections, 4, -3); // Ls + add_if_required (channel_corrections, 5, -3); // Rs + add_if_required (channel_corrections, 6, -144); // HI + add_if_required (channel_corrections, 7, -144); // VI + add_if_required (channel_corrections, 8, -3); // Lc + add_if_required (channel_corrections, 9, -3); // Rc + add_if_required (channel_corrections, 10, -3); // Lc + add_if_required (channel_corrections, 11, -3); // Rc + add_if_required (channel_corrections, 12, -144); // DBox + add_if_required (channel_corrections, 13, -144); // Sync + add_if_required (channel_corrections, 14, -144); // Sign Language + add_if_required (channel_corrections, 15, -144); // Unused + + _leqm.reset(new leqm_nrt::Calculator( + film->audio_channels(), + film->audio_frame_rate(), + 24, + channel_corrections, + 850, // suggested by leqm_nrt CLI source + 64, // suggested by leqm_nrt CLI source + boost::thread::hardware_concurrency() + )); } AnalyseAudioJob::~AnalyseAudioJob () @@ -169,6 +202,7 @@ AnalyseAudioJob::run () _analysis->set_samples_per_point (_samples_per_point); _analysis->set_sample_rate (_film->audio_frame_rate ()); + _analysis->set_leqm (_leqm->leq_m()); _analysis->write (_path); set_progress (1); @@ -188,11 +222,15 @@ AnalyseAudioJob::analyse (shared_ptr b, DCPTime time) int const frames = b->frames (); int const channels = b->channels (); + vector interleaved(frames * channels); for (int j = 0; j < channels; ++j) { float* data = b->data(j); for (int i = 0; i < frames; ++i) { float s = data[i]; + + interleaved[i * channels + j] = s; + float as = fabsf (s); if (as < 10e-7) { /* We may struggle to serialise and recover inf or -inf, so prevent such @@ -215,6 +253,8 @@ AnalyseAudioJob::analyse (shared_ptr b, DCPTime time) } } + _leqm->add(interleaved); + _done += frames; DCPTime const length = _playlist->length (_film); diff --git a/src/lib/analyse_audio_job.h b/src/lib/analyse_audio_job.h index 5d6c091bc..f7cc3e256 100644 --- a/src/lib/analyse_audio_job.h +++ b/src/lib/analyse_audio_job.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2018 Carl Hetherington + Copyright (C) 2012-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -26,6 +26,8 @@ #include "audio_point.h" #include "types.h" #include "dcpomatic_time.h" +#include +#include class AudioBuffers; class AudioAnalysis; @@ -76,5 +78,7 @@ private: boost::shared_ptr _ebur128; std::vector _filters; + boost::scoped_ptr _leqm; + static const int _num_points; }; diff --git a/src/lib/audio_analysis.cc b/src/lib/audio_analysis.cc index 13917cb5f..446fcccef 100644 --- a/src/lib/audio_analysis.cc +++ b/src/lib/audio_analysis.cc @@ -93,6 +93,8 @@ AudioAnalysis::AudioAnalysis (boost::filesystem::path filename) _analysis_gain = f.optional_number_child ("AnalysisGain"); _samples_per_point = f.number_child ("SamplesPerPoint"); _sample_rate = f.number_child ("SampleRate"); + + _leqm = f.optional_number_child("Leqm"); } void @@ -162,6 +164,10 @@ AudioAnalysis::write (boost::filesystem::path filename) root->add_child("SamplesPerPoint")->add_child_text (raw_convert (_samples_per_point)); root->add_child("SampleRate")->add_child_text (raw_convert (_sample_rate)); + if (_leqm) { + root->add_child("Leqm")->add_child_text(raw_convert(*_leqm)); + } + doc->write_to_file_formatted (filename.string ()); } @@ -212,3 +218,4 @@ AudioAnalysis::overall_true_peak () const return p; } + diff --git a/src/lib/audio_analysis.h b/src/lib/audio_analysis.h index 3684db96a..99a69edb4 100644 --- a/src/lib/audio_analysis.h +++ b/src/lib/audio_analysis.h @@ -116,6 +116,14 @@ public: _sample_rate = sr; } + void set_leqm (double leqm) { + _leqm = leqm; + } + + boost::optional leqm () const { + return _leqm; + } + void write (boost::filesystem::path); float gain_correction (boost::shared_ptr playlist); @@ -126,6 +134,7 @@ private: std::vector _true_peak; boost::optional _integrated_loudness; boost::optional _loudness_range; + boost::optional _leqm; /** If this analysis was run on a single piece of * content we store its gain in dB when the analysis * happened. diff --git a/src/lib/wscript b/src/lib/wscript index ca6786ef2..67bcf8d8b 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -193,7 +193,7 @@ def build(bld): AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_REGEX SAMPLERATE POSTPROC TIFF SSH DCP CXML GLIB LZMA XML++ - CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE PNG + CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE PNG LEQM_NRT """ if bld.env.TARGET_OSX: diff --git a/src/tools/wscript b/src/tools/wscript index c7c953a31..7eeeecddf 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -30,7 +30,7 @@ def configure(conf): def build(bld): uselib = 'BOOST_THREAD BOOST_DATETIME DCP XMLSEC CXML XMLPP AVFORMAT AVFILTER AVCODEC ' uselib += 'AVUTIL SWSCALE SWRESAMPLE POSTPROC CURL BOOST_FILESYSTEM SSH ZIP CAIROMM FONTCONFIG PANGOMM SUB ' - uselib += 'SNDFILE SAMPLERATE BOOST_REGEX ICU NETTLE RTAUDIO PNG ' + uselib += 'SNDFILE SAMPLERATE BOOST_REGEX ICU NETTLE RTAUDIO PNG LEQM_NRT ' if bld.env.ENABLE_DISK: if bld.env.TARGET_LINUX: diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc index 2f1f1c826..efc506aff 100644 --- a/src/wx/audio_dialog.cc +++ b/src/wx/audio_dialog.cc @@ -89,6 +89,8 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film, shared_ptrAdd (_integrated_loudness, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP); _loudness_range = new StaticText (this, wxT ("")); left->Add (_loudness_range, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP); + _leqm = new StaticText (this, wxT("")); + left->Add (_leqm, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP); lr_sizer->Add (left, 1, wxALL | wxEXPAND, 12); @@ -414,6 +416,14 @@ AudioDialog::setup_statistics () ) ); } + + if (static_cast(_analysis->leqm())) { + _leqm->SetLabel( + wxString::Format( + _("LEQ(m) %.2fdB"), _analysis->leqm().get() + _analysis->gain_correction(_playlist) + ) + ); + } } bool diff --git a/src/wx/audio_dialog.h b/src/wx/audio_dialog.h index 3a02fd87f..34c174cf4 100644 --- a/src/wx/audio_dialog.h +++ b/src/wx/audio_dialog.h @@ -59,6 +59,7 @@ private: wxStaticText* _true_peak; wxStaticText* _integrated_loudness; wxStaticText* _loudness_range; + wxStaticText* _leqm; wxCheckBox* _channel_checkbox[MAX_DCP_AUDIO_CHANNELS]; wxCheckBox* _type_checkbox[AudioPoint::COUNT]; wxSlider* _smoothing; diff --git a/test/audio_analysis_test.cc b/test/audio_analysis_test.cc index 562039d93..2f51f7c4f 100644 --- a/test/audio_analysis_test.cc +++ b/test/audio_analysis_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2016 Carl Hetherington + Copyright (C) 2012-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -202,3 +202,23 @@ BOOST_AUTO_TEST_CASE (analyse_audio_test4) JobManager::instance()->analyse_audio (film, playlist, false, c, boost::bind (&finished)); BOOST_CHECK (!wait_for_jobs ()); } + +BOOST_AUTO_TEST_CASE (analyse_audio_leqm_test) +{ + shared_ptr film = new_test_film2 ("analyse_audio_leqm_test"); + film->set_audio_channels (2); + shared_ptr content = content_factory(TestPaths::private_data / "betty_stereo_48k.wav").front(); + film->examine_and_add_content (content); + BOOST_REQUIRE (!wait_for_jobs()); + + shared_ptr playlist (new Playlist); + playlist->add (film, content); + boost::signals2::connection c; + JobManager::instance()->analyse_audio (film, playlist, false, c, boost::bind (&finished)); + BOOST_CHECK (!wait_for_jobs()); + + AudioAnalysis analysis(film->audio_analysis_path(playlist)); + + /* The CLI tool of leqm_nrt gives this value for betty_stereo_48k.wav */ + BOOST_CHECK_CLOSE (analysis.leqm().get_value_or(0), 88.276, 0.001); +} diff --git a/test/wscript b/test/wscript index 4e5c57e0d..d7441316e 100644 --- a/test/wscript +++ b/test/wscript @@ -37,6 +37,7 @@ def build(bld): obj.name = 'unit-tests' obj.uselib = 'BOOST_TEST BOOST_THREAD BOOST_FILESYSTEM BOOST_DATETIME SNDFILE SAMPLERATE DCP FONTCONFIG CAIROMM PANGOMM XMLPP ' obj.uselib += 'AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE SWRESAMPLE POSTPROC CXML SUB GLIB CURL SSH XMLSEC BOOST_REGEX ICU NETTLE MAGICK PNG ' + obj.uselib += 'LEQM_NRT ' if bld.env.TARGET_WINDOWS: obj.uselib += 'WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE ' if bld.env.TARGET_LINUX: diff --git a/wscript b/wscript index c386ed21d..6451f6b2a 100644 --- a/wscript +++ b/wscript @@ -270,6 +270,9 @@ def configure(conf): # cairomm conf.check_cfg(package='cairomm-1.0', args='--cflags --libs', uselib_store='CAIROMM', mandatory=True) + # leqm_nrt + conf.check_cfg(package='leqm_nrt', args='--cflags --libs', uselib_store='LEQM_NRT', mandatory=True) + test_cxxflags = '' if have_c11: test_cxxflags = '-std=c++11' -- 2.30.2