X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_content.cc;h=d02728b00018f5ed6d8bc023698b6fe4a94c7536;hb=cb1dfa9ec09af2abf6d10e4bf2764476db83841b;hp=29d159a29a9603f330eb6100ed6c42743a33c630;hpb=93c996b302589dee7d43d990f3650d636345a545;p=dcpomatic.git

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index 29d159a29..d02728b00 100644
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
     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,7 +18,7 @@
 */
 
 #include <libcxml/cxml.h>
-#include <libdcp/raw_convert.h>
+#include <dcp/raw_convert.h>
 #include "audio_content.h"
 #include "analyse_audio_job.h"
 #include "job_manager.h"
@@ -26,6 +26,7 @@
 #include "exceptions.h"
 #include "config.h"
 #include "frame_rate_change.h"
+#include "audio_processor.h"
 
 #include "i18n.h"
 
@@ -34,7 +35,7 @@ using std::cout;
 using std::vector;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
-using libdcp::raw_convert;
+using dcp::raw_convert;
 
 int const AudioContentProperty::AUDIO_CHANNELS = 200;
 int const AudioContentProperty::AUDIO_LENGTH = 201;
@@ -42,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<const Film> f, Time s)
+AudioContent::AudioContent (shared_ptr<const Film> f)
+	: Content (f)
+	, _audio_gain (0)
+	, _audio_delay (Config::instance()->default_audio_delay ())
+	, _audio_processor (0)
+{
+
+}
+
+AudioContent::AudioContent (shared_ptr<const Film> f, DCPTime s)
 	: Content (f, s)
 	, _audio_gain (0)
 	, _audio_delay (Config::instance()->default_audio_delay ())
+	, _audio_processor (0)
 {
 
 }
@@ -55,15 +67,20 @@ AudioContent::AudioContent (shared_ptr<const Film> f, boost::filesystem::path p)
 	: Content (f, p)
 	, _audio_gain (0)
 	, _audio_delay (Config::instance()->default_audio_delay ())
+	, _audio_processor (0)
 {
 
 }
 
-AudioContent::AudioContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node)
+AudioContent::AudioContent (shared_ptr<const Film> f, cxml::ConstNodePtr node)
 	: Content (f, node)
+	, _audio_processor (0)
 {
 	_audio_gain = node->number_child<float> ("AudioGain");
 	_audio_delay = node->number_child<int> ("AudioDelay");
+	if (node->optional_string_child ("AudioProcessor")) {
+		_audio_processor = AudioProcessor::from_id (node->string_child ("AudioProcessor"));
+	}
 }
 
 AudioContent::AudioContent (shared_ptr<const Film> f, vector<shared_ptr<Content> > c)
@@ -86,6 +103,7 @@ AudioContent::AudioContent (shared_ptr<const Film> f, vector<shared_ptr<Content>
 
 	_audio_gain = ref->audio_gain ();
 	_audio_delay = ref->audio_delay ();
+	_audio_processor = ref->audio_processor ();
 }
 
 void
@@ -94,6 +112,9 @@ AudioContent::as_xml (xmlpp::Node* node) const
 	boost::mutex::scoped_lock lm (_mutex);
 	node->add_child("AudioGain")->add_child_text (raw_convert<string> (_audio_gain));
 	node->add_child("AudioDelay")->add_child_text (raw_convert<string> (_audio_delay));
+	if (_audio_processor) {
+		node->add_child("AudioProcessor")->add_child_text (_audio_processor->id ());
+	}
 }
 
 
@@ -119,6 +140,22 @@ AudioContent::set_audio_delay (int d)
 	signal_changed (AudioContentProperty::AUDIO_DELAY);
 }
 
+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<void()> finished)
 {
@@ -148,24 +185,38 @@ AudioContent::audio_analysis_path () const
 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::output_audio_frame_rate () const
+AudioContent::resampled_audio_frame_rate () const
 {
 	shared_ptr<const Film> film = _film.lock ();
 	assert (film);
 	
 	/* Resample to a DCI-approved sample rate */
-	double t = dcp_audio_frame_rate (content_audio_frame_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).
-	   skip/repeat doesn't come into effect here.
 	*/
 
 	if (frc.change_speed) {
@@ -175,3 +226,13 @@ AudioContent::output_audio_frame_rate () const
 	return rint (t);
 }
 
+int
+AudioContent::processed_audio_channels () const
+{
+	if (!audio_processor ()) {
+		return audio_channels ();
+	}
+
+	return audio_processor()->out_channels (audio_channels ());
+}
+