X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Faudio_content.cc;h=c67a66ed8a00f669e768a32db5be27626524eb19;hp=d02728b00018f5ed6d8bc023698b6fe4a94c7536;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hpb=3b48d5494c3cae7743d283203f5c8021860ab81f diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc index d02728b00..c67a66ed8 100644 --- a/src/lib/audio_content.cc +++ b/src/lib/audio_content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2014 Carl Hetherington + Copyright (C) 2013-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,78 +17,72 @@ */ -#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 "audio_processor.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::stringstream; +using std::fixed; +using std::setprecision; using boost::shared_ptr; using boost::dynamic_pointer_cast; -using dcp::raw_convert; - -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; -int const AudioContentProperty::AUDIO_PROCESSOR = 206; - -AudioContent::AudioContent (shared_ptr f) - : Content (f) +using boost::optional; + +/** Something stream-related has changed */ +int const AudioContentProperty::AUDIO_STREAMS = 200; +int const AudioContentProperty::AUDIO_GAIN = 201; +int const AudioContentProperty::AUDIO_DELAY = 202; + +AudioContent::AudioContent (shared_ptr film) + : Content (film) , _audio_gain (0) , _audio_delay (Config::instance()->default_audio_delay ()) - , _audio_processor (0) { } -AudioContent::AudioContent (shared_ptr f, DCPTime s) - : Content (f, s) +AudioContent::AudioContent (shared_ptr film, DCPTime s) + : Content (film, s) , _audio_gain (0) , _audio_delay (Config::instance()->default_audio_delay ()) - , _audio_processor (0) { } -AudioContent::AudioContent (shared_ptr f, boost::filesystem::path p) - : Content (f, p) +AudioContent::AudioContent (shared_ptr film, boost::filesystem::path p) + : Content (film, p) , _audio_gain (0) , _audio_delay (Config::instance()->default_audio_delay ()) - , _audio_processor (0) { } -AudioContent::AudioContent (shared_ptr f, cxml::ConstNodePtr node) - : Content (f, node) - , _audio_processor (0) +AudioContent::AudioContent (shared_ptr film, cxml::ConstNodePtr node) + : Content (film, node) { _audio_gain = node->number_child ("AudioGain"); _audio_delay = node->number_child ("AudioDelay"); - if (node->optional_string_child ("AudioProcessor")) { - _audio_processor = AudioProcessor::from_id (node->string_child ("AudioProcessor")); - } } -AudioContent::AudioContent (shared_ptr f, vector > c) - : Content (f, c) +AudioContent::AudioContent (shared_ptr film, vector > c) + : Content (film, c) { shared_ptr ref = dynamic_pointer_cast (c[0]); - assert (ref); - + DCPOMATIC_ASSERT (ref); + for (size_t i = 0; i < c.size(); ++i) { shared_ptr ac = dynamic_pointer_cast (c[i]); @@ -103,7 +97,6 @@ AudioContent::AudioContent (shared_ptr f, vector _audio_gain = ref->audio_gain (); _audio_delay = ref->audio_delay (); - _audio_processor = ref->audio_processor (); } void @@ -112,9 +105,6 @@ 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)); - if (_audio_processor) { - node->add_child("AudioProcessor")->add_child_text (_audio_processor->id ()); - } } @@ -125,7 +115,7 @@ AudioContent::set_audio_gain (double g) boost::mutex::scoped_lock lm (_mutex); _audio_gain = g; } - + signal_changed (AudioContentProperty::AUDIO_GAIN); } @@ -136,68 +126,63 @@ AudioContent::set_audio_delay (int d) boost::mutex::scoped_lock lm (_mutex); _audio_delay = d; } - + signal_changed (AudioContentProperty::AUDIO_DELAY); } -void -AudioContent::set_audio_processor (AudioProcessor const * p) +string +AudioContent::technical_summary () const { - { - boost::mutex::scoped_lock lm (_mutex); - _audio_processor = p; + string s = "audio :"; + BOOST_FOREACH (AudioStreamPtr i, audio_streams ()) { + s += String::compose ("stream channels %1 rate %2", i->channels(), i->frame_rate()); } - /* The channel count might have changed, so reset the mapping */ - AudioMapping m (processed_audio_channels ()); - m.make_default (); - set_audio_mapping (m); - - signal_changed (AudioContentProperty::AUDIO_PROCESSOR); + return s; } -boost::signals2::connection -AudioContent::analyse_audio (boost::function finished) +void +AudioContent::set_audio_mapping (AudioMapping mapping) { - 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); + int c = 0; + BOOST_FOREACH (AudioStreamPtr i, audio_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); + } - return c; + signal_changed (AudioContentProperty::AUDIO_STREAMS); } -boost::filesystem::path -AudioContent::audio_analysis_path () const +AudioMapping +AudioContent::audio_mapping () const { - shared_ptr film = _film.lock (); - if (!film) { - return boost::filesystem::path (); + int channels = 0; + BOOST_FOREACH (AudioStreamPtr i, audio_streams ()) { + channels += i->channels (); } - boost::filesystem::path p = film->audio_analysis_dir (); - p /= digest() + "_" + audio_mapping().digest(); - return p; -} - -string -AudioContent::technical_summary () const -{ - return String::compose ( - "audio: channels %1, length %2, content rate %3, resampled rate %4", - audio_channels(), - audio_length().seconds(), - audio_frame_rate(), - resampled_audio_frame_rate() - ); -} + AudioMapping merged (channels, MAX_DCP_AUDIO_CHANNELS); + + int c = 0; + int s = 0; + BOOST_FOREACH (AudioStreamPtr i, audio_streams ()) { + AudioMapping mapping = i->mapping (); + for (int j = 0; j < mapping.input_channels(); ++j) { + for (int k = 0; k < MAX_DCP_AUDIO_CHANNELS; ++k) { + merged.set (c, k, mapping.get (j, k)); + } + ++c; + } + ++s; + } -void -AudioContent::set_audio_mapping (AudioMapping) -{ - signal_changed (AudioContentProperty::AUDIO_MAPPING); + return merged; } /** @return the frame rate that this content should be resampled to in order @@ -207,10 +192,10 @@ int AudioContent::resampled_audio_frame_rate () const { shared_ptr film = _film.lock (); - assert (film); - + DCPOMATIC_ASSERT (film); + /* Resample to a DCI-approved sample rate */ - double t = dcp_audio_frame_rate (audio_frame_rate ()); + double t = has_rate_above_48k() ? 96000 : 48000; FrameRateChange frc = film->active_frame_rate_change (position ()); @@ -223,16 +208,87 @@ AudioContent::resampled_audio_frame_rate () const t /= frc.speed_up; } - return rint (t); + return lrint (t); } -int -AudioContent::processed_audio_channels () const +string +AudioContent::processing_description () const +{ + vector streams = audio_streams (); + 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_audio_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_audio_frame_rate ()); + } + + if (!not_resampled && resampled) { + if (same) { + return String::compose (_("Audio will be resampled from %1kHz to %2kHz"), common_frame_rate.get(), resampled_audio_frame_rate ()); + } else { + return String::compose (_("Audio will be resampled to %1kHz"), resampled_audio_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 { - if (!audio_processor ()) { - return audio_channels (); + BOOST_FOREACH (AudioStreamPtr i, audio_streams ()) { + if (i->frame_rate() > 48000) { + return true; + } } - return audio_processor()->out_channels (audio_channels ()); + return false; } +/** @return User-visible names of each of our audio channels */ +vector +AudioContent::audio_channel_names () const +{ + vector n; + + int t = 1; + BOOST_FOREACH (AudioStreamPtr i, audio_streams ()) { + for (int j = 0; j < i->channels(); ++j) { + n.push_back (String::compose ("%1:%2", t, j + 1)); + } + ++t; + } + + return n; +}