X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_content.cc;h=d02728b00018f5ed6d8bc023698b6fe4a94c7536;hb=f4030653da8f5a0b3daebe640f485b3daf9ef091;hp=04823d1e6f12a0aa653a6c6a0f3a3c9ae57af29c;hpb=bdbb254c18b100f8fa66a3707f6b515309d05685;p=dcpomatic.git diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc index 04823d1e6..d02728b00 100644 --- a/src/lib/audio_content.cc +++ b/src/lib/audio_content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2014 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 @@ -18,19 +18,24 @@ */ #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 "i18n.h" using std::string; +using std::cout; using std::vector; using boost::shared_ptr; -using boost::lexical_cast; using boost::dynamic_pointer_cast; +using dcp::raw_convert; int const AudioContentProperty::AUDIO_CHANNELS = 200; int const AudioContentProperty::AUDIO_LENGTH = 201; @@ -38,11 +43,22 @@ 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, Time s) +AudioContent::AudioContent (shared_ptr f) + : Content (f) + , _audio_gain (0) + , _audio_delay (Config::instance()->default_audio_delay ()) + , _audio_processor (0) +{ + +} + +AudioContent::AudioContent (shared_ptr f, DCPTime s) : Content (f, s) , _audio_gain (0) - , _audio_delay (0) + , _audio_delay (Config::instance()->default_audio_delay ()) + , _audio_processor (0) { } @@ -50,18 +66,21 @@ AudioContent::AudioContent (shared_ptr f, Time s) AudioContent::AudioContent (shared_ptr f, boost::filesystem::path p) : Content (f, p) , _audio_gain (0) - , _audio_delay (0) + , _audio_delay (Config::instance()->default_audio_delay ()) + , _audio_processor (0) { } -AudioContent::AudioContent (shared_ptr f, shared_ptr node) +AudioContent::AudioContent (shared_ptr f, cxml::ConstNodePtr node) : Content (f, node) + , _audio_processor (0) { - LocaleGuard lg; - _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) @@ -84,21 +103,23 @@ AudioContent::AudioContent (shared_ptr f, vector _audio_gain = ref->audio_gain (); _audio_delay = ref->audio_delay (); + _audio_processor = ref->audio_processor (); } void AudioContent::as_xml (xmlpp::Node* node) const { - LocaleGuard lg; - boost::mutex::scoped_lock lm (_mutex); - node->add_child("AudioGain")->add_child_text (lexical_cast (_audio_gain)); - node->add_child("AudioDelay")->add_child_text (lexical_cast (_audio_delay)); + 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 ()); + } } void -AudioContent::set_audio_gain (float g) +AudioContent::set_audio_gain (double g) { { boost::mutex::scoped_lock lm (_mutex); @@ -120,16 +141,32 @@ AudioContent::set_audio_delay (int d) } void +AudioContent::set_audio_processor (AudioProcessor const * p) +{ + { + boost::mutex::scoped_lock lm (_mutex); + _audio_processor = p; + } + + /* 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); +} + +boost::signals2::connection AudioContent::analyse_audio (boost::function finished) { shared_ptr film = _film.lock (); - if (!film) { - return; - } + assert (film); shared_ptr job (new AnalyseAudioJob (film, dynamic_pointer_cast (shared_from_this()))); - job->Finished.connect (finished); + boost::signals2::connection c = job->Finished.connect (finished); JobManager::instance()->add (job); + + return c; } boost::filesystem::path @@ -140,11 +177,62 @@ AudioContent::audio_analysis_path () const return boost::filesystem::path (); } - return film->audio_analysis_path (dynamic_pointer_cast (shared_from_this ())); + 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, raw rate %3, out rate %4", audio_channels(), audio_length(), content_audio_frame_rate(), output_audio_frame_rate()); + 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() + ); } + +void +AudioContent::set_audio_mapping (AudioMapping) +{ + signal_changed (AudioContentProperty::AUDIO_MAPPING); +} + +/** @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::resampled_audio_frame_rate () const +{ + shared_ptr film = _film.lock (); + assert (film); + + /* Resample to a DCI-approved sample rate */ + double t = dcp_audio_frame_rate (audio_frame_rate ()); + + FrameRateChange frc = film->active_frame_rate_change (position ()); + + /* 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). + */ + + if (frc.change_speed) { + t /= frc.speed_up; + } + + return rint (t); +} + +int +AudioContent::processed_audio_channels () const +{ + if (!audio_processor ()) { + return audio_channels (); + } + + return audio_processor()->out_channels (audio_channels ()); +} +