diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-21 15:16:18 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-21 15:16:18 +0100 |
| commit | cbd4450197a083bf58bda510e626f73ba583cb66 (patch) | |
| tree | 2be308772512539570beab36beab02bde72d6d4b /test/ffmpeg_encoder_test.cc | |
| parent | 1013175d5f6adfa0e6a7442e4c9aebb893787748 (diff) | |
Basics of multiple captions per content so that DCPContent can
hold subs and closed captions.
Diffstat (limited to 'test/ffmpeg_encoder_test.cc')
| -rw-r--r-- | test/ffmpeg_encoder_test.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc index d9dd0f383..837541f9d 100644 --- a/test/ffmpeg_encoder_test.cc +++ b/test/ffmpeg_encoder_test.cc @@ -124,9 +124,9 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test6) shared_ptr<TextCaptionFileContent> s (new TextCaptionFileContent (film, "test/data/subrip2.srt")); film->examine_and_add_content (s); BOOST_REQUIRE (!wait_for_jobs ()); - s->caption->set_colour (dcp::Colour (255, 255, 0)); - s->caption->set_effect (dcp::SHADOW); - s->caption->set_effect_colour (dcp::Colour (0, 255, 255)); + s->only_caption()->set_colour (dcp::Colour (255, 255, 0)); + s->only_caption()->set_effect (dcp::SHADOW); + s->only_caption()->set_effect_colour (dcp::Colour (0, 255, 255)); film->write_metadata(); shared_ptr<Job> job (new TranscodeJob (film)); @@ -149,9 +149,9 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test7) shared_ptr<TextCaptionFileContent> s (new TextCaptionFileContent (film, "test/data/subrip.srt")); film->examine_and_add_content (s); BOOST_REQUIRE (!wait_for_jobs ()); - s->caption->set_colour (dcp::Colour (255, 255, 0)); - s->caption->set_effect (dcp::SHADOW); - s->caption->set_effect_colour (dcp::Colour (0, 255, 255)); + s->only_caption()->set_colour (dcp::Colour (255, 255, 0)); + s->only_caption()->set_effect (dcp::SHADOW); + s->only_caption()->set_effect_colour (dcp::Colour (0, 255, 255)); shared_ptr<Job> job (new TranscodeJob (film)); FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test7.mov", FFmpegEncoder::FORMAT_PRORES, false); @@ -175,9 +175,9 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test2) shared_ptr<TextCaptionFileContent> s (new TextCaptionFileContent (film, "test/data/subrip2.srt")); film->examine_and_add_content (s); BOOST_REQUIRE (!wait_for_jobs ()); - s->caption->set_colour (dcp::Colour (255, 255, 0)); - s->caption->set_effect (dcp::SHADOW); - s->caption->set_effect_colour (dcp::Colour (0, 255, 255)); + s->only_caption()->set_colour (dcp::Colour (255, 255, 0)); + s->only_caption()->set_effect (dcp::SHADOW); + s->only_caption()->set_effect_colour (dcp::Colour (0, 255, 255)); film->write_metadata(); shared_ptr<Job> job (new TranscodeJob (film)); @@ -200,9 +200,9 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test3) shared_ptr<TextCaptionFileContent> s (new TextCaptionFileContent (film, "test/data/subrip.srt")); film->examine_and_add_content (s); BOOST_REQUIRE (!wait_for_jobs ()); - s->caption->set_colour (dcp::Colour (255, 255, 0)); - s->caption->set_effect (dcp::SHADOW); - s->caption->set_effect_colour (dcp::Colour (0, 255, 255)); + s->only_caption()->set_colour (dcp::Colour (255, 255, 0)); + s->only_caption()->set_effect (dcp::SHADOW); + s->only_caption()->set_effect_colour (dcp::Colour (0, 255, 255)); film->write_metadata(); shared_ptr<Job> job (new TranscodeJob (film)); |