X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fanalyse_audio_job.cc;h=ca0f49f570524499c3f85664b163fa3357bf3b30;hp=8800e2657784d4e0516c8f77141335bd2e36a2ee;hb=2d4e8c5f69cc694625ad95dcee554499605f823b;hpb=c13757391e75cdde7a9cef947c921b7a9ad08003 diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc index 8800e2657..ca0f49f57 100644 --- a/src/lib/analyse_audio_job.cc +++ b/src/lib/analyse_audio_job.cc @@ -1,131 +1,114 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2021 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 . */ -#include "audio_analysis.h" -#include "audio_buffers.h" + #include "analyse_audio_job.h" +#include "audio_analysis.h" #include "compose.hpp" +#include "dcpomatic_log.h" #include "film.h" +#include "filter.h" #include "player.h" -#include +#include "playlist.h" +#include "config.h" +#include #include "i18n.h" -using std::string; + +using std::cout; +using std::dynamic_pointer_cast; +using std::make_shared; using std::max; using std::min; -using std::cout; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; - -int const AnalyseAudioJob::_num_points = 1024; - -AnalyseAudioJob::AnalyseAudioJob (shared_ptr f, shared_ptr p) - : Job (f) - , _playlist (p) - , _done (0) - , _samples_per_point (1) - , _overall_peak (0) - , _overall_peak_frame (0) +using std::shared_ptr; +using std::string; +using std::vector; +using namespace dcpomatic; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif + + +/** @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) + , _analyser (film, playlist, from_zero, boost::bind(&Job::set_progress, this, _1, false)) + , _playlist (playlist) + , _path (film->audio_analysis_path(playlist)) { + LOG_DEBUG_AUDIO_ANALYSIS_NC("AnalyseAudioJob::AnalyseAudioJob"); +} + +AnalyseAudioJob::~AnalyseAudioJob () +{ + stop_thread (); } + string AnalyseAudioJob::name () const { - return _("Analyse audio"); + return _("Analysing audio"); } + string AnalyseAudioJob::json_name () const { return N_("analyse_audio"); } + void AnalyseAudioJob::run () { - shared_ptr player (new Player (_film)); - player->set_ignore_video (); - - int64_t const len = _film->length().frames (_film->audio_frame_rate()); - _samples_per_point = max (int64_t (1), len / _num_points); + LOG_DEBUG_AUDIO_ANALYSIS_NC("AnalyseAudioJob::run"); - _current.resize (_film->audio_channels ()); - _analysis.reset (new AudioAnalysis (_film->audio_channels ())); + auto player = make_shared(_film, _playlist); + player->set_ignore_video (); + player->set_ignore_text (); + player->set_fast (); + player->set_play_referenced (); + player->Audio.connect (bind(&AudioAnalyser::analyse, &_analyser, _1, _2)); bool has_any_audio = false; - BOOST_FOREACH (shared_ptr c, _film->content ()) { - if (dynamic_pointer_cast (c)) { + for (auto c: _playlist->content()) { + if (c->audio) { has_any_audio = true; } } if (has_any_audio) { - _done = 0; - DCPTime const block = DCPTime::from_seconds (1.0 / 8); - for (DCPTime t; t < _film->length(); t += block) { - analyse (player->get_audio (t, block, false)); - set_progress (t.seconds() / _film->length().seconds()); - } + player->seek (_analyser.start(), true); + while (!player->pass ()) {} } - _analysis->set_peak (_overall_peak, DCPTime::from_frames (_overall_peak_frame, _film->audio_frame_rate ())); - _analysis->write (_film->audio_analysis_path (_playlist)); - - set_progress (1); - set_state (FINISHED_OK); -} + LOG_DEBUG_AUDIO_ANALYSIS_NC("Loop complete"); -void -AnalyseAudioJob::analyse (shared_ptr b) -{ - for (int i = 0; i < b->frames(); ++i) { - for (int j = 0; j < b->channels(); ++j) { - float s = b->data(j)[i]; - if (fabsf (s) < 10e-7) { - /* SafeStringStream can't serialise and recover inf or -inf, so prevent such - values by replacing with this (140dB down) */ - s = 10e-7; - } - _current[j][AudioPoint::RMS] += pow (s, 2); - _current[j][AudioPoint::PEAK] = max (_current[j][AudioPoint::PEAK], fabsf (s)); - - float const as = fabs (s); - - _current[j][AudioPoint::PEAK] = max (_current[j][AudioPoint::PEAK], as); - - if (as > _overall_peak) { - _overall_peak = as; - _overall_peak_frame = _done + i; - } - - if ((_done % _samples_per_point) == 0) { - _current[j][AudioPoint::RMS] = sqrt (_current[j][AudioPoint::RMS] / _samples_per_point); - _analysis->add_point (j, _current[j]); - - _current[j] = AudioPoint (); - } - } + _analyser.finish (); + auto analysis = _analyser.get(); + analysis.write (_path); - ++_done; - } + LOG_DEBUG_AUDIO_ANALYSIS_NC("Job finished"); + set_progress (1); + set_state (FINISHED_OK); } -