X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_content.cc;h=014221f2e892afc95ef5f31d57aa3f4e44bea997;hb=f4f6a2504e5fedb67513689eaeac9dd88ee38ca9;hp=a903cfb9a4b7211d58f7f07a15b8be0293c05f5e;hpb=8008b81c0ccee843263e2a648707b71cc3ae081f;p=dcpomatic.git diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc index a903cfb9a..014221f2e 100644 --- a/src/lib/audio_content.cc +++ b/src/lib/audio_content.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2013-2016 Carl Hetherington + Copyright (C) 2013-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 . */ @@ -22,8 +23,8 @@ #include "exceptions.h" #include "config.h" #include "frame_rate_change.h" -#include "raw_convert.h" #include "compose.hpp" +#include #include #include #include @@ -34,7 +35,6 @@ using std::string; using std::cout; using std::vector; -using std::stringstream; using std::fixed; using std::list; using std::pair; @@ -42,31 +42,58 @@ using std::setprecision; using boost::shared_ptr; using boost::dynamic_pointer_cast; using boost::optional; +using dcp::raw_convert; +using namespace dcpomatic; /** Something stream-related has changed */ int const AudioContentProperty::STREAMS = 200; int const AudioContentProperty::GAIN = 201; int const AudioContentProperty::DELAY = 202; -int const AudioContentProperty::VIDEO_FRAME_RATE = 203; -AudioContent::AudioContent (Content* parent, shared_ptr film) - : ContentPart (parent, film) +AudioContent::AudioContent (Content* parent) + : ContentPart (parent) , _gain (0) , _delay (Config::instance()->default_audio_delay ()) { } -AudioContent::AudioContent (Content* parent, shared_ptr film, cxml::ConstNodePtr node) - : ContentPart (parent, film) +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 shared_ptr (); + } + + /* Otherwise we can drop through to the newer logic */ + } + + if (!node->optional_number_child ("AudioGain")) { + return shared_ptr (); + } + + return shared_ptr (new AudioContent (parent, node)); +} + +AudioContent::AudioContent (Content* parent, cxml::ConstNodePtr node) + : ContentPart (parent) { _gain = node->number_child ("AudioGain"); _delay = node->number_child ("AudioDelay"); - _video_frame_rate = node->optional_number_child ("AudioVideoFrameRate"); + + /* Backwards compatibility */ + optional r = node->optional_number_child ("AudioVideoFrameRate"); + if (r) { + _parent->set_video_frame_rate (r.get ()); + } } -AudioContent::AudioContent (Content* parent, shared_ptr film, vector > c) - : ContentPart (parent, film) +AudioContent::AudioContent (Content* parent, vector > c) + : ContentPart (parent) { shared_ptr ref = c[0]->audio; DCPOMATIC_ASSERT (ref); @@ -79,16 +106,10 @@ AudioContent::AudioContent (Content* parent, shared_ptr film, vector if (c[i]->audio->delay() != ref->delay()) { throw JoinError (_("Content to be joined must have the same audio delay.")); } - - if (c[i]->audio->video_frame_rate() != ref->video_frame_rate()) { - throw JoinError (_("Content to be joined must have the same video frame rate.")); - } } _gain = ref->gain (); _delay = ref->delay (); - /* Preserve the optional<> part of this */ - _video_frame_rate = ref->_video_frame_rate; _streams = ref->streams (); } @@ -98,9 +119,6 @@ AudioContent::as_xml (xmlpp::Node* node) const boost::mutex::scoped_lock lm (_mutex); node->add_child("AudioGain")->add_child_text (raw_convert (_gain)); node->add_child("AudioDelay")->add_child_text (raw_convert (_delay)); - if (_video_frame_rate) { - node->add_child("AudioVideoFrameRate")->add_child_text (raw_convert (_video_frame_rate.get())); - } } void @@ -118,9 +136,9 @@ AudioContent::set_delay (int d) string AudioContent::technical_summary () const { - string s = "audio :"; + string s = "audio: "; BOOST_FOREACH (AudioStreamPtr i, streams ()) { - s += String::compose ("stream channels %1 rate %2", i->channels(), i->frame_rate()); + s += String::compose ("stream channels %1 rate %2 ", i->channels(), i->frame_rate()); } return s; @@ -129,6 +147,8 @@ AudioContent::technical_summary () const void AudioContent::set_mapping (AudioMapping mapping) { + ChangeSignaller cc (_parent, AudioContentProperty::STREAMS); + int c = 0; BOOST_FOREACH (AudioStreamPtr i, streams ()) { AudioMapping stream_mapping (i->channels (), MAX_DCP_AUDIO_CHANNELS); @@ -140,8 +160,6 @@ AudioContent::set_mapping (AudioMapping mapping) } i->set_mapping (stream_mapping); } - - _parent->signal_changed (AudioContentProperty::STREAMS); } AudioMapping @@ -177,14 +195,11 @@ AudioContent::mapping () const * that it is in sync with the active video content at its start time. */ int -AudioContent::resampled_frame_rate () const +AudioContent::resampled_frame_rate (shared_ptr film) const { - /* Resample to a DCI-approved sample rate */ - double t = has_rate_above_48k() ? 96000 : 48000; + double t = film->audio_frame_rate (); - shared_ptr film = _film.lock (); - DCPOMATIC_ASSERT (film); - FrameRateChange frc (video_frame_rate(), film->video_frame_rate()); + 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 @@ -199,7 +214,7 @@ AudioContent::resampled_frame_rate () const } string -AudioContent::processing_description () const +AudioContent::processing_description (shared_ptr film) const { if (streams().empty ()) { return ""; @@ -218,7 +233,7 @@ AudioContent::processing_description () const optional common_frame_rate; BOOST_FOREACH (AudioStreamPtr i, streams()) { - if (i->frame_rate() != resampled_frame_rate()) { + if (i->frame_rate() != resampled_frame_rate(film)) { resampled = true; } else { not_resampled = true; @@ -235,33 +250,20 @@ AudioContent::processing_description () const } if (not_resampled && resampled) { - return String::compose (_("Some audio will be resampled to %1kHz"), resampled_frame_rate ()); + 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 %1kHz to %2kHz"), common_frame_rate.get(), resampled_frame_rate ()); + 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 %1kHz"), resampled_frame_rate ()); + return String::compose (_("Audio will be resampled to %1Hz"), resampled_frame_rate(film)); } } return ""; } -/** @return true if any stream in this content has a sampling rate of more than 48kHz */ -bool -AudioContent::has_rate_above_48k () const -{ - BOOST_FOREACH (AudioStreamPtr i, streams ()) { - if (i->frame_rate() > 48000) { - return true; - } - } - - return false; -} - /** @return User-visible names of each of our audio channels */ vector AudioContent::channel_names () const @@ -280,7 +282,7 @@ AudioContent::channel_names () const } void -AudioContent::add_properties (list& p) const +AudioContent::add_properties (shared_ptr film, list& p) const { shared_ptr stream; if (streams().size() == 1) { @@ -288,77 +290,50 @@ AudioContent::add_properties (list& p) const } if (stream) { - p.push_back (UserProperty (_("Audio"), _("Channels"), stream->channels ())); - p.push_back (UserProperty (_("Audio"), _("Content audio frame rate"), stream->frame_rate(), _("Hz"))); + p.push_back (UserProperty (UserProperty::AUDIO, _("Channels"), stream->channels ())); + p.push_back (UserProperty (UserProperty::AUDIO, _("Content audio sample rate"), stream->frame_rate(), _("Hz"))); } - shared_ptr film = _film.lock (); - DCPOMATIC_ASSERT (film); - - FrameRateChange const frc (video_frame_rate(), film->video_frame_rate()); - ContentTime const c (_parent->full_length(), frc); + 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 (_("Length"), _("Full length in video frames at content rate"), c.frames_round(frc.source)) + UserProperty (UserProperty::LENGTH, _("Full length in video frames at content rate"), c.frames_round(frc.source)) ); if (stream) { p.push_back ( UserProperty ( - _("Length"), - _("Full length in audio frames at content rate"), + UserProperty::LENGTH, + _("Full length in audio samples at content rate"), c.frames_round (stream->frame_rate ()) ) ); } - p.push_back (UserProperty (_("Audio"), _("DCP frame rate"), resampled_frame_rate (), _("Hz"))); - p.push_back (UserProperty (_("Length"), _("Full length in video frames at DCP rate"), c.frames_round (frc.dcp))); + 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 ( - _("Length"), - _("Full length in audio frames at DCP rate"), - c.frames_round (resampled_frame_rate ()) + UserProperty::LENGTH, + _("Full length in audio samples at DCP rate"), + c.frames_round(resampled_frame_rate(film)) ) ); } } -void -AudioContent::set_video_frame_rate (double r) -{ - maybe_set (_video_frame_rate, r, AudioContentProperty::VIDEO_FRAME_RATE); -} - -double -AudioContent::video_frame_rate () const -{ - { - boost::mutex::scoped_lock lm (_mutex); - if (_video_frame_rate) { - return _video_frame_rate.get (); - } - } - - /* No frame rate specified, so assume this content has been - prepared for any concurrent video content. - */ - shared_ptr film = _film.lock (); - DCPOMATIC_ASSERT (film); - return film->active_frame_rate_change(_parent->position()).source; -} - void AudioContent::set_streams (vector streams) { + ChangeSignaller cc (_parent, AudioContentProperty::STREAMS); + { boost::mutex::scoped_lock lm (_mutex); _streams = streams; } - - _parent->signal_changed (AudioContentProperty::STREAMS); } AudioStreamPtr @@ -372,22 +347,52 @@ AudioContent::stream () const void AudioContent::add_stream (AudioStreamPtr stream) { + ChangeSignaller cc (_parent, AudioContentProperty::STREAMS); + { boost::mutex::scoped_lock lm (_mutex); _streams.push_back (stream); } - - _parent->signal_changed (AudioContentProperty::STREAMS); } void AudioContent::set_stream (AudioStreamPtr stream) { + ChangeSignaller 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; + } +} - _parent->signal_changed (AudioContentProperty::STREAMS); +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()); }