X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Faudio_content.cc;h=748cbb7d0d6403b487ec540abd2ab2e8768b3d66;hp=d02728b00018f5ed6d8bc023698b6fe4a94c7536;hb=2d4e8c5f69cc694625ad95dcee554499605f823b;hpb=5dc2dbdb6639f8d617a40209ad603d2a38f9df2a diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc index d02728b00..748cbb7d0 100644 --- a/src/lib/audio_content.cc +++ b/src/lib/audio_content.cc @@ -1,218 +1,218 @@ /* - Copyright (C) 2013-2014 Carl Hetherington + Copyright (C) 2013-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 -#include + #include "audio_content.h" -#include "analyse_audio_job.h" -#include "job_manager.h" -#include "film.h" -#include "exceptions.h" +#include "compose.hpp" #include "config.h" +#include "exceptions.h" +#include "film.h" #include "frame_rate_change.h" -#include "audio_processor.h" +#include +#include +#include +#include #include "i18n.h" -using std::string; + using std::cout; +using std::dynamic_pointer_cast; +using std::fixed; +using std::list; +using std::make_shared; +using std::pair; +using std::setprecision; +using std::shared_ptr; +using std::string; using std::vector; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using boost::optional; using dcp::raw_convert; +using namespace dcpomatic; -int const AudioContentProperty::AUDIO_CHANNELS = 200; -int const AudioContentProperty::AUDIO_LENGTH = 201; -int const AudioContentProperty::AUDIO_FRAME_RATE = 202; -int const AudioContentProperty::AUDIO_GAIN = 203; -int const AudioContentProperty::AUDIO_DELAY = 204; -int const AudioContentProperty::AUDIO_MAPPING = 205; -int const AudioContentProperty::AUDIO_PROCESSOR = 206; -AudioContent::AudioContent (shared_ptr f) - : Content (f) - , _audio_gain (0) - , _audio_delay (Config::instance()->default_audio_delay ()) - , _audio_processor (0) -{ +/** Something stream-related has changed */ +int const AudioContentProperty::STREAMS = 200; +int const AudioContentProperty::GAIN = 201; +int const AudioContentProperty::DELAY = 202; -} -AudioContent::AudioContent (shared_ptr f, DCPTime s) - : Content (f, s) - , _audio_gain (0) - , _audio_delay (Config::instance()->default_audio_delay ()) - , _audio_processor (0) +AudioContent::AudioContent (Content* parent) + : ContentPart (parent) + , _delay (Config::instance()->default_audio_delay()) { } -AudioContent::AudioContent (shared_ptr f, boost::filesystem::path p) - : Content (f, p) - , _audio_gain (0) - , _audio_delay (Config::instance()->default_audio_delay ()) - , _audio_processor (0) + +shared_ptr +AudioContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version) { + if (version < 34) { + /* With old metadata FFmpeg content has the audio-related tags even with no + audio streams, so check for that. + */ + if (node->string_child("Type") == "FFmpeg" && node->node_children("AudioStream").empty()) { + return {}; + } + + /* Otherwise we can drop through to the newer logic */ + } + if (!node->optional_number_child ("AudioGain")) { + return {}; + } + + return make_shared(parent, node); } -AudioContent::AudioContent (shared_ptr f, cxml::ConstNodePtr node) - : Content (f, node) - , _audio_processor (0) + +AudioContent::AudioContent (Content* parent, cxml::ConstNodePtr node) + : ContentPart (parent) { - _audio_gain = node->number_child ("AudioGain"); - _audio_delay = node->number_child ("AudioDelay"); - if (node->optional_string_child ("AudioProcessor")) { - _audio_processor = AudioProcessor::from_id (node->string_child ("AudioProcessor")); + _gain = node->number_child ("AudioGain"); + _delay = node->number_child ("AudioDelay"); + + /* Backwards compatibility */ + auto r = node->optional_number_child("AudioVideoFrameRate"); + if (r) { + _parent->set_video_frame_rate (r.get()); } } -AudioContent::AudioContent (shared_ptr f, vector > c) - : Content (f, c) + +AudioContent::AudioContent (Content* parent, vector > c) + : ContentPart (parent) { - shared_ptr ref = dynamic_pointer_cast (c[0]); - assert (ref); - - for (size_t i = 0; i < c.size(); ++i) { - shared_ptr ac = dynamic_pointer_cast (c[i]); + auto ref = c[0]->audio; + DCPOMATIC_ASSERT (ref); - if (ac->audio_gain() != ref->audio_gain()) { + for (size_t i = 1; i < c.size(); ++i) { + if (c[i]->audio->gain() != ref->gain()) { throw JoinError (_("Content to be joined must have the same audio gain.")); } - if (ac->audio_delay() != ref->audio_delay()) { + if (c[i]->audio->delay() != ref->delay()) { throw JoinError (_("Content to be joined must have the same audio delay.")); } } - _audio_gain = ref->audio_gain (); - _audio_delay = ref->audio_delay (); - _audio_processor = ref->audio_processor (); + _gain = ref->gain (); + _delay = ref->delay (); + _streams = ref->streams (); } + void AudioContent::as_xml (xmlpp::Node* node) const { boost::mutex::scoped_lock lm (_mutex); - node->add_child("AudioGain")->add_child_text (raw_convert (_audio_gain)); - node->add_child("AudioDelay")->add_child_text (raw_convert (_audio_delay)); - if (_audio_processor) { - node->add_child("AudioProcessor")->add_child_text (_audio_processor->id ()); - } + node->add_child("AudioGain")->add_child_text(raw_convert(_gain)); + node->add_child("AudioDelay")->add_child_text(raw_convert(_delay)); } void -AudioContent::set_audio_gain (double g) +AudioContent::set_gain (double g) { - { - boost::mutex::scoped_lock lm (_mutex); - _audio_gain = g; - } - - signal_changed (AudioContentProperty::AUDIO_GAIN); + maybe_set (_gain, g, AudioContentProperty::GAIN); } + void -AudioContent::set_audio_delay (int d) +AudioContent::set_delay (int d) { - { - boost::mutex::scoped_lock lm (_mutex); - _audio_delay = d; - } - - signal_changed (AudioContentProperty::AUDIO_DELAY); + maybe_set (_delay, d, AudioContentProperty::DELAY); } -void -AudioContent::set_audio_processor (AudioProcessor const * p) + +string +AudioContent::technical_summary () const { - { - boost::mutex::scoped_lock lm (_mutex); - _audio_processor = p; + string s = "audio: "; + for (auto i: streams()) { + s += String::compose ("stream channels %1 rate %2 ", i->channels(), i->frame_rate()); } - /* The channel count might have changed, so reset the mapping */ - AudioMapping m (processed_audio_channels ()); - m.make_default (); - set_audio_mapping (m); - - signal_changed (AudioContentProperty::AUDIO_PROCESSOR); + return s; } -boost::signals2::connection -AudioContent::analyse_audio (boost::function finished) -{ - shared_ptr film = _film.lock (); - assert (film); - - shared_ptr job (new AnalyseAudioJob (film, dynamic_pointer_cast (shared_from_this()))); - boost::signals2::connection c = job->Finished.connect (finished); - JobManager::instance()->add (job); - return c; +void +AudioContent::set_mapping (AudioMapping mapping) +{ + ContentChangeSignaller cc (_parent, AudioContentProperty::STREAMS); + + int c = 0; + for (auto i: streams()) { + AudioMapping stream_mapping (i->channels(), MAX_DCP_AUDIO_CHANNELS); + for (int j = 0; j < i->channels(); ++j) { + for (int k = 0; k < MAX_DCP_AUDIO_CHANNELS; ++k) { + stream_mapping.set (j, k, mapping.get(c, k)); + } + ++c; + } + i->set_mapping (stream_mapping); + } } -boost::filesystem::path -AudioContent::audio_analysis_path () const + +AudioMapping +AudioContent::mapping () const { - shared_ptr film = _film.lock (); - if (!film) { - return boost::filesystem::path (); + int channels = 0; + for (auto i: streams()) { + channels += i->channels (); } - boost::filesystem::path p = film->audio_analysis_dir (); - p /= digest() + "_" + audio_mapping().digest(); - return p; -} + AudioMapping merged (channels, MAX_DCP_AUDIO_CHANNELS); + merged.make_zero (); + + int c = 0; + int s = 0; + for (auto i: streams()) { + auto mapping = i->mapping (); + for (int j = 0; j < mapping.input_channels(); ++j) { + for (int k = 0; k < MAX_DCP_AUDIO_CHANNELS; ++k) { + if (k < mapping.output_channels()) { + merged.set (c, k, mapping.get(j, k)); + } + } + ++c; + } + ++s; + } -string -AudioContent::technical_summary () const -{ - return String::compose ( - "audio: channels %1, length %2, content rate %3, resampled rate %4", - audio_channels(), - audio_length().seconds(), - audio_frame_rate(), - resampled_audio_frame_rate() - ); + return merged; } -void -AudioContent::set_audio_mapping (AudioMapping) -{ - signal_changed (AudioContentProperty::AUDIO_MAPPING); -} /** @return the frame rate that this content should be resampled to in order * that it is in sync with the active video content at its start time. */ int -AudioContent::resampled_audio_frame_rate () const +AudioContent::resampled_frame_rate (shared_ptr film) const { - shared_ptr film = _film.lock (); - assert (film); - - /* Resample to a DCI-approved sample rate */ - double t = dcp_audio_frame_rate (audio_frame_rate ()); + double t = film->audio_frame_rate (); - FrameRateChange frc = film->active_frame_rate_change (position ()); + FrameRateChange frc (film, _parent); /* Compensate if the DCP is being run at a different frame rate to the source; that is, if the video is run such that it will @@ -223,16 +223,199 @@ AudioContent::resampled_audio_frame_rate () const t /= frc.speed_up; } - return rint (t); + return lrint (t); } -int -AudioContent::processed_audio_channels () const +string +AudioContent::processing_description (shared_ptr film) const { - if (!audio_processor ()) { - return audio_channels (); + if (streams().empty()) { + return ""; + } + + /* Possible answers are: + 1. all audio will be resampled from x to y. + 2. all audio will be resampled to y (from a variety of rates) + 3. some audio will be resampled to y (from a variety of rates) + 4. nothing will be resampled. + */ + + bool not_resampled = false; + bool resampled = false; + bool same = true; + + optional common_frame_rate; + for (auto i: streams()) { + if (i->frame_rate() != resampled_frame_rate(film)) { + resampled = true; + } else { + not_resampled = true; + } + + if (common_frame_rate && common_frame_rate != i->frame_rate ()) { + same = false; + } + common_frame_rate = i->frame_rate (); + } + + if (not_resampled && !resampled) { + return _("Audio will not be resampled"); + } + + if (not_resampled && resampled) { + return String::compose (_("Some audio will be resampled to %1Hz"), resampled_frame_rate(film)); + } + + if (!not_resampled && resampled) { + if (same) { + return String::compose (_("Audio will be resampled from %1Hz to %2Hz"), common_frame_rate.get(), resampled_frame_rate(film)); + } else { + return String::compose (_("Audio will be resampled to %1Hz"), resampled_frame_rate(film)); + } } - return audio_processor()->out_channels (audio_channels ()); + return ""; } + +/** @return User-visible names of each of our audio channels */ +vector +AudioContent::channel_names () const +{ + vector n; + + int index = 0; + int stream = 1; + for (auto i: streams()) { + for (int j = 0; j < i->channels(); ++j) { + n.push_back (NamedChannel(String::compose ("%1:%2", stream, j + 1), index++)); + } + ++stream; + } + + return n; +} + + +void +AudioContent::add_properties (shared_ptr film, list& p) const +{ + shared_ptr stream; + if (streams().size() == 1) { + stream = streams().front(); + } + + if (stream) { + p.push_back (UserProperty(UserProperty::AUDIO, _("Channels"), stream->channels())); + p.push_back (UserProperty(UserProperty::AUDIO, _("Content audio sample rate"), stream->frame_rate(), _("Hz"))); + } + + FrameRateChange const frc (_parent->active_video_frame_rate(film), film->video_frame_rate()); + ContentTime const c (_parent->full_length(film), frc); + + p.push_back ( + UserProperty (UserProperty::LENGTH, _("Full length in video frames at content rate"), c.frames_round(frc.source)) + ); + + if (stream) { + p.push_back ( + UserProperty ( + UserProperty::LENGTH, + _("Full length in audio samples at content rate"), + c.frames_round (stream->frame_rate ()) + ) + ); + } + + p.push_back (UserProperty(UserProperty::AUDIO, _("DCP sample rate"), resampled_frame_rate(film), _("Hz"))); + p.push_back (UserProperty(UserProperty::LENGTH, _("Full length in video frames at DCP rate"), c.frames_round (frc.dcp))); + + if (stream) { + p.push_back ( + UserProperty ( + UserProperty::LENGTH, + _("Full length in audio samples at DCP rate"), + c.frames_round(resampled_frame_rate(film)) + ) + ); + } +} + + +void +AudioContent::set_streams (vector streams) +{ + ContentChangeSignaller cc (_parent, AudioContentProperty::STREAMS); + + { + boost::mutex::scoped_lock lm (_mutex); + _streams = streams; + } +} + + +AudioStreamPtr +AudioContent::stream () const +{ + boost::mutex::scoped_lock lm (_mutex); + DCPOMATIC_ASSERT (_streams.size() == 1); + return _streams.front (); +} + + +void +AudioContent::add_stream (AudioStreamPtr stream) +{ + ContentChangeSignaller cc (_parent, AudioContentProperty::STREAMS); + + { + boost::mutex::scoped_lock lm (_mutex); + _streams.push_back (stream); + } +} + + +void +AudioContent::set_stream (AudioStreamPtr stream) +{ + ContentChangeSignaller cc (_parent, AudioContentProperty::STREAMS); + + { + boost::mutex::scoped_lock lm (_mutex); + _streams.clear (); + _streams.push_back (stream); + } +} + + +void +AudioContent::take_settings_from (shared_ptr c) +{ + set_gain (c->_gain); + set_delay (c->_delay); + + size_t i = 0; + size_t j = 0; + + while (i < _streams.size() && j < c->_streams.size()) { + _streams[i]->set_mapping (c->_streams[j]->mapping()); + ++i; + ++j; + } +} + + +void +AudioContent::modify_position (shared_ptr film, DCPTime& pos) const +{ + pos = pos.round (film->audio_frame_rate()); +} + + +void +AudioContent::modify_trim_start (ContentTime& trim) const +{ + DCPOMATIC_ASSERT (!_streams.empty()); + /* XXX: we're in trouble if streams have different rates */ + trim = trim.round (_streams.front()->frame_rate()); +}