From 4fbe44913582d6cc48a7d61145f3170fb0eec595 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 23 Jun 2017 20:35:15 +0100 Subject: [PATCH] Add a OV/VF test; tidy up a bit. --- src/lib/player.cc | 57 +++++++++++++++---------------------------- src/lib/player.h | 3 --- test/vf_test.cc | 61 ++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 79 insertions(+), 42 deletions(-) diff --git a/src/lib/player.cc b/src/lib/player.cc index 5bb073177..523475160 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -156,20 +156,6 @@ Player::setup_pieces () } } - if (!_play_referenced) { - BOOST_FOREACH (shared_ptr i, _pieces) { - shared_ptr dc = dynamic_pointer_cast (i->content); - if (dc) { - if (dc->reference_video()) { - _no_video.push_back (DCPTimePeriod (dc->position(), dc->end())); - } - if (dc->reference_audio()) { - _no_audio.push_back (DCPTimePeriod (dc->position(), dc->end())); - } - } - } - } - _last_video_time = DCPTime (); _last_audio_time = DCPTime (); _have_valid_pieces = true; @@ -582,6 +568,9 @@ Player::pass () } if (_last_audio_time) { + /* Fill in the gap before delayed audio; this doesn't need to take into account + periods with no audio as it should only occur in delayed audio case. + */ fill_audio (DCPTimePeriod (*_last_audio_time, i->second)); } @@ -635,21 +624,15 @@ Player::video (weak_ptr wp, ContentVideo video) /* Fill gaps that we discover now that we have some video which needs to be emitted */ - optional fill_to; if (_last_video_time) { - fill_to = _last_video_time; - } - - if (fill_to) { /* XXX: this may not work for 3D */ - BOOST_FOREACH (DCPTimePeriod i, subtract(DCPTimePeriod (*fill_to, time), _no_video)) { - for (DCPTime j = i.from; j < i.to; j += one_video_frame()) { - LastVideoMap::const_iterator k = _last_video.find (wp); - if (k != _last_video.end ()) { - emit_video (k->second, j); - } else { - emit_video (black_player_video_frame(), j); - } + DCPTime fill_from = max (*_last_video_time, piece->content->position()); + for (DCPTime j = fill_from; j < time; j += one_video_frame()) { + LastVideoMap::const_iterator k = _last_video.find (wp); + if (k != _last_video.end ()) { + emit_video (k->second, j); + } else { + emit_video (black_player_video_frame(), j); } } } @@ -909,18 +892,16 @@ Player::fill_audio (DCPTimePeriod period) DCPOMATIC_ASSERT (period.from < period.to); - BOOST_FOREACH (DCPTimePeriod i, subtract(period, _no_audio)) { - DCPTime t = i.from; - while (t < i.to) { - DCPTime block = min (DCPTime::from_seconds (0.5), i.to - t); - Frame const samples = block.frames_round(_film->audio_frame_rate()); - if (samples) { - shared_ptr silence (new AudioBuffers (_film->audio_channels(), samples)); - silence->make_silent (); - emit_audio (silence, t); - } - t += block; + DCPTime t = period.from; + while (t < period.to) { + DCPTime block = min (DCPTime::from_seconds (0.5), period.to - t); + Frame const samples = block.frames_round(_film->audio_frame_rate()); + if (samples) { + shared_ptr silence (new AudioBuffers (_film->audio_channels(), samples)); + silence->make_silent (); + emit_audio (silence, t); } + t += block; } } diff --git a/src/lib/player.h b/src/lib/player.h index 20d9c9388..b4d00223b 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -165,9 +165,6 @@ private: }; std::map _stream_states; - std::list _no_video; - std::list _no_audio; - ActiveSubtitles _active_subtitles; boost::shared_ptr _audio_processor; diff --git a/test/vf_test.cc b/test/vf_test.cc index 4abd12635..96ef8f718 100644 --- a/test/vf_test.cc +++ b/test/vf_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2016 Carl Hetherington + Copyright (C) 2015-2017 Carl Hetherington This file is part of DCP-o-matic. @@ -39,6 +39,7 @@ using std::list; using std::string; +using std::cout; using boost::shared_ptr; using boost::dynamic_pointer_cast; @@ -185,3 +186,61 @@ BOOST_AUTO_TEST_CASE (vf_test3) BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().front()->main_sound()->entry_point(), 24); BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().front()->main_sound()->duration(), 72); } + +/** Make a OV with video and audio and a VF referencing the OV and adding some more video */ +BOOST_AUTO_TEST_CASE (vf_test4) +{ + /* Make the OV */ + shared_ptr ov = new_test_film ("vf_test4_ov"); + ov->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); + ov->set_name ("vf_test4_ov"); + shared_ptr video = content_factory (ov, "test/data/flat_red.png").front(); + ov->examine_and_add_content (video); + wait_for_jobs (); + video->video->set_length (24 * 5); + shared_ptr audio = content_factory(ov, "test/data/white.wav").front(); + ov->examine_and_add_content (audio); + wait_for_jobs (); + ov->make_dcp (); + wait_for_jobs (); + + /* Make the VF */ + shared_ptr vf = new_test_film ("vf_test4_vf"); + vf->set_name ("vf_test4_vf"); + vf->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); + vf->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); + vf->set_sequence (false); + shared_ptr dcp (new DCPContent (vf, ov->dir (ov->dcp_name ()))); + BOOST_REQUIRE (dcp); + vf->examine_and_add_content (dcp); + wait_for_jobs (); + dcp->set_position(DCPTime::from_seconds(10)); + dcp->set_reference_video (true); + dcp->set_reference_audio (true); + shared_ptr more_video = content_factory(vf, "test/data/flat_red.png").front(); + vf->examine_and_add_content (more_video); + DCPOMATIC_ASSERT (!wait_for_jobs ()); + more_video->set_position (DCPTime ()); + vf->write_metadata (); + vf->make_dcp (); + DCPOMATIC_ASSERT (!wait_for_jobs ()); + + dcp::DCP ov_c (ov->dir (ov->dcp_name ())); + ov_c.read (); + BOOST_REQUIRE_EQUAL (ov_c.cpls().size(), 1); + BOOST_REQUIRE_EQUAL (ov_c.cpls().front()->reels().size(), 1); + BOOST_REQUIRE (ov_c.cpls().front()->reels().front()->main_picture()); + string const pic_id = ov_c.cpls().front()->reels().front()->main_picture()->id(); + BOOST_REQUIRE (ov_c.cpls().front()->reels().front()->main_sound()); + string const sound_id = ov_c.cpls().front()->reels().front()->main_sound()->id(); + BOOST_REQUIRE (!ov_c.cpls().front()->reels().front()->main_subtitle()); + + dcp::DCP vf_c (vf->dir (vf->dcp_name ())); + vf_c.read (); + BOOST_REQUIRE_EQUAL (vf_c.cpls().size(), 1); + BOOST_REQUIRE_EQUAL (vf_c.cpls().front()->reels().size(), 2); + BOOST_REQUIRE (vf_c.cpls().front()->reels().back()->main_picture()); + BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().back()->main_picture()->id(), pic_id); + BOOST_REQUIRE (vf_c.cpls().front()->reels().back()->main_sound()); + BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().back()->main_sound()->id(), sound_id); +} -- 2.30.2