X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_content.cc;h=3ea31f673457f4200642f29ab8640c04ce240512;hb=0a93237cb5e4642d3b698ff9b7d0cfae5401478c;hp=3c0d13ba93c1b98b5bbd1760f33ecc16c38786db;hpb=cc3900735839ff4b0da0c046b5c606c440ba917a;p=dcpomatic.git diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc index 3c0d13ba9..3ea31f673 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-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,28 +17,41 @@ */ -#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 +#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::lexical_cast; using boost::dynamic_pointer_cast; +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 f) + : Content (f) + , _audio_gain (0) + , _audio_delay (Config::instance()->default_audio_delay ()) +{ -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; +} AudioContent::AudioContent (shared_ptr f, DCPTime s) : Content (f, s) @@ -56,11 +69,9 @@ AudioContent::AudioContent (shared_ptr f, boost::filesystem::path p) } -AudioContent::AudioContent (shared_ptr f, shared_ptr node) +AudioContent::AudioContent (shared_ptr f, cxml::ConstNodePtr node) : Content (f, node) { - LocaleGuard lg; - _audio_gain = node->number_child ("AudioGain"); _audio_delay = node->number_child ("AudioDelay"); } @@ -69,7 +80,7 @@ AudioContent::AudioContent (shared_ptr f, vector : Content (f, 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]); @@ -90,16 +101,14 @@ AudioContent::AudioContent (shared_ptr f, vector 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)); } void -AudioContent::set_audio_gain (float g) +AudioContent::set_audio_gain (double g) { { boost::mutex::scoped_lock lm (_mutex); @@ -124,7 +133,7 @@ boost::signals2::connection AudioContent::analyse_audio (boost::function finished) { shared_ptr film = _film.lock (); - assert (film); + DCPOMATIC_ASSERT (film); shared_ptr job (new AnalyseAudioJob (film, dynamic_pointer_cast (shared_from_this()))); boost::signals2::connection c = job->Finished.connect (finished); @@ -141,35 +150,153 @@ 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()); + string s = "audio :"; + BOOST_FOREACH (AudioStreamPtr i, audio_streams ()) { + s += String::compose ("stream channels %1 rate %2", i->channels(), i->frame_rate()); + } + + return s; +} + +void +AudioContent::set_audio_mapping (AudioMapping mapping) +{ + int c = 0; + BOOST_FOREACH (AudioStreamPtr i, audio_streams ()) { + AudioMapping stream_mapping (i->channels ()); + for (int j = 0; j < i->channels(); ++j) { + for (int k = 0; k < MAX_DCP_AUDIO_CHANNELS; ++k) { + stream_mapping.set (j, static_cast (k), mapping.get (c, static_cast (k))); + } + ++c; + } + i->set_mapping (stream_mapping); + } + + signal_changed (AudioContentProperty::AUDIO_STREAMS); } -/** Note: this is not particularly fast, as the FrameRateChange lookup - * is not very intelligent. - * - * @param t Some duration to convert. - * @param at The time within the DCP to get the active frame rate change from; i.e. a point at which - * the `controlling' video content is active. +AudioMapping +AudioContent::audio_mapping () const +{ + int channels = 0; + BOOST_FOREACH (AudioStreamPtr i, audio_streams ()) { + channels += i->channels (); + } + + AudioMapping merged (channels); + + int c = 0; + int s = 0; + BOOST_FOREACH (AudioStreamPtr i, audio_streams ()) { + AudioMapping mapping = i->mapping (); + for (int j = 0; j < mapping.content_channels(); ++j) { + merged.set_name (c, String::compose ("%1:%2", s + 1, j + 1)); + for (int k = 0; k < MAX_DCP_AUDIO_CHANNELS; ++k) { + merged.set (c, static_cast (k), mapping.get (j, static_cast (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. */ -AudioFrame -AudioContent::time_to_content_audio_frames (DCPTime t, DCPTime at) const +int +AudioContent::resampled_audio_frame_rate () const { shared_ptr film = _film.lock (); - assert (film); + DCPOMATIC_ASSERT (film); - /* Consider the case where we're running a 25fps video at 24fps (i.e. slow) - Our audio is at 44.1kHz. We will resample it to 48000 * 25 / 24 and then - run it at 48kHz (i.e. slow, to match). + /* Resample to a DCI-approved sample rate */ + double t = has_rate_above_48k() ? 96000 : 48000; - After 1 second, we'll have run the equivalent of 44.1kHz * 24 / 25 samples - in the source. + 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). */ - - return rint (t * content_audio_frame_rate() * film->active_frame_rate_change(at).speed_up / TIME_HZ); + + if (frc.change_speed) { + t /= frc.speed_up; + } + + return rint (t); +} + +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 ""; +} + +bool +AudioContent::has_rate_above_48k () const +{ + BOOST_FOREACH (AudioStreamPtr i, audio_streams ()) { + if (i->frame_rate() > 48000) { + return true; + } + } + + return false; }