diff options
30 files changed, 53 insertions, 48 deletions
diff --git a/src/lib/atmos_mxf_content.cc b/src/lib/atmos_mxf_content.cc index 6b2a64d68..df044a5d4 100644 --- a/src/lib/atmos_mxf_content.cc +++ b/src/lib/atmos_mxf_content.cc @@ -75,10 +75,10 @@ AtmosMXFContent::valid_mxf (boost::filesystem::path path) void -AtmosMXFContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job) +AtmosMXFContent::examine(shared_ptr<const Film> film, shared_ptr<Job> job, bool tolerant) { job->set_progress_unknown (); - Content::examine (film, job); + Content::examine(film, job, tolerant); auto a = make_shared<dcp::AtmosAsset>(path(0)); { diff --git a/src/lib/atmos_mxf_content.h b/src/lib/atmos_mxf_content.h index b0bdeb92f..135371739 100644 --- a/src/lib/atmos_mxf_content.h +++ b/src/lib/atmos_mxf_content.h @@ -37,7 +37,7 @@ public: return std::dynamic_pointer_cast<const AtmosMXFContent> (Content::shared_from_this()); } - void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job> job) override; + void examine(std::shared_ptr<const Film> film, std::shared_ptr<Job> job, bool tolerant) override; std::string summary () const override; void as_xml( diff --git a/src/lib/check_content_job.cc b/src/lib/check_content_job.cc index 2028b01ac..bb43158ae 100644 --- a/src/lib/check_content_job.cc +++ b/src/lib/check_content_job.cc @@ -82,7 +82,7 @@ CheckContentJob::run () if (!changed.empty()) { for (auto i: changed) { - JobManager::instance()->add(make_shared<ExamineContentJob>(_film, i)); + JobManager::instance()->add(make_shared<ExamineContentJob>(_film, i, false)); } 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.")); } diff --git a/src/lib/content.cc b/src/lib/content.cc index 5c44cb47a..5e6dd7e31 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -181,7 +181,7 @@ Content::calculate_digest () const void -Content::examine (shared_ptr<const Film>, shared_ptr<Job> job) +Content::examine(shared_ptr<const Film>, shared_ptr<Job> job, bool) { if (job) { job->sub (_("Computing digest")); diff --git a/src/lib/content.h b/src/lib/content.h index 29dce2c9e..1b4f2b40c 100644 --- a/src/lib/content.h +++ b/src/lib/content.h @@ -86,8 +86,10 @@ public: /** Examine the content to establish digest, frame rates and any other * useful metadata. * @param job Job to use to report progress, or 0. + * @param tolerant true to try to carry on in the presence of problems with the content, + * false to throw exceptions in these cases. */ - virtual void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job> job); + virtual void examine(std::shared_ptr<const Film> film, std::shared_ptr<Job> job, bool tolerant); virtual void take_settings_from (std::shared_ptr<const Content> c); diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index 5b4f163e1..ae2a08c29 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -229,7 +229,7 @@ DCPContent::read_sub_directory (boost::filesystem::path p) /** @param film Film, or 0 */ void -DCPContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job) +DCPContent::examine(shared_ptr<const Film> film, shared_ptr<Job> job, bool tolerant) { bool const needed_assets = needs_assets (); bool const needed_kdm = needs_kdm (); @@ -248,9 +248,9 @@ DCPContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job) if (job) { job->set_progress_unknown (); } - Content::examine (film, job); + Content::examine(film, job, tolerant); - auto examiner = make_shared<DCPExaminer>(shared_from_this(), film ? film->tolerant() : true); + auto examiner = make_shared<DCPExaminer>(shared_from_this(), tolerant); if (examiner->has_video()) { { diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h index e781633d4..8545adf06 100644 --- a/src/lib/dcp_content.h +++ b/src/lib/dcp_content.h @@ -73,7 +73,7 @@ public: dcpomatic::DCPTime full_length (std::shared_ptr<const Film> film) const override; dcpomatic::DCPTime approximate_length () const override; - void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job>) override; + void examine(std::shared_ptr<const Film> film, std::shared_ptr<Job>, bool tolerant) override; std::string summary () const override; std::string technical_summary () const override; diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc index 21c1b4de9..21159fcac 100644 --- a/src/lib/dcp_subtitle_content.cc +++ b/src/lib/dcp_subtitle_content.cc @@ -57,9 +57,9 @@ DCPSubtitleContent::DCPSubtitleContent(cxml::ConstNodePtr node, boost::optional< } void -DCPSubtitleContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job) +DCPSubtitleContent::examine(shared_ptr<const Film> film, shared_ptr<Job> job, bool tolerant) { - Content::examine (film, job); + Content::examine(film, job, tolerant); auto subtitle_asset = load(path(0)); diff --git a/src/lib/dcp_subtitle_content.h b/src/lib/dcp_subtitle_content.h index 14d36fb69..dde3139a8 100644 --- a/src/lib/dcp_subtitle_content.h +++ b/src/lib/dcp_subtitle_content.h @@ -27,7 +27,7 @@ public: DCPSubtitleContent (boost::filesystem::path); DCPSubtitleContent (cxml::ConstNodePtr, boost::optional<boost::filesystem::path> film_directory, int); - void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job>) override; + void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job>, bool tolerant) override; std::string summary () const override; std::string technical_summary () const override; diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc index baa11ac93..799cda2ab 100644 --- a/src/lib/examine_content_job.cc +++ b/src/lib/examine_content_job.cc @@ -34,9 +34,10 @@ using std::cout; using std::shared_ptr; -ExamineContentJob::ExamineContentJob (shared_ptr<const Film> film, shared_ptr<Content> c) - : Job (film) - , _content (c) +ExamineContentJob::ExamineContentJob(shared_ptr<const Film> film, shared_ptr<Content> content, bool tolerant) + : Job(film) + , _content(content) + , _tolerant(tolerant) { } @@ -65,7 +66,7 @@ ExamineContentJob::json_name () const void ExamineContentJob::run () { - _content->examine (_film, shared_from_this()); + _content->examine(_film, shared_from_this(), _tolerant); set_progress (1); set_state (FINISHED_OK); } diff --git a/src/lib/examine_content_job.h b/src/lib/examine_content_job.h index 601b28584..cdcba3430 100644 --- a/src/lib/examine_content_job.h +++ b/src/lib/examine_content_job.h @@ -28,7 +28,7 @@ class Content; class ExamineContentJob : public Job { public: - ExamineContentJob (std::shared_ptr<const Film>, std::shared_ptr<Content>); + ExamineContentJob(std::shared_ptr<const Film> film, std::shared_ptr<Content> content, bool tolerant); ~ExamineContentJob (); std::string name () const override; @@ -41,4 +41,6 @@ public: private: std::shared_ptr<Content> _content; + + bool _tolerant; }; diff --git a/src/lib/fcpxml_content.cc b/src/lib/fcpxml_content.cc index cac3305ef..e72ce2d7d 100644 --- a/src/lib/fcpxml_content.cc +++ b/src/lib/fcpxml_content.cc @@ -50,9 +50,9 @@ FCPXMLContent::FCPXMLContent(cxml::ConstNodePtr node, optional<boost::filesystem void -FCPXMLContent::examine(shared_ptr<const Film> film, shared_ptr<Job> job) +FCPXMLContent::examine(shared_ptr<const Film> film, shared_ptr<Job> job, bool tolerant) { - Content::examine(film, job); + Content::examine(film, job, tolerant); auto sequence = dcpomatic::fcpxml::load(path(0)); diff --git a/src/lib/fcpxml_content.h b/src/lib/fcpxml_content.h index 701fd6d02..229ac757d 100644 --- a/src/lib/fcpxml_content.h +++ b/src/lib/fcpxml_content.h @@ -41,7 +41,7 @@ public: return std::dynamic_pointer_cast<const FCPXMLContent>(Content::shared_from_this()); } - void examine(std::shared_ptr<const Film> film, std::shared_ptr<Job>) override; + void examine(std::shared_ptr<const Film> film, std::shared_ptr<Job>, bool tolerant) override; std::string summary() const override; std::string technical_summary() const override; void as_xml(xmlpp::Element*, bool with_paths, PathBehaviour path_behaviour, boost::optional<boost::filesystem::path> film_directory) const override; diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index 49e4933a6..8434197c5 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -257,7 +257,7 @@ FFmpegContent::as_xml(xmlpp::Element* element, bool with_paths, PathBehaviour pa void -FFmpegContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job) +FFmpegContent::examine(shared_ptr<const Film> film, shared_ptr<Job> job, bool tolerant) { ContentChangeSignaller cc1 (this, FFmpegContentProperty::SUBTITLE_STREAMS); ContentChangeSignaller cc2 (this, FFmpegContentProperty::SUBTITLE_STREAM); @@ -266,7 +266,7 @@ FFmpegContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job) job->set_progress_unknown (); } - Content::examine (film, job); + Content::examine(film, job, tolerant); auto examiner = make_shared<FFmpegExaminer>(shared_from_this (), job); diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h index a0fe9a0c0..ca2f56619 100644 --- a/src/lib/ffmpeg_content.h +++ b/src/lib/ffmpeg_content.h @@ -66,7 +66,7 @@ public: return std::dynamic_pointer_cast<const FFmpegContent> (Content::shared_from_this ()); } - void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job>) override; + void examine(std::shared_ptr<const Film> film, std::shared_ptr<Job>, bool tolerant) override; void take_settings_from (std::shared_ptr<const Content> c) override; std::string summary () const override; std::string technical_summary () const override; diff --git a/src/lib/film.cc b/src/lib/film.cc index e2df95e32..dd702a3fd 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -1422,7 +1422,7 @@ Film::examine_and_add_content (shared_ptr<Content> content, bool disable_audio_a run_ffprobe (content->path(0), file("ffprobe.log")); } - auto j = make_shared<ExamineContentJob>(shared_from_this(), content); + auto j = make_shared<ExamineContentJob>(shared_from_this(), content, false); _job_connections.push_back ( j->Finished.connect (bind (&Film::maybe_add_content, this, weak_ptr<Job>(j), weak_ptr<Content>(content), disable_audio_analysis)) diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc index e7ba88194..218c0e80c 100644 --- a/src/lib/image_content.cc +++ b/src/lib/image_content.cc @@ -112,7 +112,7 @@ ImageContent::as_xml(xmlpp::Element* element, bool with_paths, PathBehaviour pat void -ImageContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job) +ImageContent::examine(shared_ptr<const Film> film, shared_ptr<Job> job, bool tolerant) { if (_path_to_scan) { job->sub (_("Scanning image files")); @@ -136,7 +136,7 @@ ImageContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job) set_paths (paths); } - Content::examine (film, job); + Content::examine(film, job, tolerant); auto examiner = make_shared<ImageExaminer>(film, shared_from_this(), job); video->take_from_examiner(film, examiner); diff --git a/src/lib/image_content.h b/src/lib/image_content.h index 73ae696ad..4b3b13380 100644 --- a/src/lib/image_content.h +++ b/src/lib/image_content.h @@ -37,7 +37,7 @@ public: return std::dynamic_pointer_cast<const ImageContent> (Content::shared_from_this ()); }; - void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job>) override; + void examine(std::shared_ptr<const Film> film, std::shared_ptr<Job>, bool tolerant) override; std::string summary () const override; std::string technical_summary () const override; diff --git a/src/lib/string_text_file_content.cc b/src/lib/string_text_file_content.cc index 6b5492af9..5ecf50a12 100644 --- a/src/lib/string_text_file_content.cc +++ b/src/lib/string_text_file_content.cc @@ -78,9 +78,9 @@ font_names(StringTextFile const& string_text_file) void -StringTextFileContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job) +StringTextFileContent::examine(shared_ptr<const Film> film, shared_ptr<Job> job, bool tolerant) { - Content::examine (film, job); + Content::examine(film, job, tolerant); StringTextFile file (shared_from_this()); only_text()->clear_fonts(); diff --git a/src/lib/string_text_file_content.h b/src/lib/string_text_file_content.h index abfd72906..f634a14d2 100644 --- a/src/lib/string_text_file_content.h +++ b/src/lib/string_text_file_content.h @@ -42,7 +42,7 @@ public: return std::dynamic_pointer_cast<const StringTextFileContent> (Content::shared_from_this ()); } - void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job>) override; + void examine(std::shared_ptr<const Film> film, std::shared_ptr<Job>, bool tolerant) override; std::string summary () const override; std::string technical_summary () const override; diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc index f1373fb4a..c6da13381 100644 --- a/src/lib/transcode_job.cc +++ b/src/lib/transcode_job.cc @@ -102,7 +102,7 @@ TranscodeJob::run () switch (_changed) { case ChangedBehaviour::EXAMINE_THEN_STOP: for (auto i: changed) { - JobManager::instance()->add(make_shared<ExamineContentJob>(_film, i)); + JobManager::instance()->add(make_shared<ExamineContentJob>(_film, i, false)); } 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.")); diff --git a/src/lib/video_mxf_content.cc b/src/lib/video_mxf_content.cc index ded81e6bf..779344ac1 100644 --- a/src/lib/video_mxf_content.cc +++ b/src/lib/video_mxf_content.cc @@ -87,11 +87,11 @@ VideoMXFContent::valid_mxf (boost::filesystem::path path) void -VideoMXFContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job) +VideoMXFContent::examine(shared_ptr<const Film> film, shared_ptr<Job> job, bool tolerant) { job->set_progress_unknown (); - Content::examine (film, job); + Content::examine(film, job, tolerant); video.reset (new VideoContent (this)); auto examiner = make_shared<VideoMXFExaminer>(shared_from_this()); diff --git a/src/lib/video_mxf_content.h b/src/lib/video_mxf_content.h index 0def6008c..4c2d051b0 100644 --- a/src/lib/video_mxf_content.h +++ b/src/lib/video_mxf_content.h @@ -36,7 +36,7 @@ public: return std::dynamic_pointer_cast<const VideoMXFContent>(Content::shared_from_this()); } - void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job> job) override; + void examine(std::shared_ptr<const Film> film, std::shared_ptr<Job> job, bool tolerant) override; std::string summary () const override; std::string technical_summary () const override; std::string identifier () const override; diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 15ccf0a77..0ae5acf26 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -404,7 +404,7 @@ public: try { _stress.set_suspended (true); auto dcp = make_shared<DCPContent>(dir); - auto job = make_shared<ExamineContentJob>(film, dcp); + auto job = make_shared<ExamineContentJob>(film, dcp, true); auto add_dcp_to_film = [this](weak_ptr<Film> weak_film, weak_ptr<Job> weak_job, weak_ptr<Content> weak_content) { @@ -579,7 +579,7 @@ private: DCPOMATIC_ASSERT (_film); auto dcp = dynamic_pointer_cast<DCPContent>(_film->content().front()); DCPOMATIC_ASSERT (dcp); - dcp->examine (_film, shared_ptr<Job>()); + dcp->examine(_film, {}, true); /* Examining content re-creates the TextContent objects, so we must re-enable them */ for (auto i: dcp->text) { @@ -733,7 +733,7 @@ private: auto dcp = std::dynamic_pointer_cast<DCPContent>(_film->content().front()); DCPOMATIC_ASSERT(dcp); dcp->add_ov (wx_to_std(c->GetPath())); - JobManager::instance()->add(make_shared<ExamineContentJob>(_film, dcp)); + JobManager::instance()->add(make_shared<ExamineContentJob>(_film, dcp, true)); bool const ok = display_progress(variant::wx::dcpomatic_player(), _("Loading content")); if (!ok || !report_errors_from_last_job(this)) { return; diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index cd2b8c914..b2010d4bf 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -394,7 +394,7 @@ ContentMenu::re_examine () } for (auto i: _content) { - JobManager::instance()->add(make_shared<ExamineContentJob>(film, i)); + JobManager::instance()->add(make_shared<ExamineContentJob>(film, i, false)); } } @@ -448,7 +448,7 @@ ContentMenu::kdm () auto film = _film.lock (); DCPOMATIC_ASSERT (film); - JobManager::instance()->add (make_shared<ExamineContentJob>(film, dcp)); + JobManager::instance()->add(make_shared<ExamineContentJob>(film, dcp, false)); } void @@ -466,7 +466,7 @@ ContentMenu::ov () dcp->add_ov(dialog.path()); auto film = _film.lock(); DCPOMATIC_ASSERT (film); - JobManager::instance()->add (make_shared<ExamineContentJob>(film, dcp)); + JobManager::instance()->add (make_shared<ExamineContentJob>(film, dcp, false)); } } @@ -531,7 +531,7 @@ ContentMenu::cpl_selected (wxCommandEvent& ev) auto film = _film.lock (); DCPOMATIC_ASSERT (film); - JobManager::instance()->add (make_shared<ExamineContentJob>(film, dcp)); + JobManager::instance()->add(make_shared<ExamineContentJob>(film, dcp, false)); } diff --git a/src/wx/content_view.cc b/src/wx/content_view.cc index 7a34906dd..6a5a3793d 100644 --- a/src/wx/content_view.cc +++ b/src/wx/content_view.cc @@ -107,7 +107,7 @@ ContentView::update () } if (content) { - auto job = make_shared<ExamineContentJob>(shared_ptr<Film>(), content); + auto job = make_shared<ExamineContentJob>(shared_ptr<Film>(), content, false); jm->add (job); jobs.push_back (job); } diff --git a/src/wx/playlist_controls.cc b/src/wx/playlist_controls.cc index 0e1977a67..917edfd23 100644 --- a/src/wx/playlist_controls.cc +++ b/src/wx/playlist_controls.cc @@ -342,7 +342,7 @@ PlaylistControls::select_playlist (int selected, int position) if (kdm) { try { dcp->add_kdm (*kdm); - dcp->examine (_film, shared_ptr<Job>()); + dcp->examine(_film, shared_ptr<Job>(), true); } catch (KDMError& e) { error_dialog(this, _("Could not load KDM.")); } diff --git a/test/dcp_decoder_test.cc b/test/dcp_decoder_test.cc index 6e2bdcb6a..fcecb82e4 100644 --- a/test/dcp_decoder_test.cc +++ b/test/dcp_decoder_test.cc @@ -107,7 +107,7 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test) reels = decoder->reels(); vf_content->add_ov (ov->dir(ov->dcp_name(false))); - JobManager::instance()->add (make_shared<ExamineContentJob>(test, vf_content)); + JobManager::instance()->add(make_shared<ExamineContentJob>(test, vf_content, false)); BOOST_REQUIRE (!wait_for_jobs()); decoder = std::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder); BOOST_REQUIRE (decoder); @@ -125,7 +125,7 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test) reels = decoder->reels(); encrypted_content->add_kdm (kdm); - JobManager::instance()->add (make_shared<ExamineContentJob>(test, encrypted_content)); + JobManager::instance()->add(make_shared<ExamineContentJob>(test, encrypted_content, false)); BOOST_REQUIRE (!wait_for_jobs()); decoder = std::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder); BOOST_REQUIRE (decoder); diff --git a/test/remake_id_test.cc b/test/remake_id_test.cc index a919fa12a..84937c3ab 100644 --- a/test/remake_id_test.cc +++ b/test/remake_id_test.cc @@ -95,7 +95,7 @@ BOOST_AUTO_TEST_CASE (remake_id_test2) auto dcp_content = make_shared<DCPContent>(film->dir(film->dcp_name())); auto film2 = new_test_film("remake_id_test2_2", { dcp_content }); dcp_content->add_kdm(kdm); - JobManager::instance()->add(make_shared<ExamineContentJob>(film2, dcp_content)); + JobManager::instance()->add(make_shared<ExamineContentJob>(film2, dcp_content, false)); BOOST_REQUIRE(!wait_for_jobs()); make_and_verify_dcp (film2); } diff --git a/test/vf_test.cc b/test/vf_test.cc index cda3cdee1..cb5116910 100644 --- a/test/vf_test.cc +++ b/test/vf_test.cc @@ -423,7 +423,7 @@ BOOST_AUTO_TEST_CASE(test_duplicate_font_id_in_vf) auto test = new_test_film(name + "_test", { vf_dcp }); vf_dcp->add_ov(ov->dir(ov->dcp_name(false))); - JobManager::instance()->add(make_shared<ExamineContentJob>(test, vf_dcp)); + JobManager::instance()->add(make_shared<ExamineContentJob>(test, vf_dcp, false)); BOOST_CHECK(!wait_for_jobs()); make_and_verify_dcp( |