X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Faudio_content.cc;h=170b9299f5578d312e514d7c34fd613bd916fd02;hp=703696a44d7d7accf1b71b2fa236306645a72e6d;hb=f0c10e92b849566e458bc323f8783a6fe83e52d2;hpb=1fe6bd7f8ba059322b8357b2210f0fd590567ce2 diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc index 703696a44..170b9299f 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. @@ -146,7 +146,7 @@ AudioContent::technical_summary () const void AudioContent::set_mapping (AudioMapping mapping) { - ContentChange cc (_parent, AudioContentProperty::STREAMS); + ChangeSignaller cc (_parent, AudioContentProperty::STREAMS); int c = 0; BOOST_FOREACH (AudioStreamPtr i, streams ()) { @@ -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 ""; @@ -233,7 +232,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; @@ -250,33 +249,20 @@ AudioContent::processing_description () const } if (not_resampled && resampled) { - return String::compose (_("Some audio will be resampled to %1Hz"), 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 %1Hz to %2Hz"), 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 %1Hz"), 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 @@ -295,7 +281,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) { @@ -307,8 +293,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 +310,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 +318,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,7 +327,7 @@ AudioContent::add_properties (list& p) const void AudioContent::set_streams (vector streams) { - ContentChange cc (_parent, AudioContentProperty::STREAMS); + ChangeSignaller cc (_parent, AudioContentProperty::STREAMS); { boost::mutex::scoped_lock lm (_mutex); @@ -360,7 +346,7 @@ AudioContent::stream () const void AudioContent::add_stream (AudioStreamPtr stream) { - ContentChange cc (_parent, AudioContentProperty::STREAMS); + ChangeSignaller cc (_parent, AudioContentProperty::STREAMS); { boost::mutex::scoped_lock lm (_mutex); @@ -371,7 +357,7 @@ AudioContent::add_stream (AudioStreamPtr stream) void AudioContent::set_stream (AudioStreamPtr stream) { - ContentChange cc (_parent, AudioContentProperty::STREAMS); + ChangeSignaller cc (_parent, AudioContentProperty::STREAMS); { boost::mutex::scoped_lock lm (_mutex); @@ -397,13 +383,15 @@ AudioContent::take_settings_from (shared_ptr c) } void -AudioContent::modify_position (DCPTime& pos) const +AudioContent::modify_position (shared_ptr film, DCPTime& pos) const { - pos = pos.round (_parent->film()->audio_frame_rate()); + pos = pos.round (film->audio_frame_rate()); } void AudioContent::modify_trim_start (ContentTime& trim) const { - trim = trim.round (stream()->frame_rate()); + DCPOMATIC_ASSERT (!_streams.empty()); + /* XXX: we're in trouble if streams have different rates */ + trim = trim.round (_streams.front()->frame_rate()); }