From: Carl Hetherington Date: Sun, 28 Nov 2021 09:39:03 +0000 (+0100) Subject: Rearrange checking (and re-examining) content. X-Git-Tag: v2.15.178~9 X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=94ab538738526948c5a52ed1222be1e484255541 Rearrange checking (and re-examining) content. Most importantly, checking of content for changes before making a DCP is now done in the TranscodeJob (rather than being in a separate job). This makes things a little neater and also makes the batch converter less confusing when you add a job whose content has changed. --- diff --git a/src/lib/check_content_change_job.cc b/src/lib/check_content_change_job.cc index 967291bb3..500e03c1d 100644 --- a/src/lib/check_content_change_job.cc +++ b/src/lib/check_content_change_job.cc @@ -32,11 +32,8 @@ using std::list; using std::cout; using std::shared_ptr; -/** @param gui true if we are running this job from the GUI, false if it's the CLI */ -CheckContentChangeJob::CheckContentChangeJob (shared_ptr film, shared_ptr following, bool gui) +CheckContentChangeJob::CheckContentChangeJob (shared_ptr film) : Job (film) - , _following (following) - , _gui (gui) { } @@ -68,35 +65,12 @@ CheckContentChangeJob::run () std::copy_if (content.begin(), content.end(), std::back_inserter(changed), [](shared_ptr c) { return c->changed(); }); if (!changed.empty()) { - if (_gui) { - for (auto i: changed) { - JobManager::instance()->add(shared_ptr(new ExamineContentJob(_film, i))); - } - string m = _("Some files have been changed since they were added to the project.\n\nThese files will now be re-examined, so you may need to check their settings."); - if (_following) { - /* I'm assuming that _following is a make DCP job */ - m += " "; - m += _("Choose 'Make DCP' again when you have done this."); - } - set_message (m); - } else { - set_progress (1); - set_state (FINISHED_ERROR); - set_error ( - _("Some files have been changed since they were added to the project. Open the project in DCP-o-matic, check the settings, then save it before trying again."), - "" - ); - return; + for (auto i: changed) { + JobManager::instance()->add(make_shared(_film, i)); } - } else if (_following) { - JobManager::instance()->add (_following); + set_message (_("Some files have been changed since they were added to the project.\n\nThese files will now be re-examined, so you may need to check their settings.")); } - /* Only set this job as finished once we have added the following job, otherwise I think - it's possible that the tests will sporadically fail if they check for all jobs being - complete in the gap between this one finishing and _following being added. - */ - set_progress (1); set_state (FINISHED_OK); } diff --git a/src/lib/check_content_change_job.h b/src/lib/check_content_change_job.h index 739d2651f..b3cdf594c 100644 --- a/src/lib/check_content_change_job.h +++ b/src/lib/check_content_change_job.h @@ -27,14 +27,10 @@ class CheckContentChangeJob : public Job { public: - CheckContentChangeJob (std::shared_ptr, std::shared_ptr following = std::shared_ptr(), bool gui = true); + CheckContentChangeJob (std::shared_ptr); ~CheckContentChangeJob (); std::string name () const; std::string json_name () const; void run (); - -private: - std::shared_ptr _following; - bool _gui; }; diff --git a/src/lib/film.cc b/src/lib/film.cc index 64fc04f5d..d0f0106c4 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -377,12 +377,9 @@ Film::subtitle_analysis_path (shared_ptr content) const } -/** Add suitable Jobs to the JobManager to create a DCP for this Film. - * @param gui true if this is being called from a GUI tool. - * @param check true to check the content in the project for changes before making the DCP. - */ +/** Add suitable Jobs to the JobManager to create a DCP for this Film */ void -Film::make_dcp (bool gui, bool check) +Film::make_dcp (TranscodeJob::ChangedBehaviour behaviour) { if (dcp_name().find ("/") != string::npos) { throw BadSettingError (_("name"), _("Cannot contain slashes")); @@ -438,14 +435,9 @@ Film::make_dcp (bool gui, bool check) } LOG_GENERAL ("J2K bandwidth %1", j2k_bandwidth()); - auto tj = make_shared(shared_from_this()); + auto tj = make_shared(shared_from_this(), behaviour); tj->set_encoder (make_shared(shared_from_this(), tj)); - if (check) { - auto cc = make_shared(shared_from_this(), tj, gui); - JobManager::instance()->add (cc); - } else { - JobManager::instance()->add (tj); - } + JobManager::instance()->add (tj); } /** Start a job to send our DCP to the configured TMS */ diff --git a/src/lib/film.h b/src/lib/film.h index 5255e8355..78a66e17f 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -30,6 +30,7 @@ #include "dcp_text_track.h" #include "frame_rate_change.h" #include "signaller.h" +#include "transcode_job.h" #include "types.h" #include "util.h" #include @@ -111,7 +112,7 @@ public: boost::filesystem::path subtitle_analysis_path (std::shared_ptr) const; void send_dcp_to_tms (); - void make_dcp (bool gui = false, bool check = true); + void make_dcp (TranscodeJob::ChangedBehaviour behaviour); /** @return Logger. * It is safe to call this from any thread. diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc index 8186b9e7c..68cd30e54 100644 --- a/src/lib/transcode_job.cc +++ b/src/lib/transcode_job.cc @@ -26,10 +26,12 @@ #include "analytics.h" #include "compose.hpp" +#include "content.h" #include "config.h" #include "dcp_encoder.h" #include "dcpomatic_log.h" #include "encoder.h" +#include "examine_content_job.h" #include "film.h" #include "job_manager.h" #include "log.h" @@ -52,8 +54,9 @@ using std::dynamic_pointer_cast; /** @param film Film to use */ -TranscodeJob::TranscodeJob (shared_ptr film) +TranscodeJob::TranscodeJob (shared_ptr film, ChangedBehaviour changed) : Job (film) + , _changed (changed) { } @@ -90,6 +93,32 @@ void TranscodeJob::run () { try { + auto content = _film->content(); + std::vector> changed; + std::copy_if (content.begin(), content.end(), std::back_inserter(changed), [](shared_ptr c) { return c->changed(); }); + + if (!changed.empty()) { + switch (_changed) { + case ChangedBehaviour::EXAMINE_THEN_STOP: + for (auto i: changed) { + JobManager::instance()->add(make_shared(_film, i)); + } + set_progress (1); + set_message (_("Some files have been changed since they were added to the project.\n\nThese files will now be re-examined, so you may need to check their settings before trying again.")); + set_error (_("Files have changed since they were added to the project."), _("Check their new settings, then try again.")); + set_state (FINISHED_ERROR); + return; + case ChangedBehaviour::STOP: + set_progress (1); + set_error (_("Files have changed since they were added to the project."), _("Open the project in DCP-o-matic, check the settings, then save it before trying again.")); + set_state (FINISHED_ERROR); + return; + default: + LOG_GENERAL_NC (_("Some files have been changed since they were added to the project.")); + break; + } + } + struct timeval start; gettimeofday (&start, 0); LOG_GENERAL_NC (N_("Transcode job starting")); @@ -139,29 +168,17 @@ TranscodeJob::status () const return Job::status (); } - - char buffer[256]; if (finished() || _encoder->finishing()) { - strncpy (buffer, Job::status().c_str(), 255); - buffer[255] = '\0'; - } else { - snprintf ( - buffer, sizeof(buffer), "%s; %" PRId64 "/%" PRId64 " frames", - Job::status().c_str(), - _encoder->frames_done(), - _film->length().frames_round (_film->video_frame_rate ()) - ); - - optional const fps = _encoder->current_rate (); - if (fps) { - char fps_buffer[64]; - /// TRANSLATORS: fps here is an abbreviation for frames per second - snprintf (fps_buffer, sizeof(fps_buffer), _("; %.1f fps"), *fps); - strncat (buffer, fps_buffer, strlen(buffer) - 1); - } + return Job::status(); + } + + auto status = String::compose(_("%1; %2/%3 frames"), Job::status(), _encoder->frames_done(), _film->length().frames_round(_film->video_frame_rate())); + if (auto const fps = _encoder->current_rate()) { + /// TRANSLATORS: fps here is an abbreviation for frames per second + status += String::compose(_("; %1 fps"), dcp::locale_convert(*fps, 1)); } - return buffer; + return status; } diff --git a/src/lib/transcode_job.h b/src/lib/transcode_job.h index 030e22bef..368a9b685 100644 --- a/src/lib/transcode_job.h +++ b/src/lib/transcode_job.h @@ -19,6 +19,10 @@ */ +#ifndef DCPOMATIC_TRANSCODE_JOB_H +#define DCPOMATIC_TRANSCODE_JOB_H + + /** @file src/transcode_job.h * @brief A job which transcodes from one format to another. */ @@ -27,6 +31,10 @@ #include "job.h" +/* Defined by Windows */ +#undef IGNORE + + class Encoder; @@ -36,7 +44,13 @@ class Encoder; class TranscodeJob : public Job { public: - explicit TranscodeJob (std::shared_ptr film); + enum class ChangedBehaviour { + EXAMINE_THEN_STOP, + STOP, + IGNORE + }; + + explicit TranscodeJob (std::shared_ptr film, ChangedBehaviour changed); ~TranscodeJob (); std::string name () const override; @@ -50,4 +64,9 @@ private: int remaining_time () const override; std::shared_ptr _encoder; + ChangedBehaviour _changed; }; + + +#endif + diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 0b7f632e1..70abcf3b7 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -799,7 +799,7 @@ private: a long time, and crashes/power failures are moderately likely. */ _film->write_metadata (); - _film->make_dcp (true); + _film->make_dcp (TranscodeJob::ChangedBehaviour::EXAMINE_THEN_STOP); } catch (BadSettingError& e) { error_dialog (this, wxString::Format (_("Bad setting for %s."), std_to_wx(e.setting()).data()), std_to_wx(e.what())); } catch (std::exception& e) { @@ -993,7 +993,7 @@ private: } } - auto job = make_shared(_film); + auto job = make_shared(_film, TranscodeJob::ChangedBehaviour::EXAMINE_THEN_STOP); job->set_encoder ( make_shared ( _film, job, d->path(), d->format(), d->mixdown_to_stereo(), d->split_reels(), d->split_streams(), d->x264_crf()) @@ -1008,7 +1008,7 @@ private: { auto d = new ExportSubtitlesDialog (this, _film->reels().size(), _film->interop()); if (d->ShowModal() == wxID_OK) { - auto job = make_shared(_film); + auto job = make_shared(_film, TranscodeJob::ChangedBehaviour::EXAMINE_THEN_STOP); job->set_encoder ( make_shared(_film, job, d->path(), _film->isdcf_name(true), d->split_reels(), d->include_font()) ); diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc index 061470602..29f79ff08 100644 --- a/src/tools/dcpomatic_batch.cc +++ b/src/tools/dcpomatic_batch.cc @@ -211,7 +211,7 @@ public: } } - film->make_dcp (); + film->make_dcp (TranscodeJob::ChangedBehaviour::STOP); } catch (std::exception& e) { auto p = std_to_wx (path.string ()); auto b = p.ToUTF8 (); @@ -450,7 +450,7 @@ class App : public wxApp try { film = make_shared(i); film->read_metadata (); - film->make_dcp (); + film->make_dcp (TranscodeJob::ChangedBehaviour::EXAMINE_THEN_STOP); } catch (exception& e) { error_dialog ( 0, diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc index 75f57fa89..95f2f4039 100644 --- a/src/tools/dcpomatic_cli.cc +++ b/src/tools/dcpomatic_cli.cc @@ -355,7 +355,7 @@ main (int argc, char* argv[]) cout << "\nMaking DCP for " << film->name() << "\n"; } - film->make_dcp (false, check); + film->make_dcp (check ? TranscodeJob::ChangedBehaviour::STOP : TranscodeJob::ChangedBehaviour::IGNORE); bool const error = show_jobs_on_console (progress); if (keep_going) { diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc index 993da4d23..9edf2bdbd 100644 --- a/test/ffmpeg_encoder_test.cc +++ b/test/ffmpeg_encoder_test.cc @@ -69,12 +69,12 @@ ffmpeg_content_test (int number, boost::filesystem::path content, ExportFormat f name = String::compose("%1_test%2", name, number); auto c = make_shared(content); - shared_ptr film = new_test_film2 (name, {c}, &cl); + auto film = new_test_film2 (name, {c}, &cl); film->set_name (name); film->set_audio_channels (6); film->write_metadata (); - auto job = make_shared(film); + auto job = make_shared(film, TranscodeJob::ChangedBehaviour::IGNORE); auto file = boost::filesystem::path("build") / "test" / String::compose("%1.%2", name, extension); cl.add (file); FFmpegEncoder encoder (film, job, file, format, false, false, false, 23); @@ -127,7 +127,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test5) c->video->set_length (240); film->write_metadata (); - auto job = make_shared (film); + auto job = make_shared(film, TranscodeJob::ChangedBehaviour::IGNORE); FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test5.mov", ExportFormat::PRORES, false, false, false, 23); encoder.go (); } @@ -149,7 +149,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test6) s->only_text()->set_effect_colour (dcp::Colour (0, 255, 255)); film->write_metadata(); - auto job = make_shared (film); + auto job = make_shared (film, TranscodeJob::ChangedBehaviour::IGNORE); FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test6.mov", ExportFormat::PRORES, false, false, false, 23); encoder.go (); } @@ -174,7 +174,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test7) s->only_text()->set_effect (dcp::Effect::SHADOW); s->only_text()->set_effect_colour (dcp::Colour (0, 255, 255)); - auto job = make_shared (film); + auto job = make_shared(film, TranscodeJob::ChangedBehaviour::IGNORE); FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test7.mov", ExportFormat::PRORES, false, false, false, 23); encoder.go (); } @@ -203,7 +203,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test2) s->only_text()->set_effect_colour (dcp::Colour (0, 255, 255)); film->write_metadata(); - auto job = make_shared (film); + auto job = make_shared(film, TranscodeJob::ChangedBehaviour::IGNORE); FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test2.mp4", ExportFormat::H264_AAC, false, false, false, 23); encoder.go (); } @@ -229,7 +229,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test3) s->only_text()->set_effect_colour (dcp::Colour (0, 255, 255)); film->write_metadata(); - auto job = make_shared (film); + auto job = make_shared (film, TranscodeJob::ChangedBehaviour::IGNORE); FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test3.mp4", ExportFormat::H264_AAC, false, false, false, 23); encoder.go (); } @@ -243,7 +243,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test4) film->set_container(Ratio::from_id("185")); - auto job = make_shared(film); + auto job = make_shared(film, TranscodeJob::ChangedBehaviour::IGNORE); FFmpegEncoder encoder(film, job, "build/test/ffmpeg_encoder_h264_test4.mp4", ExportFormat::H264_AAC, false, false, false, 23); encoder.go(); } @@ -298,7 +298,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test5) map.set (0, 5, 1); Rs->audio->set_mapping (map); - auto job = make_shared (film); + auto job = make_shared(film, TranscodeJob::ChangedBehaviour::IGNORE); FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test5.mp4", ExportFormat::H264_AAC, true, false, false, 23); encoder.go (); @@ -326,7 +326,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test6) i->set_use (true); } - auto job = make_shared (film2); + auto job = make_shared(film2, TranscodeJob::ChangedBehaviour::IGNORE); FFmpegEncoder encoder (film2, job, "build/test/ffmpeg_encoder_h264_test6_vf.mp4", ExportFormat::H264_AAC, true, false, false, 23); encoder.go (); } @@ -338,7 +338,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_3d_dcp_to_h264) auto dcp = make_shared(TestPaths::private_data() / "xm"); auto film2 = new_test_film2 ("ffmpeg_encoder_3d_dcp_to_h264_export", {dcp}); - auto job = make_shared (film2); + auto job = make_shared(film2, TranscodeJob::ChangedBehaviour::IGNORE); FFmpegEncoder encoder (film2, job, "build/test/ffmpeg_encoder_3d_dcp_to_h264.mp4", ExportFormat::H264_AAC, true, false, false, 23); encoder.go (); } @@ -360,7 +360,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test7) auto dcp = make_shared(film->dir(film->dcp_name())); auto film2 = new_test_film2 ("ffmpeg_encoder_h264_test7_export", {dcp}); - auto job = make_shared (film2); + auto job = make_shared (film2, TranscodeJob::ChangedBehaviour::IGNORE); FFmpegEncoder encoder (film2, job, "build/test/ffmpeg_encoder_h264_test7.mp4", ExportFormat::H264_AAC, true, false, false, 23); encoder.go (); } @@ -369,12 +369,12 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test7) /** Stereo project with mixdown-to-stereo set */ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test8) { - shared_ptr film = new_test_film2("ffmpeg_encoder_h264_test4"); - film->examine_and_add_content(shared_ptr(new DCPContent("test/data/scope_dcp"))); + auto film = new_test_film2("ffmpeg_encoder_h264_test4"); + film->examine_and_add_content(make_shared("test/data/scope_dcp")); BOOST_REQUIRE(!wait_for_jobs()); film->set_audio_channels (2); - shared_ptr job(new TranscodeJob(film)); + auto job = make_shared(film, TranscodeJob::ChangedBehaviour::IGNORE); FFmpegEncoder encoder(film, job, "build/test/ffmpeg_encoder_h264_test8.mp4", ExportFormat::H264_AAC, true, false, false, 23); encoder.go(); } @@ -385,7 +385,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test9) { shared_ptr film = new_test_film ("ffmpeg_encoder_prores_test9"); film->set_name ("ffmpeg_encoder_prores_test9"); - shared_ptr c (new ImageContent(TestPaths::private_data() / "bbc405.png")); + auto c = make_shared(TestPaths::private_data() / "bbc405.png"); film->set_container (Ratio::from_id ("185")); film->set_audio_channels (12); @@ -395,7 +395,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test9) c->video->set_length (240); film->write_metadata (); - shared_ptr job (new TranscodeJob (film)); + auto job = make_shared(film, TranscodeJob::ChangedBehaviour::IGNORE); FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test9.mov", ExportFormat::H264_AAC, false, false, false, 23); encoder.go (); } @@ -410,7 +410,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_from_dcp_with_crop) dcp->video->set_right_crop (32); film->write_metadata (); - auto job = make_shared(film); + auto job = make_shared(film, TranscodeJob::ChangedBehaviour::IGNORE); FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_from_dcp_with_crop.mov", ExportFormat::PRORES, false, false, false, 23); encoder.go (); } @@ -425,7 +425,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_from_dcp_with_crop) dcp->video->set_right_crop (32); film->write_metadata (); - auto job = make_shared(film); + auto job = make_shared(film, TranscodeJob::ChangedBehaviour::IGNORE); FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_from_dcp_with_crop.mov", ExportFormat::H264_AAC, false, false, false, 23); encoder.go (); } @@ -441,7 +441,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_with_reels) content1->video->set_length (240); content2->video->set_length (240); - auto job = make_shared(film); + auto job = make_shared(film, TranscodeJob::ChangedBehaviour::IGNORE); FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_with_reels.mov", ExportFormat::H264_AAC, false, true, false, 23); encoder.go (); @@ -463,7 +463,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_regression_1) auto content = content_factory(TestPaths::private_data() / "arrietty_JP-EN.mkv").front(); auto film = new_test_film2 ("ffmpeg_encoder_prores_regression_1", { content }); - auto job = make_shared(film); + auto job = make_shared(film, TranscodeJob::ChangedBehaviour::IGNORE); FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_regression_1.mov", ExportFormat::PRORES, false, true, false, 23); encoder.go (); } @@ -478,7 +478,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_regression_2) auto content = content_factory(TestPaths::private_data() / "tge_clip.mkv").front(); auto film = new_test_film2 ("ffmpeg_encoder_prores_regression_2", { content }); - auto job = make_shared(film); + auto job = make_shared(film, TranscodeJob::ChangedBehaviour::IGNORE); FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_regression_2.mov", ExportFormat::PRORES, false, true, false, 23); encoder.go (); diff --git a/test/interrupt_encoder_test.cc b/test/interrupt_encoder_test.cc index bc90dab42..5b76e67d3 100644 --- a/test/interrupt_encoder_test.cc +++ b/test/interrupt_encoder_test.cc @@ -54,7 +54,7 @@ BOOST_AUTO_TEST_CASE (interrupt_encoder_test) film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs()); - film->make_dcp (); + film->make_dcp (TranscodeJob::ChangedBehaviour::IGNORE); dcpomatic_sleep_seconds (10); diff --git a/test/reels_test.cc b/test/reels_test.cc index 5bb119f46..db974d384 100644 --- a/test/reels_test.cc +++ b/test/reels_test.cc @@ -564,7 +564,7 @@ BOOST_AUTO_TEST_CASE (reels_should_not_be_short4) BOOST_CHECK (film->reels().front() == dcpomatic::DCPTimePeriod(dcpomatic::DCPTime(), dcpomatic::DCPTime::from_frames(263, 24))); film->write_metadata (); - film->make_dcp (); + film->make_dcp (TranscodeJob::ChangedBehaviour::IGNORE); BOOST_REQUIRE (!wait_for_jobs()); vector dirs = { film->dir(film->dcp_name(false)) }; diff --git a/test/test.cc b/test/test.cc index c63dd132a..4ea709c81 100644 --- a/test/test.cc +++ b/test/test.cc @@ -893,7 +893,7 @@ void make_and_verify_dcp (shared_ptr film, vector ignore) { film->write_metadata (); - film->make_dcp (); + film->make_dcp (TranscodeJob::ChangedBehaviour::IGNORE); BOOST_REQUIRE (!wait_for_jobs()); auto notes = dcp::verify ({film->dir(film->dcp_name())}, &stage, &progress, TestPaths::xsd()); bool ok = true; diff --git a/test/threed_test.cc b/test/threed_test.cc index 0c8632251..bceb6700f 100644 --- a/test/threed_test.cc +++ b/test/threed_test.cc @@ -186,7 +186,7 @@ BOOST_AUTO_TEST_CASE (threed_test7) c->video->set_length (24); film->set_three_d (true); - film->make_dcp (); + film->make_dcp (TranscodeJob::ChangedBehaviour::IGNORE); film->write_metadata (); auto jm = JobManager::instance (); diff --git a/test/video_level_test.cc b/test/video_level_test.cc index ada9b602a..4483e22d5 100644 --- a/test/video_level_test.cc +++ b/test/video_level_test.cc @@ -406,7 +406,7 @@ static pair V_movie_range (shared_ptr film) { - auto job = make_shared(film); + auto job = make_shared(film, TranscodeJob::ChangedBehaviour::IGNORE); job->set_encoder ( make_shared(film, job, film->file("export.mov"), ExportFormat::PRORES, true, false, false, 23) );