X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Faudio_content.cc;h=4e9d5cd5cee5395b3a22058fd0cf6c08f57e1e57;hp=29d159a29a9603f330eb6100ed6c42743a33c630;hb=422be0eece2bf6ee80db1d3c21553cd82efff789;hpb=93c996b302589dee7d43d990f3650d636345a545 diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc index 29d159a29..4e9d5cd5c 100644 --- a/src/lib/audio_content.cc +++ b/src/lib/audio_content.cc @@ -1,177 +1,380 @@ /* - Copyright (C) 2013 Carl Hetherington + 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 . */ -#include -#include #include "audio_content.h" -#include "analyse_audio_job.h" -#include "job_manager.h" #include "film.h" #include "exceptions.h" #include "config.h" #include "frame_rate_change.h" +#include "raw_convert.h" +#include "compose.hpp" +#include +#include +#include +#include #include "i18n.h" using std::string; using std::cout; using std::vector; +using std::fixed; +using std::list; +using std::pair; +using std::setprecision; using boost::shared_ptr; using boost::dynamic_pointer_cast; -using libdcp::raw_convert; +using boost::optional; -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; +/** 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, Time s) - : Content (f, s) - , _audio_gain (0) - , _audio_delay (Config::instance()->default_audio_delay ()) +AudioContent::AudioContent (Content* parent) + : ContentPart (parent) + , _gain (0) + , _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 ()) +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 (shared_ptr f, shared_ptr node) - : Content (f, node) +AudioContent::AudioContent (Content* parent, cxml::ConstNodePtr node) + : ContentPart (parent) { - _audio_gain = node->number_child ("AudioGain"); - _audio_delay = node->number_child ("AudioDelay"); + _gain = node->number_child ("AudioGain"); + _delay = node->number_child ("AudioDelay"); + + /* Backwards compatibility */ + optional 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]); + shared_ptr 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 (); + _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)); + 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); } -boost::signals2::connection -AudioContent::analyse_audio (boost::function finished) +string +AudioContent::technical_summary () const { - 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); + string s = "audio :"; + BOOST_FOREACH (AudioStreamPtr i, streams ()) { + s += String::compose ("stream channels %1 rate %2", i->channels(), i->frame_rate()); + } - return c; + return s; } -boost::filesystem::path -AudioContent::audio_analysis_path () const +void +AudioContent::set_mapping (AudioMapping mapping) { - shared_ptr film = _film.lock (); - if (!film) { - return boost::filesystem::path (); + int c = 0; + BOOST_FOREACH (AudioStreamPtr 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 p = film->audio_analysis_dir (); - p /= digest() + "_" + audio_mapping().digest(); - return p; + _parent->signal_changed (AudioContentProperty::STREAMS); } -string -AudioContent::technical_summary () const +AudioMapping +AudioContent::mapping () const { - return String::compose ("audio: channels %1, length %2, raw rate %3, out rate %4", audio_channels(), audio_length(), content_audio_frame_rate(), output_audio_frame_rate()); + int channels = 0; + BOOST_FOREACH (AudioStreamPtr i, streams ()) { + channels += i->channels (); + } + + AudioMapping merged (channels, MAX_DCP_AUDIO_CHANNELS); + merged.make_zero (); + + int c = 0; + int s = 0; + BOOST_FOREACH (AudioStreamPtr i, streams ()) { + AudioMapping 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; + } + + return merged; } +/** @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::output_audio_frame_rate () const +AudioContent::resampled_frame_rate () const { - shared_ptr film = _film.lock (); - assert (film); - /* Resample to a DCI-approved sample rate */ - double t = dcp_audio_frame_rate (content_audio_frame_rate ()); + double t = has_rate_above_48k() ? 96000 : 48000; - FrameRateChange frc = film->active_frame_rate_change (position ()); + 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 look different in the DCP compared to the source (slower or faster). - skip/repeat doesn't come into effect here. */ if (frc.change_speed) { t /= frc.speed_up; } - return rint (t); + return lrint (t); } +string +AudioContent::processing_description () const +{ + 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; + BOOST_FOREACH (AudioStreamPtr i, streams()) { + if (i->frame_rate() != resampled_frame_rate()) { + 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 %1kHz"), 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 ()); + } else { + return String::compose (_("Audio will be resampled to %1kHz"), resampled_frame_rate ()); + } + } + + 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 +{ + vector n; + + int t = 1; + BOOST_FOREACH (AudioStreamPtr i, streams ()) { + for (int j = 0; j < i->channels(); ++j) { + n.push_back (String::compose ("%1:%2", t, j + 1)); + } + ++t; + } + + return n; +} + +void +AudioContent::add_properties (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(), _parent->film()->video_frame_rate()); + ContentTime const c (_parent->full_length(), 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 (), _("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 ()) + ) + ); + } +} + +void +AudioContent::set_streams (vector streams) +{ + { + boost::mutex::scoped_lock lm (_mutex); + _streams = streams; + } + + _parent->signal_changed (AudioContentProperty::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) +{ + { + boost::mutex::scoped_lock lm (_mutex); + _streams.push_back (stream); + } + + _parent->signal_changed (AudioContentProperty::STREAMS); +} + +void +AudioContent::set_stream (AudioStreamPtr stream) +{ + { + boost::mutex::scoped_lock lm (_mutex); + _streams.clear (); + _streams.push_back (stream); + } + + _parent->signal_changed (AudioContentProperty::STREAMS); +}