X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Freels_test.cc;h=9718898e256547f7df4fd0b8fdbded98f5242a53;hp=c30ae6c60fa6732ee24dce7c350d27b4a183574f;hb=b1dc9c3a2f7e55c9afc5bf2d5b465371b048e14f;hpb=2d5beb0d6794df13ad1df47e84fd7a57d1d1c64d diff --git a/test/reels_test.cc b/test/reels_test.cc index c30ae6c60..9718898e2 100644 --- a/test/reels_test.cc +++ b/test/reels_test.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2015-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -42,21 +43,21 @@ BOOST_AUTO_TEST_CASE (reels_test1) shared_ptr B (new FFmpegContent (film, "test/data/test.mp4")); film->examine_and_add_content (B); wait_for_jobs (); - BOOST_CHECK_EQUAL (A->full_length(), DCPTime (288000)); + BOOST_CHECK_EQUAL (A->full_length().get(), 288000); film->set_reel_type (REELTYPE_SINGLE); list r = film->reels (); BOOST_CHECK_EQUAL (r.size(), 1); - BOOST_CHECK_EQUAL (r.front().from, DCPTime (0)); - BOOST_CHECK_EQUAL (r.front().to, DCPTime (288000 * 2)); + BOOST_CHECK_EQUAL (r.front().from.get(), 0); + BOOST_CHECK_EQUAL (r.front().to.get(), 288000 * 2); film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); r = film->reels (); BOOST_CHECK_EQUAL (r.size(), 2); - BOOST_CHECK_EQUAL (r.front().from, DCPTime (0)); - BOOST_CHECK_EQUAL (r.front().to, DCPTime (288000)); - BOOST_CHECK_EQUAL (r.back().from, DCPTime (288000)); - BOOST_CHECK_EQUAL (r.back().to, DCPTime (288000 * 2)); + BOOST_CHECK_EQUAL (r.front().from.get(), 0); + BOOST_CHECK_EQUAL (r.front().to.get(), 288000); + BOOST_CHECK_EQUAL (r.back().from.get(), 288000); + BOOST_CHECK_EQUAL (r.back().to.get(), 288000 * 2); film->set_j2k_bandwidth (100000000); film->set_reel_type (REELTYPE_BY_LENGTH); @@ -65,14 +66,14 @@ BOOST_AUTO_TEST_CASE (reels_test1) r = film->reels (); BOOST_CHECK_EQUAL (r.size(), 3); list::const_iterator i = r.begin (); - BOOST_CHECK_EQUAL (i->from, DCPTime (0)); - BOOST_CHECK_EQUAL (i->to, DCPTime::from_frames (60, 24)); + BOOST_CHECK_EQUAL (i->from.get(), 0); + BOOST_CHECK_EQUAL (i->to.get(), DCPTime::from_frames(60, 24).get()); ++i; - BOOST_CHECK_EQUAL (i->from, DCPTime::from_frames (60, 24)); - BOOST_CHECK_EQUAL (i->to, DCPTime::from_frames (120, 24)); + BOOST_CHECK_EQUAL (i->from.get(), DCPTime::from_frames(60, 24).get()); + BOOST_CHECK_EQUAL (i->to.get(), DCPTime::from_frames(120, 24).get()); ++i; - BOOST_CHECK_EQUAL (i->from, DCPTime::from_frames (120, 24)); - BOOST_CHECK_EQUAL (i->to, DCPTime::from_frames (144, 24)); + BOOST_CHECK_EQUAL (i->from.get(), DCPTime::from_frames(120, 24).get()); + BOOST_CHECK_EQUAL (i->to.get(), DCPTime::from_frames(144, 24).get()); } /** Make a short DCP with multi reels split by video content, then import @@ -83,7 +84,7 @@ BOOST_AUTO_TEST_CASE (reels_test2) shared_ptr film = new_test_film ("reels_test2"); film->set_name ("reels_test2"); film->set_container (Ratio::from_id ("185")); - film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test")); + film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); { shared_ptr c (new ImageContent (film, "test/data/flat_red.png")); @@ -117,7 +118,7 @@ BOOST_AUTO_TEST_CASE (reels_test2) shared_ptr film2 = new_test_film ("reels_test2b"); film2->set_name ("reels_test2b"); film2->set_container (Ratio::from_id ("185")); - film2->set_dcp_content_type (DCPContentType::from_pretty_name ("Test")); + film2->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); film2->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); shared_ptr c (new DCPContent (film2, film->dir (film->dcp_name ()))); @@ -127,14 +128,14 @@ BOOST_AUTO_TEST_CASE (reels_test2) list r = film2->reels (); BOOST_CHECK_EQUAL (r.size(), 3); list::const_iterator i = r.begin (); - BOOST_CHECK_EQUAL (i->from, DCPTime (0)); - BOOST_CHECK_EQUAL (i->to, DCPTime (96000)); + BOOST_CHECK_EQUAL (i->from.get(), 0); + BOOST_CHECK_EQUAL (i->to.get(), 96000); ++i; - BOOST_CHECK_EQUAL (i->from, DCPTime (96000)); - BOOST_CHECK_EQUAL (i->to, DCPTime (96000 * 2)); + BOOST_CHECK_EQUAL (i->from.get(), 96000); + BOOST_CHECK_EQUAL (i->to.get(), 96000 * 2); ++i; - BOOST_CHECK_EQUAL (i->from, DCPTime (96000 * 2)); - BOOST_CHECK_EQUAL (i->to, DCPTime (96000 * 3)); + BOOST_CHECK_EQUAL (i->from.get(), 96000 * 2); + BOOST_CHECK_EQUAL (i->to.get(), 96000 * 3); c->set_reference_video (true); c->set_reference_audio (true); @@ -151,7 +152,7 @@ BOOST_AUTO_TEST_CASE (reels_test3) shared_ptr film = new_test_film ("reels_test3"); film->set_name ("reels_test3"); film->set_container (Ratio::from_id ("185")); - film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test")); + film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); shared_ptr dcp (new DCPContent (film, "test/data/reels_test2")); @@ -163,17 +164,17 @@ BOOST_AUTO_TEST_CASE (reels_test3) list reels = film->reels(); BOOST_REQUIRE_EQUAL (reels.size(), 4); list::const_iterator i = reels.begin (); - BOOST_CHECK_EQUAL (i->from, DCPTime (0)); - BOOST_CHECK_EQUAL (i->to, DCPTime (96000)); + BOOST_CHECK_EQUAL (i->from.get(), 0); + BOOST_CHECK_EQUAL (i->to.get(), 96000); ++i; - BOOST_CHECK_EQUAL (i->from, DCPTime (96000)); - BOOST_CHECK_EQUAL (i->to, DCPTime (96000 * 2)); + BOOST_CHECK_EQUAL (i->from.get(), 96000); + BOOST_CHECK_EQUAL (i->to.get(), 96000 * 2); ++i; - BOOST_CHECK_EQUAL (i->from, DCPTime (96000 * 2)); - BOOST_CHECK_EQUAL (i->to, DCPTime (96000 * 3)); + BOOST_CHECK_EQUAL (i->from.get(), 96000 * 2); + BOOST_CHECK_EQUAL (i->to.get(), 96000 * 3); ++i; - BOOST_CHECK_EQUAL (i->from, DCPTime (96000 * 3)); - BOOST_CHECK_EQUAL (i->to, sub->full_length().round_up (film->video_frame_rate())); + BOOST_CHECK_EQUAL (i->from.get(), 96000 * 3); + BOOST_CHECK_EQUAL (i->to.get(), sub->full_length().round_up(film->video_frame_rate()).get()); } /** Check creation of a multi-reel DCP with a single .srt subtitle file; @@ -184,7 +185,7 @@ BOOST_AUTO_TEST_CASE (reels_test4) shared_ptr film = new_test_film ("reels_test4"); film->set_name ("reels_test4"); film->set_container (Ratio::from_id ("185")); - film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test")); + film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); /* 4 piece of 1s-long content */ @@ -203,17 +204,17 @@ BOOST_AUTO_TEST_CASE (reels_test4) list reels = film->reels(); BOOST_REQUIRE_EQUAL (reels.size(), 4); list::const_iterator i = reels.begin (); - BOOST_CHECK_EQUAL (i->from, DCPTime (0)); - BOOST_CHECK_EQUAL (i->to, DCPTime (96000)); + BOOST_CHECK_EQUAL (i->from.get(), 0); + BOOST_CHECK_EQUAL (i->to.get(), 96000); ++i; - BOOST_CHECK_EQUAL (i->from, DCPTime (96000)); - BOOST_CHECK_EQUAL (i->to, DCPTime (96000 * 2)); + BOOST_CHECK_EQUAL (i->from.get(), 96000); + BOOST_CHECK_EQUAL (i->to.get(), 96000 * 2); ++i; - BOOST_CHECK_EQUAL (i->from, DCPTime (96000 * 2)); - BOOST_CHECK_EQUAL (i->to, DCPTime (96000 * 3)); + BOOST_CHECK_EQUAL (i->from.get(), 96000 * 2); + BOOST_CHECK_EQUAL (i->to.get(), 96000 * 3); ++i; - BOOST_CHECK_EQUAL (i->from, DCPTime (96000 * 3)); - BOOST_CHECK_EQUAL (i->to, DCPTime (96000 * 4)); + BOOST_CHECK_EQUAL (i->from.get(), 96000 * 3); + BOOST_CHECK_EQUAL (i->to.get(), 96000 * 4); film->make_dcp (); wait_for_jobs ();