From: Carl Hetherington Date: Wed, 20 Apr 2022 19:17:54 +0000 (+0200) Subject: Remove DCP class and replace its functionality with a plain method in libdcp. X-Git-Tag: v2.16.10~65 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=86eb90b563efb7ef093d5b17a5d6db0fc330e301 Remove DCP class and replace its functionality with a plain method in libdcp. --- diff --git a/cscript b/cscript index a12771488..9fe44e228 100644 --- a/cscript +++ b/cscript @@ -424,8 +424,8 @@ def dependencies(target, options): # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', 'v1.8.13')) - deps.append(('libsub', 'v1.6.14')) + deps.append(('libdcp', 'v1.8.14')) + deps.append(('libsub', 'v1.6.15')) deps.append(('leqm-nrt', '93ae9e6')) deps.append(('rtaudio', 'f619b76')) # We get our OpenSSL libraries from the environment, but we diff --git a/src/lib/dcp.cc b/src/lib/dcp.cc deleted file mode 100644 index 8fb27db57..000000000 --- a/src/lib/dcp.cc +++ /dev/null @@ -1,94 +0,0 @@ -/* - Copyright (C) 2014-2021 Carl Hetherington - - 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. - - 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 DCP-o-matic. If not, see . - -*/ - - -#include "compose.hpp" -#include "dcp.h" -#include "dcp_content.h" -#include "dcpomatic_log.h" -#include "log.h" -#include "util.h" -#include -#include -#include - -#include "i18n.h" - - -using std::list; -using std::string; -using std::shared_ptr; -using std::make_shared; -using std::dynamic_pointer_cast; -using std::vector; - - -/** Find all the CPLs in our directories, cross-add assets and return the CPLs */ -list> -DCP::cpls () const -{ - list> dcps; - list> cpls; - - /** We accept and ignore some warnings / errors but everything else is bad */ - vector ignore = { - dcp::VerificationNote::Code::EMPTY_ASSET_PATH, - dcp::VerificationNote::Code::EXTERNAL_ASSET, - dcp::VerificationNote::Code::THREED_ASSET_MARKED_AS_TWOD, - }; - - LOG_GENERAL ("Reading %1 DCP directories", _dcp_content->directories().size()); - for (auto i: _dcp_content->directories()) { - auto dcp = make_shared(i); - vector notes; - dcp->read (¬es, true); - if (!_tolerant) { - for (auto j: notes) { - if (std::find(ignore.begin(), ignore.end(), j.code()) != ignore.end()) { - LOG_WARNING("Ignoring: %1", dcp::note_to_string(j)); - } else { - boost::throw_exception(dcp::ReadError(dcp::note_to_string(j))); - } - } - } - dcps.push_back (dcp); - LOG_GENERAL ("Reading DCP %1: %2 CPLs", i.string(), dcp->cpls().size()); - for (auto i: dcp->cpls()) { - cpls.push_back (i); - } - } - - for (auto i: dcps) { - for (auto j: dcps) { - if (i != j) { - i->resolve_refs(j->assets(true)); - } - } - } - - if (_dcp_content->kdm ()) { - auto k = decrypt_kdm_with_helpful_error (_dcp_content->kdm().get()); - for (auto i: dcps) { - i->add (k); - } - } - - return cpls; -} diff --git a/src/lib/dcp.h b/src/lib/dcp.h deleted file mode 100644 index d8e0aec27..000000000 --- a/src/lib/dcp.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - Copyright (C) 2014-2016 Carl Hetherington - - 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. - - 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 DCP-o-matic. If not, see . - -*/ - - -#ifndef DCPOMATIC_DCP_H -#define DCPOMATIC_DCP_H - - -#include -#include - - -namespace dcp { - class CPL; -} - - -class DCPContent; - - -class DCP -{ -public: - std::list> cpls () const; - -protected: - explicit DCP (std::shared_ptr content, bool tolerant) - : _dcp_content (content) - , _tolerant (tolerant) - {} - - std::shared_ptr _dcp_content; - -private: - bool _tolerant; -}; - - -#endif diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc index 85c5d3297..542a8ff7c 100644 --- a/src/lib/dcp_decoder.cc +++ b/src/lib/dcp_decoder.cc @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -68,8 +69,8 @@ using namespace dcpomatic; DCPDecoder::DCPDecoder (shared_ptr film, shared_ptr content, bool fast, bool tolerant, shared_ptr old) - : DCP (content, tolerant) - , Decoder (film) + : Decoder (film) + , _dcp_content (content) { if (content->can_be_played()) { if (content->video) { @@ -101,7 +102,7 @@ DCPDecoder::DCPDecoder (shared_ptr film, shared_ptr_reels; } else { - auto cpl_list = cpls (); + auto cpl_list = dcp::find_and_resolve_cpls(content->directories(), tolerant); if (cpl_list.empty()) { throw DCPError (_("No CPLs found in DCP.")); @@ -118,7 +119,11 @@ DCPDecoder::DCPDecoder (shared_ptr film, shared_ptrkdm()) { + cpl->add (decrypt_kdm_with_helpful_error(content->kdm().get())); } _reels = cpl->reels (); diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h index a4dfbad4e..0882bfd09 100644 --- a/src/lib/dcp_decoder.h +++ b/src/lib/dcp_decoder.h @@ -26,7 +26,6 @@ #include "atmos_metadata.h" #include "decoder.h" -#include "dcp.h" #include #include #include @@ -42,12 +41,12 @@ class Log; struct dcp_subtitle_within_dcp_test; -class DCPDecoder : public DCP, public Decoder +class DCPDecoder : public Decoder { public: DCPDecoder ( std::shared_ptr film, - std::shared_ptr, + std::shared_ptr content, bool fast, bool tolerant, std::shared_ptr old @@ -87,6 +86,8 @@ private: ); std::string calculate_lazy_digest (std::shared_ptr) const; + std::shared_ptr _dcp_content; + /** Time of next thing to return from pass relative to the start of _reel */ dcpomatic::ContentTime _next; std::vector> _reels; diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc index cf4835c06..f2ec68bdd 100644 --- a/src/lib/dcp_examiner.cc +++ b/src/lib/dcp_examiner.cc @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -59,7 +60,6 @@ using boost::optional; DCPExaminer::DCPExaminer (shared_ptr content, bool tolerant) - : DCP (content, tolerant) { shared_ptr cpl; @@ -67,9 +67,11 @@ DCPExaminer::DCPExaminer (shared_ptr content, bool tolerant) _text_count[i] = 0; } + auto cpls = dcp::find_and_resolve_cpls (content->directories(), tolerant); + if (content->cpl ()) { /* Use the CPL that the content was using before */ - for (auto i: cpls()) { + for (auto i: cpls) { if (i->id() == content->cpl().get()) { cpl = i; } @@ -79,7 +81,7 @@ DCPExaminer::DCPExaminer (shared_ptr content, bool tolerant) int least_unsatisfied = INT_MAX; - for (auto i: cpls()) { + for (auto i: cpls) { int unsatisfied = 0; for (auto j: i->reels()) { if (j->main_picture() && !j->main_picture()->asset_ref().resolved()) { @@ -107,6 +109,10 @@ DCPExaminer::DCPExaminer (shared_ptr content, bool tolerant) throw DCPError ("No CPLs found in DCP"); } + if (content->kdm()) { + cpl->add (decrypt_kdm_with_helpful_error(content->kdm().get())); + } + _cpl = cpl->id (); _name = cpl->content_title_text (); _content_kind = cpl->content_kind (); diff --git a/src/lib/dcp_examiner.h b/src/lib/dcp_examiner.h index 68508847f..a5bf2434e 100644 --- a/src/lib/dcp_examiner.h +++ b/src/lib/dcp_examiner.h @@ -25,7 +25,6 @@ #include "audio_examiner.h" -#include "dcp.h" #include "dcp_text_track.h" #include "dcpomatic_assert.h" #include "video_examiner.h" @@ -36,7 +35,7 @@ class DCPContent; -class DCPExaminer : public DCP, public VideoExaminer, public AudioExaminer +class DCPExaminer : public VideoExaminer, public AudioExaminer { public: explicit DCPExaminer (std::shared_ptr, bool tolerant); diff --git a/src/lib/wscript b/src/lib/wscript index 6515ebf9f..86b7561be 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -62,7 +62,6 @@ sources = """ crypto.cc curl_uploader.cc datasat_ap2x.cc - dcp.cc dcp_content.cc dcp_content_type.cc dcp_decoder.cc diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 18251b4ec..4d4531eee 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -61,6 +61,7 @@ #include #include #include +#include #include #include #include @@ -437,9 +438,8 @@ public: /* Offer a CPL menu */ auto first = dynamic_pointer_cast(_film->content().front()); if (first) { - DCPExaminer ex (first, true); int id = ID_view_cpl; - for (auto i: ex.cpls()) { + for (auto i: dcp::find_and_resolve_cpls(first->directories(), true)) { auto j = _cpl_menu->AppendRadioItem( id, wxString::Format("%s (%s)", std_to_wx(i->annotation_text().get_value_or("")).data(), std_to_wx(i->id()).data()) @@ -694,11 +694,10 @@ private: { auto dcp = std::dynamic_pointer_cast(_film->content().front()); DCPOMATIC_ASSERT (dcp); - DCPExaminer ex (dcp, true); + auto cpls = dcp::find_and_resolve_cpls (dcp->directories(), true); int id = ev.GetId() - ID_view_cpl; DCPOMATIC_ASSERT (id >= 0); - DCPOMATIC_ASSERT (id < int(ex.cpls().size())); - auto cpls = ex.cpls(); + DCPOMATIC_ASSERT (id < int(cpls.size())); auto i = cpls.begin(); while (id > 0) { ++i; diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index 6c635db0b..137ef97dc 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include @@ -145,8 +146,7 @@ ContentMenu::popup (weak_ptr film, ContentList c, TimelineContentViewList _ov->Enable (dcp->needs_assets ()); _set_dcp_settings->Enable (static_cast(dcp)); try { - DCPExaminer ex (dcp, true); - auto cpls = ex.cpls (); + auto cpls = dcp::find_and_resolve_cpls (dcp->directories(), true); _choose_cpl->Enable (cpls.size() > 1); /* We can't have 0 as a menu item ID on OS X */ int id = 1; @@ -437,16 +437,9 @@ ContentMenu::kdm () return; } - DCPExaminer ex (dcp, true); - - bool kdm_matches_any_cpl = false; - for (auto i: ex.cpls()) { - if (i->id() == kdm->cpl_id()) { - kdm_matches_any_cpl = true; - } - } - - bool kdm_matches_selected_cpl = dcp->cpl() || kdm->cpl_id() == dcp->cpl().get(); + auto cpls = dcp::find_and_resolve_cpls (dcp->directories(), true); + bool const kdm_matches_any_cpl = std::any_of(cpls.begin(), cpls.end(), [kdm](shared_ptr cpl) { return cpl->id() == kdm->cpl_id(); }); + bool const kdm_matches_selected_cpl = dcp->cpl() || kdm->cpl_id() == dcp->cpl().get(); if (!kdm_matches_any_cpl) { error_dialog (_parent, _("This KDM was not made for this DCP. You will need a different one.")); @@ -517,8 +510,7 @@ ContentMenu::cpl_selected (wxCommandEvent& ev) auto dcp = dynamic_pointer_cast (_content.front()); DCPOMATIC_ASSERT (dcp); - DCPExaminer ex (dcp, true); - auto cpls = ex.cpls (); + auto cpls = dcp::find_and_resolve_cpls (dcp->directories(), true); DCPOMATIC_ASSERT (ev.GetId() > 0); DCPOMATIC_ASSERT (ev.GetId() <= int (cpls.size()));