X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Freel_writer_test.cc;h=18a3275630342deb0479cb8575aaf87790f0cabf;hp=db63ca8bf0247668b5980574e24f2e27af52627d;hb=6d686ea45f5cd01a0d11f92a903ac77779ad8562;hpb=ab0e8cdcafdcb83096012380f674b8280474e851 diff --git a/test/reel_writer_test.cc b/test/reel_writer_test.cc index db63ca8bf..18a327563 100644 --- a/test/reel_writer_test.cc +++ b/test/reel_writer_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2019 Carl Hetherington + Copyright (C) 2019-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,71 +18,137 @@ */ + /** @file test/reel_writer_test.cc * @brief Test ReelWriter class. * @ingroup selfcontained */ -#include "lib/reel_writer.h" -#include "lib/film.h" + +#include "lib/audio_content.h" +#include "lib/content.h" +#include "lib/content_factory.h" #include "lib/cross.h" +#include "lib/film.h" +#include "lib/reel_writer.h" +#include "lib/video_content.h" #include "test.h" +#include +#include +#include +#include +#include #include + +using std::shared_ptr; 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; + auto 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) { - shared_ptr film = new_test_film2 ("write_frame_info_test"); + auto film = new_test_film2 ("write_frame_info_test"); dcpomatic::DCPTimePeriod const period (dcpomatic::DCPTime(0), dcpomatic::DCPTime(96000)); - ReelWriter writer (film, period, shared_ptr(), 0, 1, optional()); + ReelWriter writer (film, period, shared_ptr(), 0, 1, false); /* 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)); + writer.write_frame_info (0, Eyes::LEFT, info1); + { + auto 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)); + writer.write_frame_info (5, Eyes::RIGHT, info2); - BOOST_CHECK (equal(info1, writer, file, 0, EYES_LEFT)); - BOOST_CHECK (equal(info2, writer, file, 5, EYES_RIGHT)); + { + auto 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)); + writer.write_frame_info (10, Eyes::LEFT, info3); - 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)); + { + auto 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)); + writer.write_frame_info (5, Eyes::RIGHT, info4); + + { + auto 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)); + } +} - 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 */ + auto video = content_factory("test/data/flat_red.png").front(); + auto audio = content_factory("test/data/white.wav").front(); + auto film = new_test_film2 ("reel_reuse_video_test", { video, audio }); + make_and_verify_dcp (film); + + /* 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()[0]->reels().size(), 1U); + BOOST_REQUIRE (dcp1.cpls()[0]->reels()[0]->main_picture()); + BOOST_REQUIRE (dcp1.cpls()[0]->reels()[0]->main_sound()); + auto const picture_id = dcp1.cpls()[0]->reels()[0]->main_picture()->asset()->id(); + auto const sound_id = dcp1.cpls()[0]->reels()[0]->main_sound()->asset()->id(); + + /* Change the audio and re-make */ + audio->audio->set_gain (-3); + make_and_verify_dcp (film); + + /* 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()[0]->reels().size(), 1U); + BOOST_REQUIRE (dcp2.cpls()[0]->reels()[0]->main_picture()); + BOOST_REQUIRE (dcp2.cpls()[0]->reels()[0]->main_sound()); + BOOST_CHECK_EQUAL (picture_id, dcp2.cpls()[0]->reels()[0]->main_picture()->asset()->id()); + BOOST_CHECK (sound_id != dcp2.cpls()[0]->reels().front()->main_sound()->asset()->id()); + + /* Crop video and re-make */ + video->video->set_left_crop (5); + make_and_verify_dcp (film); + + /* 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()[0]->reels().size(), 1U); + BOOST_REQUIRE (dcp3.cpls()[0]->reels()[0]->main_picture()); + BOOST_REQUIRE (dcp3.cpls()[0]->reels()[0]->main_sound()); + BOOST_CHECK (picture_id != dcp3.cpls()[0]->reels()[0]->main_picture()->asset()->id()); + BOOST_CHECK (sound_id != dcp3.cpls()[0]->reels().front()->main_sound()->asset()->id()); }