X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Faudio_content.cc;h=7083de714dcf411946c65598cdaf07d23e52ee32;hb=f4fda1d705adfca0b7c8d3748c0c9df8e9da51bc;hp=ad8d7df0fdbb731a0a9844a00d70808d53066e87;hpb=0e164ad80f0ceff9d643f3b466690d013c3be19d;p=dcpomatic.git

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index ad8d7df0f..7083de714 100644
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -22,10 +22,12 @@
 #include "audio_content.h"
 #include "compose.hpp"
 #include "config.h"
+#include "constants.h"
 #include "exceptions.h"
 #include "film.h"
 #include "frame_rate_change.h"
 #include "maths_util.h"
+#include "video_content.h"
 #include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
@@ -55,6 +57,7 @@ int const AudioContentProperty::GAIN = 201;
 int const AudioContentProperty::DELAY = 202;
 int const AudioContentProperty::FADE_IN = 203;
 int const AudioContentProperty::FADE_OUT = 204;
+int const AudioContentProperty::USE_SAME_FADES_AS_VIDEO = 205;
 
 
 AudioContent::AudioContent (Content* parent)
@@ -94,12 +97,7 @@ AudioContent::AudioContent (Content* parent, cxml::ConstNodePtr node)
 	_delay = node->number_child<int> ("AudioDelay");
 	_fade_in = ContentTime(node->optional_number_child<ContentTime::Type>("AudioFadeIn").get_value_or(0));
 	_fade_out = ContentTime(node->optional_number_child<ContentTime::Type>("AudioFadeOut").get_value_or(0));
-
-	/* Backwards compatibility */
-	auto r = node->optional_number_child<double>("AudioVideoFrameRate");
-	if (r) {
-		_parent->set_video_frame_rate (r.get());
-	}
+	_use_same_fades_as_video = node->optional_bool_child("AudioUseSameFadesAsVideo").get_value_or(false);
 }
 
 
@@ -133,6 +131,7 @@ AudioContent::as_xml (xmlpp::Node* node) const
 	node->add_child("AudioDelay")->add_child_text(raw_convert<string>(_delay));
 	node->add_child("AudioFadeIn")->add_child_text(raw_convert<string>(_fade_in.get()));
 	node->add_child("AudioFadeOut")->add_child_text(raw_convert<string>(_fade_out.get()));
+	node->add_child("AudioUseSameFadesAsVideo")->add_child_text(_use_same_fades_as_video ? "1" : "0");
 }
 
 
@@ -314,7 +313,10 @@ AudioContent::add_properties (shared_ptr<const Film> film, list<UserProperty>& p
 
 	if (stream) {
 		p.push_back (UserProperty(UserProperty::AUDIO, _("Channels"), stream->channels()));
-		p.push_back (UserProperty(UserProperty::AUDIO, _("Content audio sample rate"), stream->frame_rate(), _("Hz")));
+		p.push_back (UserProperty(UserProperty::AUDIO, _("Content sample rate"), stream->frame_rate(), _("Hz")));
+		if (auto bits = stream->bit_depth()) {
+			p.push_back(UserProperty(UserProperty::AUDIO, _("Content bit depth"), *bits, _("bits")));
+		}
 	}
 
 	FrameRateChange const frc (_parent->active_video_frame_rate(film), film->video_frame_rate());
@@ -400,12 +402,16 @@ AudioContent::take_settings_from (shared_ptr<const AudioContent> c)
 {
 	set_gain (c->_gain);
 	set_delay (c->_delay);
+	set_fade_in (c->fade_in());
+	set_fade_out (c->fade_out());
 
 	size_t i = 0;
 	size_t j = 0;
 
 	while (i < _streams.size() && j < c->_streams.size()) {
-		_streams[i]->set_mapping (c->_streams[j]->mapping());
+		auto mapping = _streams[i]->mapping();
+		mapping.take_from(c->_streams[j]->mapping());
+		_streams[i]->set_mapping(mapping);
 		++i;
 		++j;
 	}
@@ -420,11 +426,37 @@ AudioContent::modify_position (shared_ptr<const Film> film, DCPTime& pos) const
 
 
 void
-AudioContent::modify_trim_start (ContentTime& trim) const
+AudioContent::modify_trim_start(shared_ptr<const Film> film, ContentTime& trim) const
+{
+	/* When this trim is used it the audio will have been resampled, and using the
+	 * DCP rate here reduces the chance of rounding errors causing audio glitches
+	 * due to errors in placement of audio frames (#2373).
+	 */
+	trim = trim.round(film ? film->audio_frame_rate() : 48000);
+}
+
+
+ContentTime
+AudioContent::fade_in () const
+{
+	boost::mutex::scoped_lock lm (_mutex);
+	if (_use_same_fades_as_video && _parent->video) {
+		return dcpomatic::ContentTime::from_frames(_parent->video->fade_in(), _parent->video_frame_rate().get_value_or(24));
+	}
+
+	return _fade_in;
+}
+
+
+ContentTime
+AudioContent::fade_out () const
 {
-	DCPOMATIC_ASSERT (!_streams.empty());
-	/* XXX: we're in trouble if streams have different rates */
-	trim = trim.round (_streams.front()->frame_rate());
+	boost::mutex::scoped_lock lm (_mutex);
+	if (_use_same_fades_as_video && _parent->video) {
+		return dcpomatic::ContentTime::from_frames(_parent->video->fade_out(), _parent->video_frame_rate().get_value_or(24));
+	}
+
+	return _fade_out;
 }
 
 
@@ -442,6 +474,13 @@ AudioContent::set_fade_out (ContentTime t)
 }
 
 
+void
+AudioContent::set_use_same_fades_as_video (bool s)
+{
+	maybe_set (_use_same_fades_as_video, s, AudioContentProperty::USE_SAME_FADES_AS_VIDEO);
+}
+
+
 vector<float>
 AudioContent::fade (AudioStreamPtr stream, Frame frame, Frame length, int frame_rate) const
 {