From 981ffdc9db4a84c614b3186a0fb27136fe6feb37 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 1 Apr 2021 01:25:27 +0200 Subject: Move 3D-to-2D check (#1941). We were checking for 3D content going into a 2D project in the DCPEncoder, but we also need to do the same thing when exporting. Moving the check into Player::emit_video() means that it is applied to both DCP transcoding and export. --- test/ffmpeg_encoder_test.cc | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'test/ffmpeg_encoder_test.cc') diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc index 74603f6c0..9bce836c3 100644 --- a/test/ffmpeg_encoder_test.cc +++ b/test/ffmpeg_encoder_test.cc @@ -330,6 +330,18 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test6) } +/** Test export of a 3D DCP in a 2D project */ +BOOST_AUTO_TEST_CASE (ffmpeg_encoder_3d_dcp_to_h264) +{ + auto dcp = make_shared(TestPaths::private_data() / "XMenDarkPhoenix_TLR-12-3D_F_DE-XX_DE_51_2K_TCFG_20190227_TM_IOP-3D_OV"); + auto film2 = new_test_film2 ("ffmpeg_encoder_3d_dcp_to_h264_export", {dcp}); + + auto job = make_shared (film2); + FFmpegEncoder encoder (film2, job, "build/test/ffmpeg_encoder_3d_dcp_to_h264.mp4", ExportFormat::H264_AAC, true, false, false, 23); + encoder.go (); +} + + /** Test export of a 3D DCP in a 2D project */ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test7) { -- cgit v1.2.3