diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-10-08 12:08:10 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-10-08 12:48:43 +0200 |
| commit | aab6630b945371038cc49e456a766ae45cab1f47 (patch) | |
| tree | a82f7ceaff2d091bff154e604b9c3e861b2994af /test/test.h | |
| parent | 99d2243b7674c0673fee5f6f6cd4a65da16db37c (diff) | |
Fix problems when adding KDMs to a VF, before adding the OV.v1.8.2
If we have a KDM which contains keys for all the assets referred
to by a VF (even the ones in the OV) we would previously throw
an exception because we tried to give the KDM to the resolved
assets when it was given to the Reel.
Here we change things so that the addition of KDMs to assets can
be deferred if the asset is not yet resolved.
Diffstat (limited to 'test/test.h')
| -rw-r--r-- | test/test.h | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/test/test.h b/test/test.h index 8733c7c3..339dd8aa 100644 --- a/test/test.h +++ b/test/test.h @@ -43,11 +43,30 @@ extern boost::filesystem::path xsd_test; extern void check_xml (xmlpp::Element* ref, xmlpp::Element* test, std::vector<std::string> ignore_tags, bool ignore_whitespace = false); extern void check_xml (std::string ref, std::string test, std::vector<std::string> ignore, bool ignore_whitespace = false); extern void check_file (boost::filesystem::path ref, boost::filesystem::path check); -extern std::shared_ptr<dcp::MonoPictureAsset> simple_picture (boost::filesystem::path path, std::string suffix, int frames = 24); -extern std::shared_ptr<dcp::SoundAsset> simple_sound (boost::filesystem::path path, std::string suffix, dcp::MXFMetadata mxf_meta, std::string language, int frames = 24, int sample_rate = 48000); +extern std::shared_ptr<dcp::MonoPictureAsset> simple_picture ( + boost::filesystem::path path, + std::string suffix, + int frames = 24, + boost::optional<dcp::Key> key = boost::optional<dcp::Key>() + ); +extern std::shared_ptr<dcp::SoundAsset> simple_sound ( + boost::filesystem::path path, + std::string suffix, + dcp::MXFMetadata mxf_meta, + std::string language, + int frames = 24, + int sample_rate = 48000, + boost::optional<dcp::Key> key = boost::optional<dcp::Key>() + ); extern std::shared_ptr<dcp::Subtitle> simple_subtitle (); extern std::shared_ptr<dcp::ReelMarkersAsset> simple_markers (int frames = 24); -extern std::shared_ptr<dcp::DCP> make_simple (boost::filesystem::path path, int reels = 1, int frames = 24, dcp::Standard = dcp::Standard::SMPTE); +extern std::shared_ptr<dcp::DCP> make_simple ( + boost::filesystem::path path, + int reels = 1, + int frames = 24, + dcp::Standard = dcp::Standard::SMPTE, + boost::optional<dcp::Key> key = boost::optional<dcp::Key>() + ); extern std::shared_ptr<dcp::DCP> make_simple_with_interop_subs (boost::filesystem::path path); extern std::shared_ptr<dcp::DCP> make_simple_with_smpte_subs (boost::filesystem::path path); extern std::shared_ptr<dcp::DCP> make_simple_with_interop_ccaps (boost::filesystem::path path); |