X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Freel_writer.cc;h=31860e8816131da9973231612a19d415866001d9;hb=refs%2Fheads%2F2493-player-export-frame;hp=a247349d5a08c0f75e89dfcff5ec7ed05e5a3341;hpb=c103d8c1306e5fb3937b3a6c430a3fff32653fa3;p=dcpomatic.git

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index a247349d5..31860e881 100644
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -114,6 +114,7 @@ ReelWriter::ReelWriter (
 	, _content_summary (film()->content_summary(period))
 	, _job (job)
 	, _text_only (text_only)
+	, _font_metrics(film()->frame_size().height)
 {
 	/* Create or find our picture asset in a subdirectory, named
 	   according to those film's parameters which affect the video
@@ -194,7 +195,8 @@ ReelWriter::ReelWriter (
 		*/
 		_sound_asset_writer = _sound_asset->start_write (
 			film()->directory().get() / audio_asset_filename (_sound_asset, _reel_index, _reel_count, _content_summary),
-			film()->contains_atmos_content()
+			film()->contains_atmos_content(),
+			!film()->limit_to_smpte_bv20()
 			);
 	}
 
@@ -315,7 +317,7 @@ ReelWriter::write (shared_ptr<const Data> encoded, Frame frame, Eyes eyes)
 
 	auto fin = _picture_asset_writer->write (encoded->data(), encoded->size());
 	write_frame_info (frame, eyes, fin);
-	_last_written[static_cast<int>(eyes)] = encoded;
+	_last_written[eyes] = encoded;
 }
 
 
@@ -355,10 +357,7 @@ ReelWriter::repeat_write (Frame frame, Eyes eyes)
 		return;
 	}
 
-	auto fin = _picture_asset_writer->write (
-		_last_written[static_cast<int>(eyes)]->data(),
-		_last_written[static_cast<int>(eyes)]->size()
-		);
+	auto fin = _picture_asset_writer->write(_last_written[eyes]->data(), _last_written[eyes]->size());
 	write_frame_info (frame, eyes, fin);
 }
 
@@ -858,39 +857,69 @@ ReelWriter::empty_text_asset (TextType type, optional<DCPTextTrack> track, bool
 		if (film()->encrypted()) {
 			s->set_key (film()->key());
 		}
-		if (with_dummy) {
-			s->add (
-				std::make_shared<dcp::SubtitleString>(
-					optional<std::string>(),
-					false,
-					false,
-					false,
-					dcp::Colour(),
-					42,
-					1.0,
-					dcp::Time(0, 0, 0, 0, 24),
-					dcp::Time(0, 0, 1, 0, 24),
-					0.5,
-					dcp::HAlign::CENTER,
-					0.5,
-					dcp::VAlign::CENTER,
-					dcp::Direction::LTR,
-					" ",
-					dcp::Effect::NONE,
-					dcp::Colour(),
-					dcp::Time(),
-					dcp::Time(),
-					0
-					)
-			       );
-		}
 		asset = s;
 	}
 
+	if (with_dummy) {
+		asset->add(
+			std::make_shared<dcp::SubtitleString>(
+				optional<std::string>(),
+				false,
+				false,
+				false,
+				dcp::Colour(),
+				42,
+				1.0,
+				dcp::Time(0, 0, 0, 0, 24),
+				dcp::Time(0, 0, 1, 0, 24),
+				0.5,
+				dcp::HAlign::CENTER,
+				0.5,
+				dcp::VAlign::CENTER,
+				0,
+				dcp::Direction::LTR,
+				" ",
+				dcp::Effect::NONE,
+				dcp::Colour(),
+				dcp::Time(),
+				dcp::Time(),
+				0
+				)
+		       );
+	}
+
 	return asset;
 }
 
 
+float
+ReelWriter::convert_vertical_position(StringText const& subtitle, dcp::SubtitleStandard to) const
+{
+	if (dcp::uses_baseline(subtitle.valign_standard) == dcp::uses_baseline(to)) {
+		/* The from and to standards use the same alignment reference */
+		return subtitle.v_position();
+	}
+
+	auto const baseline_to_bottom = _font_metrics.baseline_to_bottom(subtitle);
+	auto const height = _font_metrics.height(subtitle);
+
+	float correction = 0;
+	switch (subtitle.v_align()) {
+	case dcp::VAlign::TOP:
+		correction = height - baseline_to_bottom;
+		break;
+	case dcp::VAlign::CENTER:
+		correction = (height / 2) - baseline_to_bottom;
+		break;
+	case dcp::VAlign::BOTTOM:
+		correction = baseline_to_bottom;
+		break;
+	}
+
+	return subtitle.v_position() + (dcp::uses_bounding_box(subtitle.valign_standard) ? correction : -correction);
+}
+
+
 void
 ReelWriter::write (PlayerText subs, TextType type, optional<DCPTextTrack> track, DCPTimePeriod period, FontIdMap const& fonts)
 {
@@ -930,6 +959,7 @@ ReelWriter::write (PlayerText subs, TextType type, optional<DCPTextTrack> track,
 	for (auto i: subs.string) {
 		i.set_in  (dcp::Time(period.from.seconds() - _period.from.seconds(), tcr));
 		i.set_out (dcp::Time(period.to.seconds() - _period.from.seconds(), tcr));
+		i.set_v_position(convert_vertical_position(i, film()->interop() ? dcp::SubtitleStandard::INTEROP : dcp::SubtitleStandard::SMPTE_2014));
 		auto sub = make_shared<dcp::SubtitleString>(i);
 		if (type == TextType::OPEN_SUBTITLE) {
 			sub->set_font(fonts.get(i.font));
@@ -943,7 +973,7 @@ ReelWriter::write (PlayerText subs, TextType type, optional<DCPTextTrack> track,
 				image_as_png(i.image),
 				dcp::Time(period.from.seconds() - _period.from.seconds(), tcr),
 				dcp::Time(period.to.seconds() - _period.from.seconds(), tcr),
-				i.rectangle.x, dcp::HAlign::LEFT, i.rectangle.y, dcp::VAlign::TOP,
+				i.rectangle.x, dcp::HAlign::LEFT, i.rectangle.y, dcp::VAlign::TOP, 0,
 				dcp::Time(), dcp::Time()
 				)
 			);