From cbd4450197a083bf58bda510e626f73ba583cb66 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 21 Jul 2018 15:16:18 +0100 Subject: Basics of multiple captions per content so that DCPContent can hold subs and closed captions. --- test/vf_test.cc | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'test/vf_test.cc') diff --git a/test/vf_test.cc b/test/vf_test.cc index 3b3077242..5cded6e25 100644 --- a/test/vf_test.cc +++ b/test/vf_test.cc @@ -57,14 +57,16 @@ BOOST_AUTO_TEST_CASE (vf_test1) string why_not; BOOST_CHECK (!dcp->can_reference_video(why_not)); BOOST_CHECK (!dcp->can_reference_audio(why_not)); - BOOST_CHECK (!dcp->can_reference_subtitle(why_not)); + BOOST_CHECK (!dcp->can_reference_caption(CAPTION_OPEN, why_not)); + BOOST_CHECK (!dcp->can_reference_caption(CAPTION_CLOSED, why_not)); /* Multi-reel DCP can be referenced if we are using by-video-content */ film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); BOOST_CHECK (dcp->can_reference_video(why_not)); BOOST_CHECK (dcp->can_reference_audio(why_not)); - /* (but reels_test2 has no subtitles to reference) */ - BOOST_CHECK (!dcp->can_reference_subtitle(why_not)); + /* (but reels_test2 has no captions to reference) */ + BOOST_CHECK (!dcp->can_reference_caption(CAPTION_OPEN, why_not)); + BOOST_CHECK (!dcp->can_reference_caption(CAPTION_CLOSED, why_not)); shared_ptr other (new FFmpegContent (film, "test/data/test.mp4")); film->examine_and_add_content (other); @@ -74,14 +76,16 @@ BOOST_AUTO_TEST_CASE (vf_test1) other->set_position (DCPTime (0)); BOOST_CHECK (!dcp->can_reference_video(why_not)); BOOST_CHECK (!dcp->can_reference_audio(why_not)); - BOOST_CHECK (!dcp->can_reference_subtitle(why_not)); + BOOST_CHECK (!dcp->can_reference_caption(CAPTION_OPEN, why_not)); + BOOST_CHECK (!dcp->can_reference_caption(CAPTION_CLOSED, why_not)); /* This should not be considered an overlap */ other->set_position (dcp->end ()); BOOST_CHECK (dcp->can_reference_video(why_not)); BOOST_CHECK (dcp->can_reference_audio(why_not)); - /* (reels_test2 has no subtitles to reference) */ - BOOST_CHECK (!dcp->can_reference_subtitle(why_not)); + /* (reels_test2 has no captions to reference) */ + BOOST_CHECK (!dcp->can_reference_caption(CAPTION_OPEN, why_not)); + BOOST_CHECK (!dcp->can_reference_caption(CAPTION_CLOSED, why_not)); } /** Make a OV with video and audio and a VF referencing the OV and adding subs */ -- cgit v1.2.3