X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=5686a0a6ff7f2a14f31a1a109fb32345131264ed;hp=4933de71bb0a85fd13acfb670b37fc086f664d62;hb=da44da6f31f97d39ca91c35955e573e76371f2c2;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 4933de71b..5686a0a6f 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -50,6 +50,7 @@ int const VideoContentProperty::FADE_OUT          = 7;
 int const VideoContentProperty::RANGE             = 8;
 int const VideoContentProperty::CUSTOM_RATIO      = 9;
 int const VideoContentProperty::CUSTOM_SIZE       = 10;
+int const VideoContentProperty::BURNT_SUBTITLE_LANGUAGE = 11;
 
 using std::string;
 using std::setprecision;
@@ -62,6 +63,7 @@ using std::setprecision;
 using std::list;
 using std::pair;
 using std::shared_ptr;
+using std::make_shared;
 using boost::optional;
 using std::dynamic_pointer_cast;
 using dcp::raw_convert;
@@ -71,11 +73,11 @@ VideoContent::VideoContent (Content* parent)
 	: ContentPart (parent)
 	, _use (true)
 	, _length (0)
-	, _frame_type (VIDEO_FRAME_TYPE_2D)
+	, _frame_type (VideoFrameType::TWO_D)
 	, _yuv (true)
 	, _fade_in (0)
 	, _fade_out (0)
-	, _range (VIDEO_RANGE_FULL)
+	, _range (VideoRange::FULL)
 {
 
 }
@@ -84,10 +86,10 @@ shared_ptr<VideoContent>
 VideoContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version)
 {
 	if (!node->optional_number_child<int> ("VideoWidth")) {
-		return shared_ptr<VideoContent> ();
+		return {};
 	}
 
-	return shared_ptr<VideoContent> (new VideoContent (parent, node, version));
+	return make_shared<VideoContent>(parent, node, version);
 }
 
 VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int version)
@@ -97,7 +99,7 @@ VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int versio
 	_size.height = node->number_child<int> ("VideoHeight");
 
 	/* Backwards compatibility */
-	optional<double> r = node->optional_number_child<double>("VideoFrameRate");
+	auto r = node->optional_number_child<double>("VideoFrameRate");
 	if (r) {
 		_parent->set_video_frame_rate (r.get ());
 	}
@@ -109,22 +111,22 @@ VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int versio
 		/* Snapshot of the VideoFrameType enum at version 34 */
 		switch (node->number_child<int> ("VideoFrameType")) {
 		case 0:
-			_frame_type = VIDEO_FRAME_TYPE_2D;
+			_frame_type = VideoFrameType::TWO_D;
 			break;
 		case 1:
-			_frame_type = VIDEO_FRAME_TYPE_3D_LEFT_RIGHT;
+			_frame_type = VideoFrameType::THREE_D_LEFT_RIGHT;
 			break;
 		case 2:
-			_frame_type = VIDEO_FRAME_TYPE_3D_TOP_BOTTOM;
+			_frame_type = VideoFrameType::THREE_D_TOP_BOTTOM;
 			break;
 		case 3:
-			_frame_type = VIDEO_FRAME_TYPE_3D_ALTERNATE;
+			_frame_type = VideoFrameType::THREE_D_ALTERNATE;
 			break;
 		case 4:
-			_frame_type = VIDEO_FRAME_TYPE_3D_LEFT;
+			_frame_type = VideoFrameType::THREE_D_LEFT;
 			break;
 		case 5:
-			_frame_type = VIDEO_FRAME_TYPE_3D_RIGHT;
+			_frame_type = VideoFrameType::THREE_D_RIGHT;
 			break;
 		}
 	} else {
@@ -138,16 +140,16 @@ VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int versio
 	_crop.bottom = node->number_child<int> ("BottomCrop");
 
 	if (version <= 7) {
-		optional<string> r = node->optional_string_child ("Ratio");
+		auto r = node->optional_string_child ("Ratio");
 		if (r) {
 			_legacy_ratio = Ratio::from_id(r.get())->ratio();
 		}
 	} else if (version <= 37) {
-		optional<string> ratio = node->node_child("Scale")->optional_string_child("Ratio");
+		auto ratio = node->node_child("Scale")->optional_string_child("Ratio");
 		if (ratio) {
 			_legacy_ratio = Ratio::from_id(ratio.get())->ratio();
 		}
-		optional<bool> scale = node->node_child("Scale")->optional_bool_child("Scale");
+		auto scale = node->node_child("Scale")->optional_bool_child("Scale");
 		if (scale) {
 			if (*scale) {
 				/* This is what we used to call "no stretch" */
@@ -178,18 +180,25 @@ VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int versio
 		_fade_in = _fade_out = 0;
 	}
 
-	_range = VIDEO_RANGE_FULL;
+	_range = VideoRange::FULL;
 	if (node->optional_string_child("Range").get_value_or("full") == "video") {
-		_range = VIDEO_RANGE_VIDEO;
+		_range = VideoRange::VIDEO;
 	}
+
+	auto burnt = node->optional_string_child("BurntSubtitleLanguage");
+	if (burnt) {
+		_burnt_subtitle_language = dcp::LanguageTag (*burnt);
+	}
+
 }
 
+
 VideoContent::VideoContent (Content* parent, vector<shared_ptr<Content> > c)
 	: ContentPart (parent)
 	, _length (0)
 	, _yuv (false)
 {
-	shared_ptr<VideoContent> ref = c[0]->video;
+	auto ref = c[0]->video;
 	DCPOMATIC_ASSERT (ref);
 
 	for (size_t i = 1; i < c.size(); ++i) {
@@ -226,6 +235,10 @@ VideoContent::VideoContent (Content* parent, vector<shared_ptr<Content> > c)
 			throw JoinError (_("Content to be joined must have the same fades."));
 		}
 
+		if (c[i]->video->burnt_subtitle_language() != ref->burnt_subtitle_language()) {
+			throw JoinError (_("Content to be joined must have the same burnt subtitle language."));
+		}
+
 		_length += c[i]->video->length ();
 
 		if (c[i]->video->yuv ()) {
@@ -242,8 +255,10 @@ VideoContent::VideoContent (Content* parent, vector<shared_ptr<Content> > c)
 	_fade_in = ref->fade_in ();
 	_fade_out = ref->fade_out ();
 	_range = ref->range ();
+	_burnt_subtitle_language = ref->burnt_subtitle_language ();
 }
 
+
 void
 VideoContent::as_xml (xmlpp::Node* node) const
 {
@@ -270,23 +285,26 @@ VideoContent::as_xml (xmlpp::Node* node) const
 	node->add_child("YUV")->add_child_text (_yuv ? "1" : "0");
 	node->add_child("FadeIn")->add_child_text (raw_convert<string> (_fade_in));
 	node->add_child("FadeOut")->add_child_text (raw_convert<string> (_fade_out));
-	node->add_child("Range")->add_child_text(_range == VIDEO_RANGE_FULL ? "full" : "video");
+	node->add_child("Range")->add_child_text(_range == VideoRange::FULL ? "full" : "video");
+	if (_burnt_subtitle_language) {
+		node->add_child("BurntSubtitleLanguage")->add_child_text(_burnt_subtitle_language->to_string());
+	}
 }
 
 void
 VideoContent::take_from_examiner (shared_ptr<VideoExaminer> d)
 {
 	/* These examiner calls could call other content methods which take a lock on the mutex */
-	dcp::Size const vs = d->video_size ();
-	Frame vl = d->video_length ();
-	optional<double> const ar = d->sample_aspect_ratio ();
-	bool const yuv = d->yuv ();
-	VideoRange const range = d->range ();
+	auto const vs = d->video_size ();
+	auto vl = d->video_length ();
+	auto const ar = d->sample_aspect_ratio ();
+	auto const yuv = d->yuv ();
+	auto const range = d->range ();
 
-	ChangeSignaller<Content> cc1 (_parent, VideoContentProperty::SIZE);
-	ChangeSignaller<Content> cc2 (_parent, VideoContentProperty::SCALE);
-	ChangeSignaller<Content> cc3 (_parent, ContentProperty::LENGTH);
-	ChangeSignaller<Content> cc4 (_parent, VideoContentProperty::RANGE);
+	ContentChangeSignaller cc1 (_parent, VideoContentProperty::SIZE);
+	ContentChangeSignaller cc2 (_parent, VideoContentProperty::SCALE);
+	ContentChangeSignaller cc3 (_parent, ContentProperty::LENGTH);
+	ContentChangeSignaller cc4 (_parent, VideoContentProperty::RANGE);
 
 	{
 		boost::mutex::scoped_lock lm (_mutex);
@@ -321,7 +339,7 @@ VideoContent::identifier () const
 		_custom_size ? _custom_size->height : 0,
 		_fade_in,
 		_fade_out,
-		_range == VIDEO_RANGE_FULL ? 0 : 1
+		_range == VideoRange::FULL ? 0 : 1
 		);
 
 	string s (buffer);
@@ -353,17 +371,17 @@ VideoContent::technical_summary () const
 dcp::Size
 VideoContent::size_after_3d_split () const
 {
-	dcp::Size const s = size ();
+	auto const s = size ();
 	switch (frame_type ()) {
-	case VIDEO_FRAME_TYPE_2D:
-	case VIDEO_FRAME_TYPE_3D:
-	case VIDEO_FRAME_TYPE_3D_ALTERNATE:
-	case VIDEO_FRAME_TYPE_3D_LEFT:
-	case VIDEO_FRAME_TYPE_3D_RIGHT:
+	case VideoFrameType::TWO_D:
+	case VideoFrameType::THREE_D:
+	case VideoFrameType::THREE_D_ALTERNATE:
+	case VideoFrameType::THREE_D_LEFT:
+	case VideoFrameType::THREE_D_RIGHT:
 		return s;
-	case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
+	case VideoFrameType::THREE_D_LEFT_RIGHT:
 		return dcp::Size (s.width / 2, s.height);
-	case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM:
+	case VideoFrameType::THREE_D_TOP_BOTTOM:
 		return dcp::Size (s.width, s.height / 2);
 	}
 
@@ -388,12 +406,12 @@ VideoContent::fade (shared_ptr<const Film> film, Frame f) const
 
 	double const vfr = _parent->active_video_frame_rate(film);
 
-	Frame const ts = _parent->trim_start().frames_round(vfr);
+	auto const ts = _parent->trim_start().frames_round(vfr);
 	if ((f - ts) < fade_in()) {
 		return double (f - ts) / fade_in();
 	}
 
-	Frame fade_out_start = length() - _parent->trim_end().frames_round(vfr) - fade_out();
+	auto fade_out_start = length() - _parent->trim_end().frames_round(vfr) - fade_out();
 	if (f >= fade_out_start) {
 		return 1 - double (f - fade_out_start) / fade_out();
 	}
@@ -438,8 +456,8 @@ VideoContent::processing_description (shared_ptr<const Film> film)
 		d += buffer;
 	}
 
-	dcp::Size const container_size = film->frame_size ();
-	dcp::Size const scaled = scaled_size (container_size);
+	auto const container_size = film->frame_size ();
+	auto const scaled = scaled_size (container_size);
 
 	if (scaled != size_after_crop ()) {
 		d += String::compose (
@@ -555,6 +573,14 @@ VideoContent::set_use (bool u)
 	maybe_set (_use, u, VideoContentProperty::USE);
 }
 
+
+void
+VideoContent::set_burnt_subtitle_language (boost::optional<dcp::LanguageTag> language)
+{
+	maybe_set (_burnt_subtitle_language, language, VideoContentProperty::BURNT_SUBTITLE_LANGUAGE);
+}
+
+
 void
 VideoContent::take_settings_from (shared_ptr<const VideoContent> c)
 {
@@ -573,8 +599,10 @@ VideoContent::take_settings_from (shared_ptr<const VideoContent> c)
 	set_custom_size (c->_custom_size);
 	set_fade_in (c->_fade_in);
 	set_fade_out (c->_fade_out);
+	set_burnt_subtitle_language (c->_burnt_subtitle_language);
 }
 
+
 void
 VideoContent::modify_position (shared_ptr<const Film> film, DCPTime& pos) const
 {
@@ -602,11 +630,11 @@ VideoContent::scaled_size (dcp::Size film_container)
 		return *_custom_size;
 	}
 
-	dcp::Size size = size_after_crop ();
+	auto size = size_after_crop ();
 	size.width *= _sample_aspect_ratio.get_value_or(1);
 
 	/* This is what we will return unless there is any legacy stuff to take into account */
-	dcp::Size auto_size = fit_ratio_within (size.ratio(), film_container);
+	auto auto_size = fit_ratio_within (size.ratio(), film_container);
 
 	if (_legacy_ratio) {
 		if (fit_ratio_within(*_legacy_ratio, film_container) != auto_size) {