X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fwriter.cc;h=2a2925cf0e1224a0e7776d5884633517833228f1;hp=7792dda8e28c7655d7c1c372a3ab7116bda0980e;hb=a31cfda11a8e3260cdf267be056cb9b4f4b158dd;hpb=cb5f295b5dc8f4bade8fb9e27587bf94afa1ac69

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 7792dda8e..2a2925cf0 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -153,19 +153,11 @@ Writer::write (shared_ptr<const Data> encoded, Frame frame, Eyes eyes)
 	qi.reel = video_reel (frame);
 	qi.frame = frame - _reels[qi.reel].start ();
 
-	if (film()->three_d() && eyes == Eyes::BOTH) {
-		/* 2D material in a 3D DCP; fake the 3D */
-		qi.eyes = Eyes::LEFT;
-		_queue.push_back (qi);
-		++_queued_full_in_memory;
-		qi.eyes = Eyes::RIGHT;
-		_queue.push_back (qi);
-		++_queued_full_in_memory;
-	} else {
-		qi.eyes = eyes;
-		_queue.push_back (qi);
-		++_queued_full_in_memory;
-	}
+	DCPOMATIC_ASSERT((film()->three_d() && eyes != Eyes::BOTH) || (!film()->three_d() && eyes == Eyes::BOTH));
+
+	qi.eyes = eyes;
+	_queue.push_back(qi);
+	++_queued_full_in_memory;
 
 	/* Now there's something to do: wake anything wait()ing on _empty_condition */
 	_empty_condition.notify_all ();
@@ -239,17 +231,12 @@ Writer::fake_write (Frame frame, Eyes eyes)
 		qi.size = _reels[reel].read_frame_info(info_file, frame_in_reel, eyes).size;
 	}
 
+	DCPOMATIC_ASSERT((film()->three_d() && eyes != Eyes::BOTH) || (!film()->three_d() && eyes == Eyes::BOTH));
+
 	qi.reel = reel;
 	qi.frame = frame_in_reel;
-	if (film()->three_d() && eyes == Eyes::BOTH) {
-		qi.eyes = Eyes::LEFT;
-		_queue.push_back (qi);
-		qi.eyes = Eyes::RIGHT;
-		_queue.push_back (qi);
-	} else {
-		qi.eyes = eyes;
-		_queue.push_back (qi);
-	}
+	qi.eyes = eyes;
+	_queue.push_back(qi);
 
 	/* Now there's something to do: wake anything wait()ing on _empty_condition */
 	_empty_condition.notify_all ();
@@ -657,14 +644,17 @@ Writer::finish (boost::filesystem::path output_dcp)
 		cpl->set_sign_language_video_language (*film()->sign_language_video_language());
 	}
 
-	auto ac = film()->mapped_audio_channels();
-	dcp::MCASoundField field = (
-		find(ac.begin(), ac.end(), static_cast<int>(dcp::Channel::BSL)) != ac.end() ||
-		find(ac.begin(), ac.end(), static_cast<int>(dcp::Channel::BSR)) != ac.end()
-		) ? dcp::MCASoundField::SEVEN_POINT_ONE : dcp::MCASoundField::FIVE_POINT_ONE;
+	dcp::MCASoundField field;
+	if (film()->audio_channels() == 2) {
+		field = dcp::MCASoundField::STEREO;
+	} else if (film()->audio_channels() <= 6) {
+		field = dcp::MCASoundField::FIVE_POINT_ONE;
+	} else {
+		field = dcp::MCASoundField::SEVEN_POINT_ONE;
+	}
 
 	dcp::MainSoundConfiguration msc (field, film()->audio_channels());
-	for (auto i: ac) {
+	for (auto i: film()->mapped_audio_channels()) {
 		if (static_cast<int>(i) < film()->audio_channels()) {
 			msc.set_mapping (i, static_cast<dcp::Channel>(i));
 		}
@@ -676,8 +666,8 @@ Writer::finish (boost::filesystem::path output_dcp)
 
 	auto active_area = film()->active_area();
 	if (active_area.width > 0 && active_area.height > 0) {
-		/* It's not allowed to have a zero active area width or height */
-		cpl->set_main_picture_active_area (active_area);
+		/* It's not allowed to have a zero active area width or height, and the sizes must be multiples of 2 */
+		cpl->set_main_picture_active_area({ active_area.width & ~1, active_area.height & ~1});
 	}
 
 	auto sl = film()->subtitle_languages().second;
@@ -696,7 +686,7 @@ Writer::finish (boost::filesystem::path output_dcp)
 	dcp.set_creator(creator);
 	dcp.set_annotation_text(film()->dcp_name());
 
-	dcp.write_xml (signer, Config::instance()->dcp_metadata_filename_format());
+	dcp.write_xml(signer, !film()->limit_to_smpte_bv20(), Config::instance()->dcp_metadata_filename_format());
 
 	LOG_GENERAL (
 		N_("Wrote %1 FULL, %2 FAKE, %3 REPEAT, %4 pushed to disk"), _full_written, _fake_written, _repeat_written, _pushed_to_disk
@@ -801,7 +791,7 @@ Writer::can_fake_write (Frame frame) const
 
 	/* Make frame relative to the start of the reel */
 	frame -= reel.start ();
-	return (frame != 0 && frame < reel.first_nonexistant_frame());
+	return (frame != 0 && frame < reel.first_nonexistent_frame());
 }