X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fanalyse_audio_job.cc;h=d52b4051534cc3937d9d42e24880573812d9b03b;hp=d81f25caca7118d18e1254f08b3b78e714553ac1;hb=723f71ae3d3568d4746d4db13df906e0e2c9fb2a;hpb=ca045c71b2e76f86fef1ca99d7e7703a41dfcf33 diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc index d81f25cac..d52b40515 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 + Copyright (C) 2012-2018 Carl Hetherington - 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 . */ @@ -30,7 +31,7 @@ #include "config.h" extern "C" { #include -#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG +#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG #include #endif } @@ -40,6 +41,7 @@ extern "C" { #include "i18n.h" using std::string; +using std::vector; using std::max; using std::min; using std::cout; @@ -48,36 +50,51 @@ using boost::dynamic_pointer_cast; int const AnalyseAudioJob::_num_points = 1024; -AnalyseAudioJob::AnalyseAudioJob (shared_ptr film, shared_ptr playlist) +/** @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) , _playlist (playlist) + , _path (film->audio_analysis_path(playlist)) + , _from_zero (from_zero) , _done (0) , _samples_per_point (1) , _current (0) - , _sample_peak (0) - , _sample_peak_frame (0) -#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG + , _sample_peak (new float[film->audio_channels()]) + , _sample_peak_frame (new Frame[film->audio_channels()]) +#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG , _ebur128 (new AudioFilterGraph (film->audio_frame_rate(), film->audio_channels())) #endif { -#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG +#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG _filters.push_back (new Filter ("ebur128", "ebur128", "audio", "ebur128=peak=true")); _ebur128->setup (_filters); #endif + + for (int i = 0; i < film->audio_channels(); ++i) { + _sample_peak[i] = 0; + _sample_peak_frame[i] = 0; + } + + if (!_from_zero) { + _start = _playlist->start().get_value_or(DCPTime()); + } } AnalyseAudioJob::~AnalyseAudioJob () { + stop_thread (); BOOST_FOREACH (Filter const * i, _filters) { delete const_cast (i); } delete[] _current; + delete[] _sample_peak; + delete[] _sample_peak_frame; } string AnalyseAudioJob::name () const { - return _("Analyse audio"); + return _("Analysing audio"); } string @@ -91,13 +108,14 @@ AnalyseAudioJob::run () { shared_ptr player (new Player (_film, _playlist)); player->set_ignore_video (); + player->set_ignore_text (); player->set_fast (); player->set_play_referenced (); + player->Audio.connect (bind (&AnalyseAudioJob::analyse, this, _1, _2)); - DCPTime const start = _playlist->start().get_value_or (DCPTime ()); - DCPTime const length = _playlist->length (); + DCPTime const length = _playlist->length (_film); - Frame const len = DCPTime (length - start).frames_round (_film->audio_frame_rate()); + Frame const len = DCPTime (length - _start).frames_round (_film->audio_frame_rate()); _samples_per_point = max (int64_t (1), len / _num_points); delete[] _current; @@ -106,34 +124,31 @@ AnalyseAudioJob::run () bool has_any_audio = false; BOOST_FOREACH (shared_ptr c, _playlist->content ()) { - if (dynamic_pointer_cast (c)) { + if (c->audio) { has_any_audio = true; } } if (has_any_audio) { + player->seek (_start, true); _done = 0; - DCPTime const block = DCPTime::from_seconds (1.0 / 8); - for (DCPTime t = start; t < length; t += block) { - shared_ptr audio = player->get_audio (t, block, false); -#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG - if (Config::instance()->analyse_ebur128 ()) { - _ebur128->process (audio); - } -#endif - analyse (audio); - set_progress ((t.seconds() - start.seconds()) / (length.seconds() - start.seconds())); - } + while (!player->pass ()) {} } - _analysis->set_sample_peak (_sample_peak, DCPTime::from_frames (_sample_peak_frame, _film->audio_frame_rate ())); + vector sample_peak; + for (int i = 0; i < _film->audio_channels(); ++i) { + sample_peak.push_back ( + AudioAnalysis::PeakTime (_sample_peak[i], DCPTime::from_frames (_sample_peak_frame[i], _film->audio_frame_rate ())) + ); + } + _analysis->set_sample_peak (sample_peak); -#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG +#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG if (Config::instance()->analyse_ebur128 ()) { void* eb = _ebur128->get("Parsed_ebur128_0")->priv; - double true_peak = 0; + vector true_peak; for (int i = 0; i < _film->audio_channels(); ++i) { - true_peak = max (true_peak, av_ebur128_get_true_peaks(eb)[i]); + true_peak.push_back (av_ebur128_get_true_peaks(eb)[i]); } _analysis->set_true_peak (true_peak); _analysis->set_integrated_loudness (av_ebur128_get_integrated_loudness(eb)); @@ -145,20 +160,31 @@ AnalyseAudioJob::run () /* 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 ac = dynamic_pointer_cast (_playlist->content().front ()); - DCPOMATIC_ASSERT (ac); - _analysis->set_analysis_gain (ac->audio_gain ()); + shared_ptr ac = _playlist->content().front()->audio; + if (ac) { + _analysis->set_analysis_gain (ac->gain()); + } } - _analysis->write (_film->audio_analysis_path (_playlist)); + _analysis->set_samples_per_point (_samples_per_point); + _analysis->set_sample_rate (_film->audio_frame_rate ()); + _analysis->write (_path); set_progress (1); set_state (FINISHED_OK); } void -AnalyseAudioJob::analyse (shared_ptr b) +AnalyseAudioJob::analyse (shared_ptr b, DCPTime time) { + DCPOMATIC_ASSERT (time >= _start); + +#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG + if (Config::instance()->analyse_ebur128 ()) { + _ebur128->process (b); + } +#endif + int const frames = b->frames (); int const channels = b->channels (); @@ -168,16 +194,16 @@ AnalyseAudioJob::analyse (shared_ptr b) float s = data[i]; float as = fabsf (s); if (as < 10e-7) { - /* SafeStringStream can't serialise and recover inf or -inf, so prevent such + /* We may struggle to serialise and recover inf or -inf, so prevent such values by replacing with this (140dB down) */ s = as = 10e-7; } _current[j][AudioPoint::RMS] += pow (s, 2); _current[j][AudioPoint::PEAK] = max (_current[j][AudioPoint::PEAK], as); - if (as > _sample_peak) { - _sample_peak = as; - _sample_peak_frame = _done + i; + if (as > _sample_peak[j]) { + _sample_peak[j] = as; + _sample_peak_frame[j] = _done + i; } if (((_done + i) % _samples_per_point) == 0) { @@ -189,4 +215,7 @@ AnalyseAudioJob::analyse (shared_ptr b) } _done += frames; + + DCPTime const length = _playlist->length (_film); + set_progress ((time.seconds() - _start.seconds()) / (length.seconds() - _start.seconds())); }