+2016-09-21 Carl Hetherington <cth@carlh.net>
+
+ * Fix trimming of OV DCPs that are referred to (#956).
+
2016-09-20 Carl Hetherington <cth@carlh.net>
* Give better errors on SubRip parse failures.
ffmpeg_options = {}
return (('ffmpeg-cdist', '1d4a1a4', ffmpeg_options),
- ('libdcp', 'b105b7d'),
+ ('libdcp', 'd6fda12'),
('libsub', '3db5052'))
def configure_options(target):
int64_t offset = 0;
BOOST_FOREACH (shared_ptr<dcp::Reel> k, decoder->reels()) {
+
+ DCPOMATIC_ASSERT (j->video_frame_rate ());
+ double const cfr = j->video_frame_rate().get();
+ Frame const trim_start = j->trim_start().frames_round (cfr);
+ Frame const trim_end = j->trim_end().frames_round (cfr);
+
DCPTime const from = i->position() + DCPTime::from_frames (offset, _film->video_frame_rate());
if (j->reference_video ()) {
+ DCPOMATIC_ASSERT (k->main_picture ());
+ k->main_picture()->set_entry_point (trim_start);
+ k->main_picture()->set_duration (k->main_picture()->intrinsic_duration() - trim_start - trim_end);
a.push_back (
ReferencedReelAsset (
k->main_picture (),
}
if (j->reference_audio ()) {
+ DCPOMATIC_ASSERT (k->main_sound ());
+ k->main_sound()->set_entry_point (trim_start);
+ k->main_sound()->set_duration (k->main_sound()->intrinsic_duration() - trim_start - trim_end);
a.push_back (
ReferencedReelAsset (
k->main_sound (),
if (j->reference_subtitle ()) {
DCPOMATIC_ASSERT (k->main_subtitle ());
+ k->main_subtitle()->set_entry_point (trim_start);
+ k->main_subtitle()->set_duration (k->main_subtitle()->intrinsic_duration() - trim_start - trim_end);
a.push_back (
ReferencedReelAsset (
k->main_subtitle (),
BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().front()->main_sound()->id(), sound_id);
BOOST_REQUIRE (vf_c.cpls().front()->reels().front()->main_subtitle());
}
+
+/** Test creation of a VF using a trimmed OV; the output should have entry point /
+ * duration altered to effect the trimming.
+ */
+BOOST_AUTO_TEST_CASE (vf_test3)
+{
+ /* Make the OV */
+ shared_ptr<Film> ov = new_test_film ("vf_test3_ov");
+ ov->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
+ ov->set_name ("vf_test3_ov");
+ shared_ptr<Content> video = content_factory (ov, "test/data/flat_red.png");
+ ov->examine_and_add_content (video);
+ wait_for_jobs ();
+ video->video->set_length (24 * 5);
+ shared_ptr<Content> audio = content_factory (ov, "test/data/white.wav");
+ ov->examine_and_add_content (audio);
+ wait_for_jobs ();
+ ov->make_dcp ();
+ wait_for_jobs ();
+
+ /* Make the VF */
+ shared_ptr<Film> vf = new_test_film ("vf_test3_vf");
+ vf->set_name ("vf_test3_vf");
+ vf->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
+ vf->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+ shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (content_factory (vf, ov->dir (ov->dcp_name ())));
+ BOOST_REQUIRE (dcp);
+ dcp->set_trim_start (ContentTime::from_seconds (1));
+ dcp->set_trim_end (ContentTime::from_seconds (1));
+ vf->examine_and_add_content (dcp);
+ wait_for_jobs ();
+ dcp->set_reference_video (true);
+ dcp->set_reference_audio (true);
+ vf->make_dcp ();
+ wait_for_jobs ();
+ vf->write_metadata ();
+}