X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Freel_writer_test.cc;h=51c820ba31a1500210f2bf0a0561d2b121648c80;hb=b29eb5107c5e77fe01e43010e1582e733f6ceea1;hp=db63ca8bf0247668b5980574e24f2e27af52627d;hpb=ab0e8cdcafdcb83096012380f674b8280474e851;p=dcpomatic.git diff --git a/test/reel_writer_test.cc b/test/reel_writer_test.cc index db63ca8bf..51c820ba3 100644 --- a/test/reel_writer_test.cc +++ b/test/reel_writer_test.cc @@ -26,21 +26,26 @@ #include "lib/reel_writer.h" #include "lib/film.h" #include "lib/cross.h" +#include "lib/content_factory.h" +#include "lib/content.h" +#include "lib/audio_content.h" +#include "lib/video_content.h" #include "test.h" +#include +#include +#include +#include +#include #include using std::string; using boost::shared_ptr; using boost::optional; -static bool equal (dcp::FrameInfo a, ReelWriter const & writer, boost::filesystem::path file, Frame frame, Eyes eyes) +static bool equal (dcp::FrameInfo a, ReelWriter const & writer, shared_ptr file, Frame frame, Eyes eyes) { - FILE* f = fopen_boost(file, "rb"); - BOOST_REQUIRE (f); - dcp::FrameInfo b = writer.read_frame_info(f, frame, eyes); - bool const r = a.offset == b.offset && a.size == b.size && a.hash == b.hash; - fclose (f); - return r; + dcp::FrameInfo b = writer.read_frame_info(file, frame, eyes); + return a.offset == b.offset && a.size == b.size && a.hash == b.hash; } BOOST_AUTO_TEST_CASE (write_frame_info_test) @@ -51,38 +56,100 @@ BOOST_AUTO_TEST_CASE (write_frame_info_test) /* Write the first one */ - boost::filesystem::path file = film->info_file (period); - BOOST_CHECK (!boost::filesystem::exists(file)); dcp::FrameInfo info1(0, 123, "12345678901234567890123456789012"); writer.write_frame_info (0, EYES_LEFT, info1); - BOOST_CHECK (boost::filesystem::exists(file)); - - BOOST_CHECK (equal(info1, writer, file, 0, EYES_LEFT)); + { + shared_ptr file = film->info_file_handle(period, true); + BOOST_CHECK (equal(info1, writer, file, 0, EYES_LEFT)); + } /* Write some more */ dcp::FrameInfo info2(596, 14921, "123acb789f1234ae782012n456339522"); writer.write_frame_info (5, EYES_RIGHT, info2); - BOOST_CHECK (boost::filesystem::exists(file)); - BOOST_CHECK (equal(info1, writer, file, 0, EYES_LEFT)); - BOOST_CHECK (equal(info2, writer, file, 5, EYES_RIGHT)); + { + shared_ptr file = film->info_file_handle(period, true); + BOOST_CHECK (equal(info1, writer, file, 0, EYES_LEFT)); + BOOST_CHECK (equal(info2, writer, file, 5, EYES_RIGHT)); + } dcp::FrameInfo info3(12494, 99157123, "xxxxyyyyabc12356ffsfdsf456339522"); writer.write_frame_info (10, EYES_LEFT, info3); - BOOST_CHECK (boost::filesystem::exists(file)); - BOOST_CHECK (equal(info1, writer, file, 0, EYES_LEFT)); - BOOST_CHECK (equal(info2, writer, file, 5, EYES_RIGHT)); - BOOST_CHECK (equal(info3, writer, file, 10, EYES_LEFT)); + { + shared_ptr file = film->info_file_handle(period, true); + BOOST_CHECK (equal(info1, writer, file, 0, EYES_LEFT)); + BOOST_CHECK (equal(info2, writer, file, 5, EYES_RIGHT)); + BOOST_CHECK (equal(info3, writer, file, 10, EYES_LEFT)); + } /* Overwrite one */ dcp::FrameInfo info4(55512494, 123599157123, "ABCDEFGyabc12356ffsfdsf4563395ZZ"); writer.write_frame_info (5, EYES_RIGHT, info4); - BOOST_CHECK (boost::filesystem::exists(file)); - BOOST_CHECK (equal(info1, writer, file, 0, EYES_LEFT)); - BOOST_CHECK (equal(info4, writer, file, 5, EYES_RIGHT)); - BOOST_CHECK (equal(info3, writer, file, 10, EYES_LEFT)); + { + shared_ptr file = film->info_file_handle(period, true); + BOOST_CHECK (equal(info1, writer, file, 0, EYES_LEFT)); + BOOST_CHECK (equal(info4, writer, file, 5, EYES_RIGHT)); + BOOST_CHECK (equal(info3, writer, file, 10, EYES_LEFT)); + } +} + +/** Check that the reel writer correctly re-uses a video asset changed if we remake + * a DCP with no video changes. + */ +BOOST_AUTO_TEST_CASE (reel_reuse_video_test) +{ + /* Make a DCP */ + shared_ptr film = new_test_film2 ("reel_reuse_video_test"); + shared_ptr video = content_factory("test/data/flat_red.png").front(); + film->examine_and_add_content (video); + BOOST_REQUIRE (!wait_for_jobs()); + shared_ptr audio = content_factory("test/data/white.wav").front(); + film->examine_and_add_content (audio); + BOOST_REQUIRE (!wait_for_jobs()); + film->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs()); + + /* Find main picture and sound asset IDs */ + dcp::DCP dcp1 (film->dir(film->dcp_name())); + dcp1.read (); + BOOST_REQUIRE_EQUAL (dcp1.cpls().size(), 1U); + BOOST_REQUIRE_EQUAL (dcp1.cpls().front()->reels().size(), 1U); + BOOST_REQUIRE (dcp1.cpls().front()->reels().front()->main_picture()); + BOOST_REQUIRE (dcp1.cpls().front()->reels().front()->main_sound()); + string const picture_id = dcp1.cpls().front()->reels().front()->main_picture()->asset()->id(); + string const sound_id = dcp1.cpls().front()->reels().front()->main_sound()->asset()->id(); + + /* Change the audio and re-make */ + audio->audio->set_gain (-3); + film->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs()); + + /* Video ID should be the same, sound different */ + dcp::DCP dcp2 (film->dir(film->dcp_name())); + dcp2.read (); + BOOST_REQUIRE_EQUAL (dcp2.cpls().size(), 1U); + BOOST_REQUIRE_EQUAL (dcp2.cpls().front()->reels().size(), 1U); + BOOST_REQUIRE (dcp2.cpls().front()->reels().front()->main_picture()); + BOOST_REQUIRE (dcp2.cpls().front()->reels().front()->main_sound()); + BOOST_CHECK_EQUAL (picture_id, dcp2.cpls().front()->reels().front()->main_picture()->asset()->id()); + BOOST_CHECK (sound_id != dcp2.cpls().front()->reels().front()->main_sound()->asset()->id()); + + /* Crop video and re-make */ + video->video->set_left_crop (5); + film->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs()); + + /* Video and sound IDs should be different */ + dcp::DCP dcp3 (film->dir(film->dcp_name())); + dcp3.read (); + BOOST_REQUIRE_EQUAL (dcp3.cpls().size(), 1U); + BOOST_REQUIRE_EQUAL (dcp3.cpls().front()->reels().size(), 1U); + BOOST_REQUIRE (dcp3.cpls().front()->reels().front()->main_picture()); + BOOST_REQUIRE (dcp3.cpls().front()->reels().front()->main_sound()); + BOOST_CHECK (picture_id != dcp3.cpls().front()->reels().front()->main_picture()->asset()->id()); + BOOST_CHECK (sound_id != dcp3.cpls().front()->reels().front()->main_sound()->asset()->id()); }