/*
- Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
int const AnalyseAudioJob::_num_points = 1024;
-AnalyseAudioJob::AnalyseAudioJob (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist)
+/** @param from_zero true to analyse audio from time 0 in the playlist, otherwise begin at Playlist::start */
+AnalyseAudioJob::AnalyseAudioJob (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist, bool from_zero)
: Job (film)
, _playlist (playlist)
+ , _from_zero (from_zero)
, _done (0)
, _samples_per_point (1)
, _current (0)
_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 ()
{
shared_ptr<Player> 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 ();
- 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;
}
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<const AudioBuffers> audio = player->get_audio (t, block, false);
-#ifdef DCPOMATIC_HAVE_EBUR128_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 ()) {}
}
vector<AudioAnalysis::PeakTime> sample_peak;
_analysis->set_analysis_gain (ac->gain ());
}
+ _analysis->set_samples_per_point (_samples_per_point);
+ _analysis->set_sample_rate (_film->audio_frame_rate ());
_analysis->write (_film->audio_analysis_path (_playlist));
set_progress (1);
}
void
-AnalyseAudioJob::analyse (shared_ptr<const AudioBuffers> b)
+AnalyseAudioJob::analyse (shared_ptr<const AudioBuffers> 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 ();
}
_done += frames;
+
+ DCPTime const length = _playlist->length ();
+ set_progress ((time.seconds() - _start.seconds()) / (length.seconds() - _start.seconds()));
}