From 9fd79fb05fa47833ed431d83d73fd6d9a4a9f774 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 17 Jan 2014 22:16:05 +0000 Subject: [PATCH] Asset -> MXF in some cases. --- src/cpl.cc | 16 ++++----- src/dcp.cc | 4 +-- src/kdm.cc | 6 ++-- ...o_picture_asset.cc => mono_picture_mxf.cc} | 30 ++++++++-------- ...ono_picture_asset.h => mono_picture_mxf.h} | 14 ++++---- ...t_writer.cc => mono_picture_mxf_writer.cc} | 22 ++++++------ ...set_writer.h => mono_picture_mxf_writer.h} | 8 ++--- src/{mxf_asset.cc => mxf.cc} | 16 ++++----- src/{mxf_asset.h => mxf.h} | 12 ++++--- src/{picture_asset.cc => picture_mxf.cc} | 18 +++++----- src/{picture_asset.h => picture_mxf.h} | 14 ++++---- ..._asset_writer.cc => picture_mxf_writer.cc} | 6 ++-- ...re_asset_writer.h => picture_mxf_writer.h} | 12 +++---- ...common.cc => picture_mxf_writer_common.cc} | 2 +- src/reel.cc | 12 +++---- src/reel.h | 16 ++++----- src/{sound_asset.cc => sound_mxf.cc} | 36 +++++++++---------- src/{sound_asset.h => sound_mxf.h} | 22 ++++++------ ...picture_asset.cc => stereo_picture_mxf.cc} | 30 ++++++++-------- ...o_picture_asset.h => stereo_picture_mxf.h} | 14 ++++---- ...writer.cc => stereo_picture_mxf_writer.cc} | 22 ++++++------ ...t_writer.h => stereo_picture_mxf_writer.h} | 8 ++--- src/wscript | 28 +++++++-------- test/cpl_sar.cc | 4 +-- test/decryption_test.cc | 6 ++-- test/frame_info_test.cc | 3 +- test/recovery_test.cc | 10 +++--- test/round_trip_test.cc | 12 +++---- tools/dcpinfo.cc | 4 +-- 29 files changed, 205 insertions(+), 202 deletions(-) rename src/{mono_picture_asset.cc => mono_picture_mxf.cc} (79%) rename src/{mono_picture_asset.h => mono_picture_mxf.h} (79%) rename src/{mono_picture_asset_writer.cc => mono_picture_mxf_writer.cc} (82%) rename src/{mono_picture_asset_writer.h => mono_picture_mxf_writer.h} (91%) rename src/{mxf_asset.cc => mxf.cc} (89%) rename src/{mxf_asset.h => mxf.h} (92%) rename src/{picture_asset.cc => picture_mxf.cc} (93%) rename src/{picture_asset.h => picture_mxf.h} (88%) rename src/{picture_asset_writer.cc => picture_mxf_writer.cc} (93%) rename src/{picture_asset_writer.h => picture_mxf_writer.h} (86%) rename src/{picture_asset_writer_common.cc => picture_mxf_writer_common.cc} (94%) rename src/{sound_asset.cc => sound_mxf.cc} (89%) rename src/{sound_asset.h => sound_mxf.h} (83%) rename src/{stereo_picture_asset.cc => stereo_picture_mxf.cc} (80%) rename src/{stereo_picture_asset.h => stereo_picture_mxf.h} (77%) rename src/{stereo_picture_asset_writer.cc => stereo_picture_mxf_writer.cc} (83%) rename src/{stereo_picture_asset_writer.h => stereo_picture_mxf_writer.h} (90%) diff --git a/src/cpl.cc b/src/cpl.cc index 843f98d9..55683b64 100644 --- a/src/cpl.cc +++ b/src/cpl.cc @@ -21,9 +21,9 @@ #include "cpl.h" #include "parse/cpl.h" #include "util.h" -#include "mono_picture_asset.h" -#include "stereo_picture_asset.h" -#include "sound_asset.h" +#include "mono_picture_mxf.h" +#include "stereo_picture_mxf.h" +#include "sound_mxf.h" #include "subtitle_asset.h" #include "parse/asset_map.h" #include "reel.h" @@ -94,8 +94,8 @@ CPL::CPL (boost::filesystem::path directory, string file, list ass _fps = p->edit_rate.numerator; _length += p->duration; - shared_ptr picture; - shared_ptr sound; + shared_ptr picture; + shared_ptr sound; shared_ptr subtitle; /* Some rather twisted logic to decide if we are 3D or not; @@ -109,7 +109,7 @@ CPL::CPL (boost::filesystem::path directory, string file, list ass try { pair > asset = asset_from_id (asset_maps, p->id); - picture.reset (new MonoPictureAsset (asset.first, asset.second->chunks.front()->path)); + picture.reset (new MonoPictureMXF (asset.first, asset.second->chunks.front()->path)); picture->read (); picture->set_edit_rate (_fps); @@ -129,7 +129,7 @@ CPL::CPL (boost::filesystem::path directory, string file, list ass try { pair > asset = asset_from_id (asset_maps, p->id); - picture.reset (new StereoPictureAsset (asset.first, asset.second->chunks.front()->path)); + picture.reset (new StereoPictureMXF (asset.first, asset.second->chunks.front()->path)); picture->read (); picture->set_edit_rate (_fps); @@ -153,7 +153,7 @@ CPL::CPL (boost::filesystem::path directory, string file, list ass try { pair > asset = asset_from_id (asset_maps, (*i)->asset_list->main_sound->id); - sound.reset (new SoundAsset (asset.first, asset.second->chunks.front()->path)); + sound.reset (new SoundMXF (asset.first, asset.second->chunks.front()->path)); shared_ptr s = (*i)->asset_list->main_sound; sound->read (); diff --git a/src/dcp.cc b/src/dcp.cc index e0730020..495b14a4 100644 --- a/src/dcp.cc +++ b/src/dcp.cc @@ -33,8 +33,8 @@ #include #include #include "dcp.h" -#include "sound_asset.h" -#include "picture_asset.h" +#include "sound_mxf.h" +#include "picture_mxf.h" #include "subtitle_asset.h" #include "util.h" #include "metadata.h" diff --git a/src/kdm.cc b/src/kdm.cc index 25e87ca1..27ef64f2 100644 --- a/src/kdm.cc +++ b/src/kdm.cc @@ -32,7 +32,7 @@ #include "exceptions.h" #include "signer.h" #include "cpl.h" -#include "mxf_asset.h" +#include "mxf.h" #include "xml/kdm_smpte.h" using std::list; @@ -127,7 +127,7 @@ KDM::KDM ( list > assets = cpl->assets (); for (list >::iterator i = assets.begin(); i != assets.end(); ++i) { /* XXX: non-MXF assets? */ - shared_ptr mxf = boost::dynamic_pointer_cast (*i); + shared_ptr mxf = boost::dynamic_pointer_cast (*i); if (mxf) { apu.key_id_list.push_back (xml::TypedKeyId (mxf->key_type(), "urn:uuid:" + mxf->key_id())); } @@ -140,7 +140,7 @@ KDM::KDM ( for (list >::iterator i = assets.begin(); i != assets.end(); ++i) { /* XXX: non-MXF assets? */ - shared_ptr mxf = boost::dynamic_pointer_cast (*i); + shared_ptr mxf = boost::dynamic_pointer_cast (*i); if (mxf) { KDMKey kkey ( signer, cpl->id (), mxf->key_type (), mxf->key_id (), diff --git a/src/mono_picture_asset.cc b/src/mono_picture_mxf.cc similarity index 79% rename from src/mono_picture_asset.cc rename to src/mono_picture_mxf.cc index 295d8a87..30973e5a 100644 --- a/src/mono_picture_asset.cc +++ b/src/mono_picture_mxf.cc @@ -17,8 +17,8 @@ */ -#include "mono_picture_asset.h" -#include "mono_picture_asset_writer.h" +#include "mono_picture_mxf.h" +#include "mono_picture_mxf_writer.h" #include "AS_DCP.h" #include "KM_fileio.h" #include "exceptions.h" @@ -31,14 +31,14 @@ using boost::dynamic_pointer_cast; using boost::lexical_cast; using namespace dcp; -MonoPictureAsset::MonoPictureAsset (boost::filesystem::path directory, boost::filesystem::path mxf_name) - : PictureAsset (directory, mxf_name) +MonoPictureMXF::MonoPictureMXF (boost::filesystem::path directory, boost::filesystem::path mxf_name) + : PictureMXF (directory, mxf_name) { } void -MonoPictureAsset::read () +MonoPictureMXF::read () { ASDCP::JP2K::MXFReader reader; Kumu::Result_t r = reader.OpenRead (path().string().c_str()); @@ -59,21 +59,21 @@ MonoPictureAsset::read () } boost::filesystem::path -MonoPictureAsset::path_from_list (int f, vector const & files) const +MonoPictureMXF::path_from_list (int f, vector const & files) const { return files[f]; } shared_ptr -MonoPictureAsset::get_frame (int n) const +MonoPictureMXF::get_frame (int n) const { return shared_ptr (new MonoPictureFrame (path(), n, _decryption_context)); } bool -MonoPictureAsset::equals (shared_ptr other, EqualityOptions opt, boost::function note) const +MonoPictureMXF::equals (shared_ptr other, EqualityOptions opt, boost::function note) const { - if (!MXFAsset::equals (other, opt, note)) { + if (!MXF::equals (other, opt, note)) { return false; } @@ -102,7 +102,7 @@ MonoPictureAsset::equals (shared_ptr other, EqualityOptions return false; } - shared_ptr other_picture = dynamic_pointer_cast (other); + shared_ptr other_picture = dynamic_pointer_cast (other); assert (other_picture); for (int i = 0; i < _intrinsic_duration; ++i) { @@ -126,21 +126,21 @@ MonoPictureAsset::equals (shared_ptr other, EqualityOptions return true; } -shared_ptr -MonoPictureAsset::start_write (bool overwrite) +shared_ptr +MonoPictureMXF::start_write (bool overwrite) { /* XXX: can't we use shared_ptr here? */ - return shared_ptr (new MonoPictureAssetWriter (this, overwrite)); + return shared_ptr (new MonoPictureMXFWriter (this, overwrite)); } string -MonoPictureAsset::cpl_node_name () const +MonoPictureMXF::cpl_node_name () const { return "MainPicture"; } int -MonoPictureAsset::edit_rate_factor () const +MonoPictureMXF::edit_rate_factor () const { return 1; } diff --git a/src/mono_picture_asset.h b/src/mono_picture_mxf.h similarity index 79% rename from src/mono_picture_asset.h rename to src/mono_picture_mxf.h index 76a1f990..029ccce5 100644 --- a/src/mono_picture_asset.h +++ b/src/mono_picture_mxf.h @@ -17,23 +17,23 @@ */ -#ifndef LIBDCP_MONO_PICTURE_ASSET_H -#define LIBDCP_MONO_PICTURE_ASSET_H +#ifndef LIBDCP_MONO_PICTURE_MXF_H +#define LIBDCP_MONO_PICTURE_MXF_H -#include "picture_asset.h" +#include "picture_mxf.h" namespace dcp { /** A 2D (monoscopic) picture asset */ -class MonoPictureAsset : public PictureAsset +class MonoPictureMXF : public PictureMXF { public: - MonoPictureAsset (boost::filesystem::path directory, boost::filesystem::path mxf_name); + MonoPictureMXF (boost::filesystem::path directory, boost::filesystem::path mxf_name); void read (); - /** Start a progressive write to a MonoPictureAsset */ - boost::shared_ptr start_write (bool); + /** Start a progressive write to a MonoPictureMXF */ + boost::shared_ptr start_write (bool); boost::shared_ptr get_frame (int n) const; bool equals (boost::shared_ptr other, EqualityOptions opt, boost::function note) const; diff --git a/src/mono_picture_asset_writer.cc b/src/mono_picture_mxf_writer.cc similarity index 82% rename from src/mono_picture_asset_writer.cc rename to src/mono_picture_mxf_writer.cc index 87f37a2d..24ca2079 100644 --- a/src/mono_picture_asset_writer.cc +++ b/src/mono_picture_mxf_writer.cc @@ -19,11 +19,11 @@ #include "AS_DCP.h" #include "KM_fileio.h" -#include "mono_picture_asset_writer.h" +#include "mono_picture_mxf_writer.h" #include "exceptions.h" -#include "picture_asset.h" +#include "picture_mxf.h" -#include "picture_asset_writer_common.cc" +#include "picture_mxf_writer_common.cc" using std::istream; using std::ostream; @@ -32,7 +32,7 @@ using boost::shared_ptr; using boost::lexical_cast; using namespace dcp; -struct MonoPictureAssetWriter::ASDCPState : public ASDCPStateBase +struct MonoPictureMXFWriter::ASDCPState : public ASDCPStateBase { ASDCP::JP2K::MXFWriter mxf_writer; }; @@ -40,21 +40,21 @@ struct MonoPictureAssetWriter::ASDCPState : public ASDCPStateBase /** @param a Asset to write to. `a' must not be deleted while * this writer class still exists, or bad things will happen. */ -MonoPictureAssetWriter::MonoPictureAssetWriter (PictureAsset* asset, bool overwrite) - : PictureAssetWriter (asset, overwrite) - , _state (new MonoPictureAssetWriter::ASDCPState) +MonoPictureMXFWriter::MonoPictureMXFWriter (PictureMXF* asset, bool overwrite) + : PictureMXFWriter (asset, overwrite) + , _state (new MonoPictureMXFWriter::ASDCPState) { _state->encryption_context = asset->encryption_context (); } void -MonoPictureAssetWriter::start (uint8_t* data, int size) +MonoPictureMXFWriter::start (uint8_t* data, int size) { dcp::start (this, _state, _asset, data, size); } FrameInfo -MonoPictureAssetWriter::write (uint8_t* data, int size) +MonoPictureMXFWriter::write (uint8_t* data, int size) { assert (!_finalized); @@ -79,7 +79,7 @@ MonoPictureAssetWriter::write (uint8_t* data, int size) } void -MonoPictureAssetWriter::fake_write (int size) +MonoPictureMXFWriter::fake_write (int size) { assert (_started); assert (!_finalized); @@ -93,7 +93,7 @@ MonoPictureAssetWriter::fake_write (int size) } void -MonoPictureAssetWriter::finalize () +MonoPictureMXFWriter::finalize () { assert (!_finalized); diff --git a/src/mono_picture_asset_writer.h b/src/mono_picture_mxf_writer.h similarity index 91% rename from src/mono_picture_asset_writer.h rename to src/mono_picture_mxf_writer.h index b4da70b4..4faa6b60 100644 --- a/src/mono_picture_asset_writer.h +++ b/src/mono_picture_mxf_writer.h @@ -22,7 +22,7 @@ #include #include #include -#include "picture_asset_writer.h" +#include "picture_mxf_writer.h" namespace dcp { @@ -36,7 +36,7 @@ namespace dcp { * The action of finalize() can't be done in MonoPictureAssetWriter's destructor as it may * throw an exception. */ -class MonoPictureAssetWriter : public PictureAssetWriter +class MonoPictureMXFWriter : public PictureMXFWriter { public: FrameInfo write (uint8_t *, int); @@ -44,9 +44,9 @@ public: void finalize (); private: - friend class MonoPictureAsset; + friend class MonoPictureMXF; - MonoPictureAssetWriter (PictureAsset *, bool); + MonoPictureMXFWriter (PictureMXF *, bool); void start (uint8_t *, int); /* do this with an opaque pointer so we don't have to include diff --git a/src/mxf_asset.cc b/src/mxf.cc similarity index 89% rename from src/mxf_asset.cc rename to src/mxf.cc index c2d19a39..e37b2822 100644 --- a/src/mxf_asset.cc +++ b/src/mxf.cc @@ -28,7 +28,7 @@ #include "AS_DCP.h" #include "KM_prng.h" #include "KM_util.h" -#include "mxf_asset.h" +#include "mxf.h" #include "util.h" #include "metadata.h" #include "exceptions.h" @@ -42,7 +42,7 @@ using boost::lexical_cast; using boost::dynamic_pointer_cast; using namespace dcp; -MXFAsset::MXFAsset (boost::filesystem::path directory, boost::filesystem::path file_name) +MXF::MXF (boost::filesystem::path directory, boost::filesystem::path file_name) : ContentAsset (directory, file_name) , _progress (0) , _encryption_context (0) @@ -52,14 +52,14 @@ MXFAsset::MXFAsset (boost::filesystem::path directory, boost::filesystem::path f } -MXFAsset::~MXFAsset () +MXF::~MXF () { delete _encryption_context; delete _decryption_context; } void -MXFAsset::fill_writer_info (ASDCP::WriterInfo* writer_info) +MXF::fill_writer_info (ASDCP::WriterInfo* writer_info) { writer_info->ProductVersion = _metadata.product_version; writer_info->CompanyName = _metadata.company_name; @@ -85,13 +85,13 @@ MXFAsset::fill_writer_info (ASDCP::WriterInfo* writer_info) } bool -MXFAsset::equals (shared_ptr other, EqualityOptions opt, boost::function note) const +MXF::equals (shared_ptr other, EqualityOptions opt, boost::function note) const { if (!ContentAsset::equals (other, opt, note)) { return false; } - shared_ptr other_mxf = dynamic_pointer_cast (other); + shared_ptr other_mxf = dynamic_pointer_cast (other); if (!other_mxf) { note (ERROR, "comparing an MXF asset with a non-MXF asset"); return false; @@ -108,7 +108,7 @@ MXFAsset::equals (shared_ptr other, EqualityOptions opt, boo } void -MXFAsset::write_to_cpl (xmlpp::Element* node) const +MXF::write_to_cpl (xmlpp::Element* node) const { pair const attr = cpl_node_attribute (); xmlpp::Element* a = node->add_child (cpl_node_name ()); @@ -127,7 +127,7 @@ MXFAsset::write_to_cpl (xmlpp::Element* node) const } void -MXFAsset::set_key (Key key) +MXF::set_key (Key key) { _key = key; diff --git a/src/mxf_asset.h b/src/mxf.h similarity index 92% rename from src/mxf_asset.h rename to src/mxf.h index 4af7a38d..3e9e6666 100644 --- a/src/mxf_asset.h +++ b/src/mxf.h @@ -35,19 +35,21 @@ namespace dcp class MXFMetadata; -/** @brief Parent class for assets which have MXF files */ -class MXFAsset : public ContentAsset +/** @class MXF + * @brief Parent class for classes which represent MXF files. + */ +class MXF : public ContentAsset { public: - /** Construct an MXFAsset. + /** Construct an MXF. * This class will not write anything to disk in this constructor, but subclasses may. * * @param directory Directory where MXF file is. * @param file_name Name of MXF file. */ - MXFAsset (boost::filesystem::path directory, boost::filesystem::path file_name); + MXF (boost::filesystem::path directory, boost::filesystem::path file_name); - ~MXFAsset (); + ~MXF (); virtual bool equals (boost::shared_ptr other, EqualityOptions opt, boost::function note) const; virtual void write_to_cpl (xmlpp::Element *) const; diff --git a/src/picture_asset.cc b/src/picture_mxf.cc similarity index 93% rename from src/picture_asset.cc rename to src/picture_mxf.cc index 94ebefaa..3221a88f 100644 --- a/src/picture_asset.cc +++ b/src/picture_mxf.cc @@ -31,11 +31,11 @@ #include #include "AS_DCP.h" #include "KM_fileio.h" -#include "picture_asset.h" +#include "picture_mxf.h" #include "util.h" #include "exceptions.h" #include "xyz_frame.h" -#include "picture_asset_writer.h" +#include "picture_mxf_writer.h" using std::string; using std::ostream; @@ -52,16 +52,16 @@ using boost::dynamic_pointer_cast; using boost::lexical_cast; using namespace dcp; -PictureAsset::PictureAsset (boost::filesystem::path directory, boost::filesystem::path mxf_name) - : MXFAsset (directory, mxf_name) +PictureMXF::PictureMXF (boost::filesystem::path directory, boost::filesystem::path mxf_name) + : MXF (directory, mxf_name) { } void -PictureAsset::write_to_cpl (xmlpp::Element* node) const +PictureMXF::write_to_cpl (xmlpp::Element* node) const { - MXFAsset::write_to_cpl (node); + MXF::write_to_cpl (node); xmlpp::Node::NodeList c = node->get_children (); xmlpp::Node::NodeList::iterator i = c.begin(); @@ -82,7 +82,7 @@ PictureAsset::write_to_cpl (xmlpp::Element* node) const } bool -PictureAsset::descriptor_equals ( +PictureMXF::descriptor_equals ( ASDCP::JP2K::PictureDescriptor const & a, ASDCP::JP2K::PictureDescriptor const & b, boost::function note ) const { @@ -124,7 +124,7 @@ PictureAsset::descriptor_equals ( } bool -PictureAsset::frame_buffer_equals ( +PictureMXF::frame_buffer_equals ( int frame, EqualityOptions opt, boost::function note, uint8_t const * data_A, unsigned int size_A, uint8_t const * data_B, unsigned int size_B ) const @@ -202,7 +202,7 @@ PictureAsset::frame_buffer_equals ( } string -PictureAsset::key_type () const +PictureMXF::key_type () const { return "MDIK"; } diff --git a/src/picture_asset.h b/src/picture_mxf.h similarity index 88% rename from src/picture_asset.h rename to src/picture_mxf.h index d9b9919b..1966ee8e 100644 --- a/src/picture_asset.h +++ b/src/picture_mxf.h @@ -17,15 +17,15 @@ */ -#ifndef LIBDCP_PICTURE_ASSET_H -#define LIBDCP_PICTURE_ASSET_H +#ifndef LIBDCP_PICTURE_MXF_H +#define LIBDCP_PICTURE_MXF_H /** @file src/picture_asset.h * @brief An asset made up of JPEG2000 data */ #include -#include "mxf_asset.h" +#include "mxf.h" #include "util.h" #include "metadata.h" @@ -40,10 +40,10 @@ namespace dcp class MonoPictureFrame; class StereoPictureFrame; -class PictureAssetWriter; +class PictureMXFWriter; /** @brief An asset made up of JPEG2000 data */ -class PictureAsset : public MXFAsset +class PictureMXF : public MXF { public: /** Construct a PictureAsset. @@ -51,7 +51,7 @@ public: * @param directory Directory where MXF file is. * @param mxf_name Name of MXF file. */ - PictureAsset (boost::filesystem::path directory, boost::filesystem::path mxf_name); + PictureMXF (boost::filesystem::path directory, boost::filesystem::path mxf_name); /** Start a progressive write to this asset. * The following parameters must be set up (if required) before calling this: @@ -62,7 +62,7 @@ public: * @param overwrite true to overwrite an existing MXF file; in this mode, writing can be resumed to a partially-written MXF; false if the * MXF file does not exist. */ - virtual boost::shared_ptr start_write (bool overwrite) = 0; + virtual boost::shared_ptr start_write (bool overwrite) = 0; virtual void read () = 0; virtual void create (std::vector const &) {} diff --git a/src/picture_asset_writer.cc b/src/picture_mxf_writer.cc similarity index 93% rename from src/picture_asset_writer.cc rename to src/picture_mxf_writer.cc index c1c9bd85..61dd854b 100644 --- a/src/picture_asset_writer.cc +++ b/src/picture_mxf_writer.cc @@ -21,9 +21,9 @@ #include #include "AS_DCP.h" #include "KM_fileio.h" -#include "picture_asset_writer.h" +#include "picture_mxf_writer.h" #include "exceptions.h" -#include "picture_asset.h" +#include "picture_mxf.h" using std::istream; using std::ostream; @@ -83,7 +83,7 @@ FrameInfo::write (FILE* f) const } -PictureAssetWriter::PictureAssetWriter (PictureAsset* asset, bool overwrite) +PictureMXFWriter::PictureMXFWriter (PictureMXF* asset, bool overwrite) : _asset (asset) , _frames_written (0) , _started (false) diff --git a/src/picture_asset_writer.h b/src/picture_mxf_writer.h similarity index 86% rename from src/picture_asset_writer.h rename to src/picture_mxf_writer.h index c6c00d87..3d10288f 100644 --- a/src/picture_asset_writer.h +++ b/src/picture_mxf_writer.h @@ -27,7 +27,7 @@ namespace dcp { -class PictureAsset; +class PictureMXF; struct FrameInfo { @@ -48,21 +48,21 @@ struct FrameInfo std::string hash; }; -class PictureAssetWriter : public boost::noncopyable +class PictureMXFWriter : public boost::noncopyable { public: - virtual ~PictureAssetWriter () {} + virtual ~PictureMXFWriter () {} virtual FrameInfo write (uint8_t *, int) = 0; virtual void finalize () = 0; virtual void fake_write (int) = 0; protected: template - friend void start (PictureAssetWriter *, boost::shared_ptr

, Q *, uint8_t *, int); + friend void start (PictureMXFWriter *, boost::shared_ptr

, Q *, uint8_t *, int); - PictureAssetWriter (PictureAsset *, bool); + PictureMXFWriter (PictureMXF *, bool); - PictureAsset* _asset; + PictureMXF* _asset; /** Number of picture frames written to the asset so far. For stereo assets * this will be incremented for each eye (i.e. there will be twice the number diff --git a/src/picture_asset_writer_common.cc b/src/picture_mxf_writer_common.cc similarity index 94% rename from src/picture_asset_writer_common.cc rename to src/picture_mxf_writer_common.cc index bb1316c7..07a0964a 100644 --- a/src/picture_asset_writer_common.cc +++ b/src/picture_mxf_writer_common.cc @@ -33,7 +33,7 @@ struct ASDCPStateBase }; template -void dcp::start (PictureAssetWriter* writer, shared_ptr

state, Q* asset, uint8_t* data, int size) +void dcp::start (PictureMXFWriter* writer, shared_ptr

state, Q* asset, uint8_t* data, int size) { if (ASDCP_FAILURE (state->j2k_parser.OpenReadFrame (data, size, state->frame_buffer))) { boost::throw_exception (MiscError ("could not parse J2K frame")); diff --git a/src/reel.cc b/src/reel.cc index 7a54059e..9f514d88 100644 --- a/src/reel.cc +++ b/src/reel.cc @@ -20,10 +20,10 @@ #include #include "reel.h" #include "util.h" -#include "picture_asset.h" -#include "mono_picture_asset.h" -#include "stereo_picture_asset.h" -#include "sound_asset.h" +#include "picture_mxf.h" +#include "mono_picture_mxf.h" +#include "stereo_picture_mxf.h" +#include "sound_mxf.h" #include "subtitle_asset.h" #include "kdm.h" @@ -41,7 +41,7 @@ Reel::write_to_cpl (xmlpp::Element* node) const reel->add_child("Id")->add_child_text ("urn:uuid:" + make_uuid()); xmlpp::Element* asset_list = reel->add_child ("AssetList"); - if (_main_picture && dynamic_pointer_cast (_main_picture)) { + if (_main_picture && dynamic_pointer_cast (_main_picture)) { /* Mono pictures come before other stuff... */ _main_picture->write_to_cpl (asset_list); } @@ -54,7 +54,7 @@ Reel::write_to_cpl (xmlpp::Element* node) const _main_subtitle->write_to_cpl (asset_list); } - if (_main_picture && dynamic_pointer_cast (_main_picture)) { + if (_main_picture && dynamic_pointer_cast (_main_picture)) { /* ... but stereo pictures must come after */ _main_picture->write_to_cpl (asset_list); } diff --git a/src/reel.h b/src/reel.h index 666e235e..41e811e4 100644 --- a/src/reel.h +++ b/src/reel.h @@ -33,8 +33,8 @@ namespace xmlpp { namespace dcp { -class PictureAsset; -class SoundAsset; +class PictureMXF; +class SoundMXF; class SubtitleAsset; class KDM; @@ -43,8 +43,8 @@ class Reel { public: Reel ( - boost::shared_ptr picture, - boost::shared_ptr sound, + boost::shared_ptr picture, + boost::shared_ptr sound, boost::shared_ptr subtitle ) : _main_picture (picture) @@ -52,11 +52,11 @@ public: , _main_subtitle (subtitle) {} - boost::shared_ptr main_picture () const { + boost::shared_ptr main_picture () const { return _main_picture; } - boost::shared_ptr main_sound () const { + boost::shared_ptr main_sound () const { return _main_sound; } @@ -75,8 +75,8 @@ public: void add_kdm (KDM const &); private: - boost::shared_ptr _main_picture; - boost::shared_ptr _main_sound; + boost::shared_ptr _main_picture; + boost::shared_ptr _main_sound; boost::shared_ptr _main_subtitle; }; diff --git a/src/sound_asset.cc b/src/sound_mxf.cc similarity index 89% rename from src/sound_asset.cc rename to src/sound_mxf.cc index 5a1ce06b..b569c57a 100644 --- a/src/sound_asset.cc +++ b/src/sound_mxf.cc @@ -28,7 +28,7 @@ #include #include "KM_fileio.h" #include "AS_DCP.h" -#include "sound_asset.h" +#include "sound_mxf.h" #include "util.h" #include "exceptions.h" #include "sound_frame.h" @@ -42,8 +42,8 @@ using boost::shared_ptr; using boost::lexical_cast; using namespace dcp; -SoundAsset::SoundAsset (boost::filesystem::path directory, boost::filesystem::path mxf_name) - : MXFAsset (directory, mxf_name) +SoundMXF::SoundMXF (boost::filesystem::path directory, boost::filesystem::path mxf_name) + : MXF (directory, mxf_name) , _channels (0) , _sampling_rate (0) { @@ -51,7 +51,7 @@ SoundAsset::SoundAsset (boost::filesystem::path directory, boost::filesystem::pa } void -SoundAsset::read () +SoundMXF::read () { ASDCP::PCM::MXFReader reader; Kumu::Result_t r = reader.OpenRead (path().string().c_str()); @@ -72,15 +72,15 @@ SoundAsset::read () } string -SoundAsset::cpl_node_name () const +SoundMXF::cpl_node_name () const { return "MainSound"; } bool -SoundAsset::equals (shared_ptr other, EqualityOptions opt, boost::function note) const +SoundMXF::equals (shared_ptr other, EqualityOptions opt, boost::function note) const { - if (!MXFAsset::equals (other, opt, note)) { + if (!MXF::equals (other, opt, note)) { return false; } @@ -154,20 +154,20 @@ SoundAsset::equals (shared_ptr other, EqualityOptions opt, b } shared_ptr -SoundAsset::get_frame (int n) const +SoundMXF::get_frame (int n) const { /* XXX: should add on entry point here? */ return shared_ptr (new SoundFrame (path().string(), n, _decryption_context)); } -shared_ptr -SoundAsset::start_write () +shared_ptr +SoundMXF::start_write () { /* XXX: can't we use a shared_ptr here? */ - return shared_ptr (new SoundAssetWriter (this)); + return shared_ptr (new SoundMXFWriter (this)); } -struct SoundAssetWriter::ASDCPState +struct SoundMXFWriter::ASDCPState { ASDCP::PCM::MXFWriter mxf_writer; ASDCP::PCM::FrameBuffer frame_buffer; @@ -176,8 +176,8 @@ struct SoundAssetWriter::ASDCPState ASDCP::AESEncContext* encryption_context; }; -SoundAssetWriter::SoundAssetWriter (SoundAsset* a) - : _state (new SoundAssetWriter::ASDCPState) +SoundMXFWriter::SoundMXFWriter (SoundMXF* a) + : _state (new SoundMXFWriter::ASDCPState) , _asset (a) , _finalized (false) , _frames_written (0) @@ -209,7 +209,7 @@ SoundAssetWriter::SoundAssetWriter (SoundAsset* a) } void -SoundAssetWriter::write (float const * const * data, int frames) +SoundMXFWriter::write (float const * const * data, int frames) { for (int i = 0; i < frames; ++i) { @@ -236,7 +236,7 @@ SoundAssetWriter::write (float const * const * data, int frames) } void -SoundAssetWriter::write_current_frame () +SoundMXFWriter::write_current_frame () { ASDCP::Result_t const r = _state->mxf_writer.WriteFrame (_state->frame_buffer, _state->encryption_context, 0); if (ASDCP_FAILURE (r)) { @@ -247,7 +247,7 @@ SoundAssetWriter::write_current_frame () } void -SoundAssetWriter::finalize () +SoundMXFWriter::finalize () { if (_frame_buffer_offset > 0) { write_current_frame (); @@ -263,7 +263,7 @@ SoundAssetWriter::finalize () } string -SoundAsset::key_type () const +SoundMXF::key_type () const { return "MDAK"; } diff --git a/src/sound_asset.h b/src/sound_mxf.h similarity index 83% rename from src/sound_asset.h rename to src/sound_mxf.h index ce08c512..eec3fab6 100644 --- a/src/sound_asset.h +++ b/src/sound_mxf.h @@ -24,7 +24,7 @@ * @brief An asset made up of PCM audio data files */ -#include "mxf_asset.h" +#include "mxf.h" #include "types.h" #include "metadata.h" @@ -32,22 +32,22 @@ namespace dcp { class SoundFrame; -class SoundAsset; +class SoundMXF; -class SoundAssetWriter +class SoundMXFWriter { public: void write (float const * const *, int); void finalize (); private: - friend class SoundAsset; + friend class SoundMXF; - SoundAssetWriter (SoundAsset *); + SoundMXFWriter (SoundMXF *); /* no copy construction */ - SoundAssetWriter (SoundAssetWriter const &); - SoundAssetWriter& operator= (SoundAssetWriter const &); + SoundMXFWriter (SoundMXFWriter const &); + SoundMXFWriter& operator= (SoundMXFWriter const &); void write_current_frame (); @@ -58,21 +58,21 @@ private: struct ASDCPState; boost::shared_ptr _state; - SoundAsset* _asset; + SoundMXF* _asset; bool _finalized; int _frames_written; int _frame_buffer_offset; }; /** @brief An asset made up of WAV files */ -class SoundAsset : public MXFAsset +class SoundMXF : public MXF { public: - SoundAsset (boost::filesystem::path directory, boost::filesystem::path mxf_name); + SoundMXF (boost::filesystem::path directory, boost::filesystem::path mxf_name); void read (); - boost::shared_ptr start_write (); + boost::shared_ptr start_write (); bool equals (boost::shared_ptr other, EqualityOptions opt, boost::function note) const; diff --git a/src/stereo_picture_asset.cc b/src/stereo_picture_mxf.cc similarity index 80% rename from src/stereo_picture_asset.cc rename to src/stereo_picture_mxf.cc index 711a8090..29283746 100644 --- a/src/stereo_picture_asset.cc +++ b/src/stereo_picture_mxf.cc @@ -18,10 +18,10 @@ */ #include "AS_DCP.h" -#include "stereo_picture_asset.h" +#include "stereo_picture_mxf.h" #include "stereo_picture_frame.h" #include "exceptions.h" -#include "stereo_picture_asset_writer.h" +#include "stereo_picture_mxf_writer.h" using std::string; using std::pair; @@ -31,9 +31,9 @@ using boost::dynamic_pointer_cast; using namespace dcp; bool -StereoPictureAsset::equals (shared_ptr other, EqualityOptions opt, boost::function note) const +StereoPictureMXF::equals (shared_ptr other, EqualityOptions opt, boost::function note) const { - if (!MXFAsset::equals (other, opt, note)) { + if (!MXF::equals (other, opt, note)) { return false; } @@ -62,7 +62,7 @@ StereoPictureAsset::equals (shared_ptr other, EqualityOption return false; } - shared_ptr other_picture = dynamic_pointer_cast (other); + shared_ptr other_picture = dynamic_pointer_cast (other); assert (other_picture); for (int i = 0; i < _intrinsic_duration; ++i) { @@ -89,14 +89,14 @@ StereoPictureAsset::equals (shared_ptr other, EqualityOption return true; } -StereoPictureAsset::StereoPictureAsset (boost::filesystem::path directory, boost::filesystem::path mxf_name) - : PictureAsset (directory, mxf_name) +StereoPictureMXF::StereoPictureMXF (boost::filesystem::path directory, boost::filesystem::path mxf_name) + : PictureMXF (directory, mxf_name) { } void -StereoPictureAsset::read () +StereoPictureMXF::read () { ASDCP::JP2K::MXFSReader reader; Kumu::Result_t r = reader.OpenRead (path().string().c_str()); @@ -114,25 +114,25 @@ StereoPictureAsset::read () } shared_ptr -StereoPictureAsset::get_frame (int n) const +StereoPictureMXF::get_frame (int n) const { return shared_ptr (new StereoPictureFrame (path().string(), n)); } -shared_ptr -StereoPictureAsset::start_write (bool overwrite) +shared_ptr +StereoPictureMXF::start_write (bool overwrite) { - return shared_ptr (new StereoPictureAssetWriter (this, overwrite)); + return shared_ptr (new StereoPictureMXFWriter (this, overwrite)); } string -StereoPictureAsset::cpl_node_name () const +StereoPictureMXF::cpl_node_name () const { return "msp-cpl:MainStereoscopicPicture"; } pair -StereoPictureAsset::cpl_node_attribute () const +StereoPictureMXF::cpl_node_attribute () const { if (_interop) { return make_pair ("xmlns:msp-cpl", "http://www.digicine.com/schemas/437-Y/2007/Main-Stereo-Picture-CPL"); @@ -144,7 +144,7 @@ StereoPictureAsset::cpl_node_attribute () const } int -StereoPictureAsset::edit_rate_factor () const +StereoPictureMXF::edit_rate_factor () const { return 2; } diff --git a/src/stereo_picture_asset.h b/src/stereo_picture_mxf.h similarity index 77% rename from src/stereo_picture_asset.h rename to src/stereo_picture_mxf.h index a6620dcf..2e16b22c 100644 --- a/src/stereo_picture_asset.h +++ b/src/stereo_picture_mxf.h @@ -17,23 +17,23 @@ */ -#ifndef LIBDCP_STEREO_PICTURE_ASSET_H -#define LIBDCP_STEREO_PICTURE_ASSET_H +#ifndef LIBDCP_STEREO_PICTURE_MXF_H +#define LIBDCP_STEREO_PICTURE_MXF_H -#include "picture_asset.h" +#include "picture_mxf.h" namespace dcp { /** A 3D (stereoscopic) picture asset */ -class StereoPictureAsset : public PictureAsset +class StereoPictureMXF : public PictureMXF { public: - StereoPictureAsset (boost::filesystem::path directory, boost::filesystem::path mxf_name); + StereoPictureMXF (boost::filesystem::path directory, boost::filesystem::path mxf_name); void read (); - /** Start a progressive write to a StereoPictureAsset */ - boost::shared_ptr start_write (bool); + /** Start a progressive write to a StereoPictureMXF */ + boost::shared_ptr start_write (bool); boost::shared_ptr get_frame (int n) const; bool equals (boost::shared_ptr other, EqualityOptions opt, boost::function note) const; diff --git a/src/stereo_picture_asset_writer.cc b/src/stereo_picture_mxf_writer.cc similarity index 83% rename from src/stereo_picture_asset_writer.cc rename to src/stereo_picture_mxf_writer.cc index 04ca0590..b988d75a 100644 --- a/src/stereo_picture_asset_writer.cc +++ b/src/stereo_picture_mxf_writer.cc @@ -19,11 +19,11 @@ #include "AS_DCP.h" #include "KM_fileio.h" -#include "stereo_picture_asset_writer.h" +#include "stereo_picture_mxf_writer.h" #include "exceptions.h" -#include "picture_asset.h" +#include "picture_mxf.h" -#include "picture_asset_writer_common.cc" +#include "picture_mxf_writer_common.cc" using std::istream; using std::ostream; @@ -31,21 +31,21 @@ using std::string; using boost::shared_ptr; using namespace dcp; -struct StereoPictureAssetWriter::ASDCPState : public ASDCPStateBase +struct StereoPictureMXFWriter::ASDCPState : public ASDCPStateBase { ASDCP::JP2K::MXFSWriter mxf_writer; }; -StereoPictureAssetWriter::StereoPictureAssetWriter (PictureAsset* asset, bool overwrite) - : PictureAssetWriter (asset, overwrite) - , _state (new StereoPictureAssetWriter::ASDCPState) +StereoPictureMXFWriter::StereoPictureMXFWriter (PictureMXF* asset, bool overwrite) + : PictureMXFWriter (asset, overwrite) + , _state (new StereoPictureMXFWriter::ASDCPState) , _next_eye (EYE_LEFT) { _state->encryption_context = asset->encryption_context (); } void -StereoPictureAssetWriter::start (uint8_t* data, int size) +StereoPictureMXFWriter::start (uint8_t* data, int size) { dcp::start (this, _state, _asset, data, size); } @@ -55,7 +55,7 @@ StereoPictureAssetWriter::start (uint8_t* data, int size) * @param size Size of data. */ FrameInfo -StereoPictureAssetWriter::write (uint8_t* data, int size) +StereoPictureMXFWriter::write (uint8_t* data, int size) { assert (!_finalized); @@ -89,7 +89,7 @@ StereoPictureAssetWriter::write (uint8_t* data, int size) } void -StereoPictureAssetWriter::fake_write (int size) +StereoPictureMXFWriter::fake_write (int size) { assert (_started); assert (!_finalized); @@ -104,7 +104,7 @@ StereoPictureAssetWriter::fake_write (int size) } void -StereoPictureAssetWriter::finalize () +StereoPictureMXFWriter::finalize () { assert (!_finalized); diff --git a/src/stereo_picture_asset_writer.h b/src/stereo_picture_mxf_writer.h similarity index 90% rename from src/stereo_picture_asset_writer.h rename to src/stereo_picture_mxf_writer.h index 96572989..384250db 100644 --- a/src/stereo_picture_asset_writer.h +++ b/src/stereo_picture_mxf_writer.h @@ -22,7 +22,7 @@ #include #include #include -#include "picture_asset_writer.h" +#include "picture_mxf_writer.h" namespace dcp { @@ -36,7 +36,7 @@ namespace dcp { * The action of finalize() can't be done in MonoPictureAssetWriter's destructor as it may * throw an exception. */ -class StereoPictureAssetWriter : public PictureAssetWriter +class StereoPictureMXFWriter : public PictureMXFWriter { public: FrameInfo write (uint8_t *, int); @@ -44,9 +44,9 @@ public: void finalize (); private: - friend class StereoPictureAsset; + friend class StereoPictureMXF; - StereoPictureAssetWriter (PictureAsset *, bool); + StereoPictureMXFWriter (PictureMXF *, bool); void start (uint8_t *, int); /* do this with an opaque pointer so we don't have to include diff --git a/src/wscript b/src/wscript index db0cc628..bcdc149c 100644 --- a/src/wscript +++ b/src/wscript @@ -26,23 +26,23 @@ def build(bld): kdm.cc key.cc metadata.cc - mono_picture_asset.cc - mono_picture_asset_writer.cc + mono_picture_mxf.cc + mono_picture_mxf_writer.cc mono_picture_frame.cc - mxf_asset.cc + mxf.cc object.cc - picture_asset.cc - picture_asset_writer.cc + picture_mxf.cc + picture_mxf_writer.cc rec709_linearised_gamma_lut.cc reel.cc rgb_xyz.cc signer.cc signer_chain.cc - sound_asset.cc + sound_mxf.cc sound_frame.cc srgb_linearised_gamma_lut.cc - stereo_picture_asset.cc - stereo_picture_asset_writer.cc + stereo_picture_mxf.cc + stereo_picture_mxf_writer.cc stereo_picture_frame.cc subtitle_asset.cc types.cc @@ -70,22 +70,22 @@ def build(bld): lut.h lut_cache.h metadata.h - mono_picture_asset.h + mono_picture_mxf.h mono_picture_frame.h - mxf_asset.h + mxf.h object.h - picture_asset.h - picture_asset_writer.h + picture_mxf.h + picture_mxf_writer.h rgb_xyz.h rec709_linearised_gamma_lut.h reel.h argb_frame.h signer.h signer_chain.h - sound_asset.h + sound_mxf.h sound_frame.h srgb_linearised_gamma_lut.h - stereo_picture_asset.h + stereo_picture_mxf.h stereo_picture_frame.h subtitle_asset.h types.h diff --git a/test/cpl_sar.cc b/test/cpl_sar.cc index 5628363a..e280dbd3 100644 --- a/test/cpl_sar.cc +++ b/test/cpl_sar.cc @@ -20,7 +20,7 @@ #include #include #include "cpl.h" -#include "mono_picture_asset.h" +#include "mono_picture_mxf.h" using boost::shared_ptr; @@ -29,7 +29,7 @@ using boost::shared_ptr; */ BOOST_AUTO_TEST_CASE (cpl_sar) { - shared_ptr mp (new dcp::MonoPictureAsset ("build/test/foo", "video.mxf")); + shared_ptr mp (new dcp::MonoPictureMXF ("build/test/foo", "video.mxf")); mp->set_interop (true); { diff --git a/test/decryption_test.cc b/test/decryption_test.cc index 5fd29c6c..b1cb5265 100644 --- a/test/decryption_test.cc +++ b/test/decryption_test.cc @@ -23,7 +23,7 @@ #include "mono_picture_frame.h" #include "cpl.h" #include "argb_frame.h" -#include "mono_picture_asset.h" +#include "mono_picture_mxf.h" #include "reel.h" #include "test.h" @@ -34,10 +34,10 @@ static shared_ptr get_frame (dcp::DCP const & dcp) { shared_ptr reel = dcp.cpls().front()->reels().front (); - shared_ptr picture = reel->main_picture (); + shared_ptr picture = reel->main_picture (); BOOST_CHECK (picture); - shared_ptr mono_picture = dynamic_pointer_cast (picture); + shared_ptr mono_picture = dynamic_pointer_cast (picture); shared_ptr j2k_frame = mono_picture->get_frame (0); return j2k_frame->argb_frame (); } diff --git a/test/frame_info_test.cc b/test/frame_info_test.cc index bf4181a0..02ff83aa 100644 --- a/test/frame_info_test.cc +++ b/test/frame_info_test.cc @@ -19,7 +19,8 @@ #include #include -#include "picture_asset_writer.h" +#include "picture_mxf.h" +#include "picture_mxf_writer.h" using namespace std; diff --git a/test/recovery_test.cc b/test/recovery_test.cc index 27a4c150..4cde723f 100644 --- a/test/recovery_test.cc +++ b/test/recovery_test.cc @@ -19,8 +19,8 @@ #include #include -#include "mono_picture_asset_writer.h" -#include "mono_picture_asset.h" +#include "mono_picture_mxf_writer.h" +#include "mono_picture_mxf.h" #include "KM_util.h" using std::string; @@ -48,10 +48,10 @@ BOOST_AUTO_TEST_CASE (recovery) boost::filesystem::remove_all ("build/test/baz"); boost::filesystem::create_directories ("build/test/baz"); - shared_ptr mp (new dcp::MonoPictureAsset ("build/test/baz", "video1.mxf")); + shared_ptr mp (new dcp::MonoPictureMXF ("build/test/baz", "video1.mxf")); mp->set_edit_rate (24); mp->set_size (dcp::Size (32, 32)); - shared_ptr writer = mp->start_write (false); + shared_ptr writer = mp->start_write (false); int written_size = 0; for (int i = 0; i < 24; ++i) { @@ -78,7 +78,7 @@ BOOST_AUTO_TEST_CASE (recovery) Kumu::ResetTestRNG (); #endif - mp.reset (new dcp::MonoPictureAsset ("build/test/baz", "video2.mxf")); + mp.reset (new dcp::MonoPictureMXF ("build/test/baz", "video2.mxf")); mp->set_edit_rate (24); mp->set_size (dcp::Size (32, 32)); writer = mp->start_write (true); diff --git a/test/round_trip_test.cc b/test/round_trip_test.cc index 51edf111..0e6fe5f5 100644 --- a/test/round_trip_test.cc +++ b/test/round_trip_test.cc @@ -22,8 +22,8 @@ #include "certificates.h" #include "kdm.h" #include "signer.h" -#include "mono_picture_asset.h" -#include "sound_asset.h" +#include "mono_picture_mxf.h" +#include "sound_mxf.h" #include "reel.h" #include "test.h" #include "cpl.h" @@ -56,7 +56,7 @@ BOOST_AUTO_TEST_CASE (round_trip_test) boost::filesystem::path work_dir = "build/test/round_trip_test"; boost::filesystem::create_directory (work_dir); - shared_ptr asset_A (new dcp::MonoPictureAsset (work_dir, "video.mxf")); + shared_ptr asset_A (new dcp::MonoPictureMXF (work_dir, "video.mxf")); asset_A->set_edit_rate (24); asset_A->set_intrinsic_duration (24); asset_A->set_size (dcp::Size (32, 32)); @@ -67,7 +67,7 @@ BOOST_AUTO_TEST_CASE (round_trip_test) asset_A->set_key (key); shared_ptr cpl (new dcp::CPL (work_dir, "A Test DCP", dcp::FEATURE, 24, 24)); - cpl->add_reel (shared_ptr (new dcp::Reel (asset_A, shared_ptr (), shared_ptr ()))); + cpl->add_reel (shared_ptr (new dcp::Reel (asset_A, shared_ptr (), shared_ptr ()))); /* A KDM using our certificate chain's leaf key pair */ dcp::KDM kdm_A ( @@ -100,8 +100,8 @@ BOOST_AUTO_TEST_CASE (round_trip_test) } /* Reload the picture MXF */ - shared_ptr asset_B ( - new dcp::MonoPictureAsset (work_dir, "video.mxf") + shared_ptr asset_B ( + new dcp::MonoPictureMXF (work_dir, "video.mxf") ); asset_B->set_key (kdm_B.keys().front().key()); diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc index 48926c01..70c94d8e 100644 --- a/tools/dcpinfo.cc +++ b/tools/dcpinfo.cc @@ -5,8 +5,8 @@ #include "dcp.h" #include "exceptions.h" #include "reel.h" -#include "sound_asset.h" -#include "picture_asset.h" +#include "sound_mxf.h" +#include "picture_mxf.h" #include "subtitle_asset.h" #include "cpl.h" -- 2.30.2