X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_content.cc;h=a252e4b5afae12c01c0f216afa2089144fa275cd;hb=14cccb179fff7bbbf422e13f9d2e3264239c93c7;hp=540279a95b862e980d66d00f664ac8d48bd79b72;hpb=cc76b517f6a74f813ae38137bdc88ff3bafa6dd9;p=dcpomatic.git diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc index 540279a95..a252e4b5a 100644 --- a/src/lib/audio_content.cc +++ b/src/lib/audio_content.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2013-2016 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,14 +42,15 @@ using std::setprecision; using boost::shared_ptr; using boost::dynamic_pointer_cast; using boost::optional; +using dcp::raw_convert; /** Something stream-related has changed */ int const AudioContentProperty::STREAMS = 200; int const AudioContentProperty::GAIN = 201; int const AudioContentProperty::DELAY = 202; -AudioContent::AudioContent (Content* parent, shared_ptr film) - : ContentPart (parent, film) +AudioContent::AudioContent (Content* parent) + : ContentPart (parent) , _gain (0) , _delay (Config::instance()->default_audio_delay ()) { @@ -57,17 +58,28 @@ AudioContent::AudioContent (Content* parent, shared_ptr film) } shared_ptr -AudioContent::from_xml (Content* parent, shared_ptr film, cxml::ConstNodePtr node) +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, film, node)); + return shared_ptr (new AudioContent (parent, node)); } -AudioContent::AudioContent (Content* parent, shared_ptr film, cxml::ConstNodePtr node) - : ContentPart (parent, film) +AudioContent::AudioContent (Content* parent, cxml::ConstNodePtr node) + : ContentPart (parent) { _gain = node->number_child ("AudioGain"); _delay = node->number_child ("AudioDelay"); @@ -79,8 +91,8 @@ AudioContent::AudioContent (Content* parent, shared_ptr film, cxml:: } } -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); @@ -123,9 +135,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; @@ -187,9 +199,7 @@ AudioContent::resampled_frame_rate () const /* Resample to a DCI-approved sample rate */ double t = has_rate_above_48k() ? 96000 : 48000; - shared_ptr film = _film.lock (); - DCPOMATIC_ASSERT (film); - FrameRateChange frc (_parent->active_video_frame_rate(), film->video_frame_rate()); + FrameRateChange frc (_parent->active_video_frame_rate(), _parent->film()->video_frame_rate()); /* 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 @@ -240,14 +250,14 @@ 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 ()); } 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 ()); } 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 ()); } } @@ -293,38 +303,35 @@ 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 (_parent->active_video_frame_rate(), film->video_frame_rate()); + FrameRateChange const frc (_parent->active_video_frame_rate(), _parent->film()->video_frame_rate()); ContentTime const c (_parent->full_length(), 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 (), _("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"), + UserProperty::LENGTH, + _("Full length in audio samples at DCP rate"), c.frames_round (resampled_frame_rate ()) ) ); @@ -372,3 +379,19 @@ AudioContent::set_stream (AudioStreamPtr stream) _parent->signal_changed (AudioContentProperty::STREAMS); } + +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; + } +}