X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_content.cc;h=c70afcda43576113f6f907e08f553db7c6e0f9e2;hb=290d6d7a61aadda3f6d317465507caa7ffac1ba2;hp=909f890242dd68fbc91c5461c722a64c0456e16e;hpb=740a372e92b2a8165f9c0a0e2370a49cca20fff7;p=dcpomatic.git diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc index 909f89024..c70afcda4 100644 --- a/src/lib/audio_content.cc +++ b/src/lib/audio_content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2016 Carl Hetherington + Copyright (C) 2013-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -27,7 +27,6 @@ #include #include #include -#include #include #include "i18n.h" @@ -39,10 +38,11 @@ using std::fixed; using std::list; using std::pair; using std::setprecision; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; using boost::optional; using dcp::raw_convert; +using namespace dcpomatic; /** Something stream-related has changed */ int const AudioContentProperty::STREAMS = 200; @@ -136,7 +136,7 @@ string AudioContent::technical_summary () const { string s = "audio: "; - BOOST_FOREACH (AudioStreamPtr i, streams ()) { + for (auto i: streams()) { s += String::compose ("stream channels %1 rate %2 ", i->channels(), i->frame_rate()); } @@ -146,8 +146,10 @@ AudioContent::technical_summary () const void AudioContent::set_mapping (AudioMapping mapping) { + ChangeSignaller cc (_parent, AudioContentProperty::STREAMS); + int c = 0; - BOOST_FOREACH (AudioStreamPtr i, streams ()) { + 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) { @@ -157,15 +159,13 @@ AudioContent::set_mapping (AudioMapping mapping) } i->set_mapping (stream_mapping); } - - _parent->signal_changed (AudioContentProperty::STREAMS); } AudioMapping AudioContent::mapping () const { int channels = 0; - BOOST_FOREACH (AudioStreamPtr i, streams ()) { + for (auto i: streams()) { channels += i->channels (); } @@ -174,7 +174,7 @@ AudioContent::mapping () const int c = 0; int s = 0; - BOOST_FOREACH (AudioStreamPtr i, streams ()) { + for (auto 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) { @@ -194,12 +194,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 (); - FrameRateChange frc (_parent->active_video_frame_rate(), _parent->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 @@ -214,7 +213,7 @@ AudioContent::resampled_frame_rate () const } string -AudioContent::processing_description () const +AudioContent::processing_description (shared_ptr film) const { if (streams().empty ()) { return ""; @@ -232,8 +231,8 @@ AudioContent::processing_description () const bool same = true; optional common_frame_rate; - BOOST_FOREACH (AudioStreamPtr i, streams()) { - if (i->frame_rate() != resampled_frame_rate()) { + for (auto i: streams()) { + if (i->frame_rate() != resampled_frame_rate(film)) { resampled = true; } else { not_resampled = true; @@ -250,52 +249,40 @@ 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 +vector AudioContent::channel_names () const { - vector n; + vector n; - int t = 1; - BOOST_FOREACH (AudioStreamPtr i, streams ()) { + int index = 0; + int stream = 1; + for (auto i: streams()) { for (int j = 0; j < i->channels(); ++j) { - n.push_back (String::compose ("%1:%2", t, j + 1)); + n.push_back (NamedChannel(String::compose ("%1:%2", stream, j + 1), index++)); } - ++t; + ++stream; } return n; } void -AudioContent::add_properties (list& p) const +AudioContent::add_properties (shared_ptr film, list& p) const { shared_ptr stream; if (streams().size() == 1) { @@ -307,8 +294,8 @@ AudioContent::add_properties (list& p) const 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); + 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)) @@ -324,7 +311,7 @@ AudioContent::add_properties (list& p) const ); } - p.push_back (UserProperty (UserProperty::AUDIO, _("DCP sample rate"), resampled_frame_rate (), _("Hz"))); + 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) { @@ -332,7 +319,7 @@ AudioContent::add_properties (list& p) const UserProperty ( UserProperty::LENGTH, _("Full length in audio samples at DCP rate"), - c.frames_round (resampled_frame_rate ()) + c.frames_round(resampled_frame_rate(film)) ) ); } @@ -341,12 +328,12 @@ AudioContent::add_properties (list& p) const 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 @@ -360,31 +347,31 @@ 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); } - - _parent->signal_changed (AudioContentProperty::STREAMS); } void -AudioContent::use_template (shared_ptr c) +AudioContent::take_settings_from (shared_ptr c) { - _gain = c->_gain; - _delay = c->_delay; + set_gain (c->_gain); + set_delay (c->_delay); size_t i = 0; size_t j = 0; @@ -395,3 +382,17 @@ AudioContent::use_template (shared_ptr c) ++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()); +}