From 5c29a3586ea262abcc8829bf267d38d8a5a84d9b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 9 Sep 2012 12:48:47 +0100 Subject: [PATCH] Somewhat hacky rearrangement to support multiple CPLs per DCP. --- examples/make_dcp.cc | 19 +- src/asset.h | 4 + src/dcp.cc | 303 ++++++++++++------ src/dcp.h | 151 +++++---- src/reel.cc | 32 -- src/reel.h | 2 - src/util.cc | 2 +- ...b54df-e1bf-4647-8788-ea7ba154375b_cpl.xml} | 10 +- test/ref/DCP/ASSETMAP.xml | 16 +- test/ref/DCP/audio.mxf | Bin 305326 -> 305326 bytes ...0e4141-13c3-4a7a-bef8-b5a04fcbc4bb_pkl.xml | 20 +- test/ref/DCP/video.mxf | Bin 26080 -> 26080 bytes test/ref/info.log | 100 +++--- test/tests.cc | 20 +- tools/dcpinfo.cc | 42 ++- 15 files changed, 426 insertions(+), 295 deletions(-) rename test/ref/DCP/{9892e944-5046-4dbb-af7c-f50742f62fc2_cpl.xml => 81fb54df-e1bf-4647-8788-ea7ba154375b_cpl.xml} (79%) diff --git a/examples/make_dcp.cc b/examples/make_dcp.cc index 5b764393..a84a19c1 100644 --- a/examples/make_dcp.cc +++ b/examples/make_dcp.cc @@ -49,14 +49,19 @@ video_frame (int /* frame */) int main () { - /* Make a DCP object. "My Film DCP" is the directory name for the DCP, "My Film" is the title - that will be shown on the projector / TMS when the DCP is ingested. + /* Make a DCP object. "My Film DCP" is the directory name for the DCP */ + libdcp::DCP dcp ("My Film DCP"); + + /* Now make a CPL object. + "My Film" is the title that will be shown on the projector / TMS when the DCP is ingested. FEATURE is the type that the projector will list the DCP as. - 24 is the frame rate, and the DCP will be 48 frames long (ie 2 seconds at 24 fps). - */ - libdcp::DCP dcp ("My Film DCP", "My Film", libdcp::FEATURE, 24, 48); + */ + boost::shared_ptr cpl (new libdcp::CPL ("My Film DCP", "My Film", libdcp::FEATURE, 24, 48)); + + /* And add the CPL to the DCP */ + dcp.add_cpl (cpl); /* Now make a `picture asset'. This is a collection of the JPEG2000 files that make up the picture, one per frame. Here we're using a function (video_frame) to obtain the name of the JPEG2000 file for each frame. @@ -92,8 +97,8 @@ main () new libdcp::SoundAsset (sound_files, "My Film DCP", "audio.mxf", 0, 24, 48) ); - /* Now that we have the assets, we can create a Reel to put them in and add it to the DCP */ - dcp.add_reel ( + /* Now that we have the assets, we can create a Reel to put them in and add it to the CPL */ + cpl->add_reel ( boost::shared_ptr ( new libdcp::Reel (picture_asset, sound_asset, boost::shared_ptr ()) ) diff --git a/src/asset.h b/src/asset.h index 0c8df0c8..eab24d28 100644 --- a/src/asset.h +++ b/src/asset.h @@ -64,6 +64,10 @@ public: */ void write_to_assetmap (std::ostream& s) const; + std::string uuid () const { + return _uuid; + } + virtual std::list equals (boost::shared_ptr other, EqualityOptions opt) const = 0; protected: diff --git a/src/dcp.cc b/src/dcp.cc index 907f7dd5..8de1ddd9 100644 --- a/src/dcp.cc +++ b/src/dcp.cc @@ -45,77 +45,31 @@ using namespace std; using namespace boost; using namespace libdcp; -DCP::DCP (string directory, string name, ContentKind content_kind, int fps, int length) +DCP::DCP (string directory) : _directory (directory) - , _name (name) - , _content_kind (content_kind) - , _fps (fps) - , _length (length) { filesystem::create_directories (directory); } -void -DCP::add_reel (shared_ptr reel) -{ - _reels.push_back (reel); -} - void DCP::write_xml () const { - string cpl_uuid = make_uuid (); - string cpl_path = write_cpl (cpl_uuid); - int cpl_length = filesystem::file_size (cpl_path); - string cpl_digest = make_digest (cpl_path, 0); + for (list >::const_iterator i = _cpls.begin(); i != _cpls.end(); ++i) { + (*i)->write_xml (); + } string pkl_uuid = make_uuid (); - string pkl_path = write_pkl (pkl_uuid, cpl_uuid, cpl_digest, cpl_length); + string pkl_path = write_pkl (pkl_uuid); write_volindex (); - write_assetmap (cpl_uuid, cpl_length, pkl_uuid, filesystem::file_size (pkl_path)); -} - -string -DCP::write_cpl (string cpl_uuid) const -{ - filesystem::path p; - p /= _directory; - stringstream s; - s << cpl_uuid << "_cpl.xml"; - p /= s.str(); - ofstream cpl (p.string().c_str()); - - cpl << "\n" - << "\n" - << " urn:uuid:" << cpl_uuid << "\n" - << " " << _name << "\n" - << " " << Metadata::instance()->issue_date << "\n" - << " " << Metadata::instance()->creator << "\n" - << " " << _name << "\n" - << " " << content_kind_to_string (_content_kind) << "\n" - << " \n" - << " urn:uri:" << cpl_uuid << "_" << Metadata::instance()->issue_date << "\n" - << " " << cpl_uuid << "_" << Metadata::instance()->issue_date << "\n" - << " \n" - << " \n" - << " \n"; - - for (list >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) { - (*i)->write_to_cpl (cpl); - } - - cpl << " \n" - << " \n" - << " \n" - << "\n"; - - return p.string (); + write_assetmap (pkl_uuid, filesystem::file_size (pkl_path)); } std::string -DCP::write_pkl (string pkl_uuid, string cpl_uuid, string cpl_digest, int cpl_length) const +DCP::write_pkl (string pkl_uuid) const { + assert (!_cpls.empty ()); + filesystem::path p; p /= _directory; stringstream s; @@ -126,22 +80,21 @@ DCP::write_pkl (string pkl_uuid, string cpl_uuid, string cpl_digest, int cpl_len pkl << "\n" << "\n" << " urn:uuid:" << pkl_uuid << "\n" - << " " << _name << "\n" + /* XXX: this is a bit of a hack */ + << " " << _cpls.front()->name() << "\n" << " " << Metadata::instance()->issue_date << "\n" << " " << Metadata::instance()->issuer << "\n" << " " << Metadata::instance()->creator << "\n" << " \n"; - for (list >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) { + list > a = assets (); + for (list >::const_iterator i = a.begin(); i != a.end(); ++i) { (*i)->write_to_pkl (pkl); } - pkl << " \n" - << " urn:uuid:" << cpl_uuid << "\n" - << " " << cpl_digest << "\n" - << " " << cpl_length << "\n" - << " text/xml\n" - << " \n"; + for (list >::const_iterator i = _cpls.begin(); i != _cpls.end(); ++i) { + (*i)->write_to_pkl (pkl); + } pkl << " \n" << "\n"; @@ -164,7 +117,7 @@ DCP::write_volindex () const } void -DCP::write_assetmap (string cpl_uuid, int cpl_length, string pkl_uuid, int pkl_length) const +DCP::write_assetmap (string pkl_uuid, int pkl_length) const { filesystem::path p; p /= _directory; @@ -192,20 +145,13 @@ DCP::write_assetmap (string cpl_uuid, int cpl_length, string pkl_uuid, int pkl_l << " \n" << " \n" << " \n"; - - am << " \n" - << " urn:uuid:" << cpl_uuid << "\n" - << " \n" - << " \n" - << " " << cpl_uuid << "_cpl.xml\n" - << " 1\n" - << " 0\n" - << " " << cpl_length << "\n" - << " \n" - << " \n" - << " \n"; - for (list >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) { + for (list >::const_iterator i = _cpls.begin(); i != _cpls.end(); ++i) { + (*i)->write_to_assetmap (am); + } + + list > a = assets (); + for (list >::const_iterator i = a.begin(); i != a.end(); ++i) { (*i)->write_to_assetmap (am); } @@ -214,8 +160,8 @@ DCP::write_assetmap (string cpl_uuid, int cpl_length, string pkl_uuid, int pkl_l } -DCP::DCP (string directory, bool require_mxfs) - : _directory (directory) +void +DCP::read (bool require_mxfs) { Files files; @@ -263,11 +209,7 @@ DCP::DCP (string directory, bool require_mxfs) delete p; if (root == "CompositionPlaylist") { - if (files.cpl.empty ()) { - files.cpl = t.string(); - } else { - throw DCPReadError ("duplicate CPLs found"); - } + files.cpls.push_back (t.string()); } else if (root == "PackingList") { if (files.pkl.empty ()) { files.pkl = t.string(); @@ -279,22 +221,14 @@ DCP::DCP (string directory, bool require_mxfs) } } - if (files.cpl.empty ()) { - throw FileError ("no CPL file found", ""); + if (files.cpls.empty ()) { + throw FileError ("no CPL files found", ""); } if (files.pkl.empty ()) { throw FileError ("no PKL file found", ""); } - /* Read the XML */ - shared_ptr cpl; - try { - cpl.reset (new CPLFile (files.cpl)); - } catch (FileError& e) { - throw FileError ("could not load CPL file", files.cpl); - } - shared_ptr pkl; try { pkl.reset (new PKLFile (files.pkl)); @@ -305,12 +239,91 @@ DCP::DCP (string directory, bool require_mxfs) /* Cross-check */ /* XXX */ + for (list::iterator i = files.cpls.begin(); i != files.cpls.end(); ++i) { + _cpls.push_back (shared_ptr (new CPL (_directory, *i, asset_map, require_mxfs))); + } + +} + +list +DCP::equals (DCP const & other, EqualityOptions opt) const +{ + list notes; + + if (_cpls.size() != other._cpls.size()) { + notes.push_back ("CPL counts differ"); + } + + list >::const_iterator a = _cpls.begin (); + list >::const_iterator b = other._cpls.begin (); + + while (a != _cpls.end ()) { + list n = (*a)->equals (*b->get(), opt); + notes.merge (n); + ++a; + ++b; + } + + return notes; +} + + +void +DCP::add_cpl (shared_ptr cpl) +{ + _cpls.push_back (cpl); +} + +class AssetComparator +{ +public: + bool operator() (shared_ptr a, shared_ptr b) { + return a->uuid() < b->uuid(); + } +}; + +list > +DCP::assets () const +{ + list > a; + for (list >::const_iterator i = _cpls.begin(); i != _cpls.end(); ++i) { + list > t = (*i)->assets (); + a.merge (t); + } + + a.sort (); + a.unique (); + return a; +} + +CPL::CPL (string directory, string name, ContentKind content_kind, int length, int frames_per_second) + : _directory (directory) + , _name (name) + , _content_kind (content_kind) + , _length (length) + , _fps (frames_per_second) +{ + _uuid = make_uuid (); +} + +CPL::CPL (string directory, string file, shared_ptr asset_map, bool require_mxfs) + : _directory (directory) + , _content_kind (FEATURE) + , _length (0) + , _fps (0) +{ + /* Read the XML */ + shared_ptr cpl; + try { + cpl.reset (new CPLFile (file)); + } catch (FileError& e) { + throw FileError ("could not load CPL file", file); + } + /* Now cherry-pick the required bits into our own data structure */ _name = cpl->annotation_text; _content_kind = cpl->content_kind; - _length = 0; - _fps = 0; for (list >::iterator i = cpl->reels.begin(); i != cpl->reels.end(); ++i) { @@ -322,7 +335,6 @@ DCP::DCP (string directory, bool require_mxfs) p = (*i)->asset_list->main_stereoscopic_picture; } - assert (_fps == 0 || _fps == p->edit_rate.numerator); _fps = p->edit_rate.numerator; _length += p->duration; @@ -397,8 +409,102 @@ DCP::DCP (string directory, bool require_mxfs) } } +void +CPL::add_reel (shared_ptr reel) +{ + _reels.push_back (reel); +} + +void +CPL::write_xml () const +{ + filesystem::path p; + p /= _directory; + stringstream s; + s << _uuid << "_cpl.xml"; + p /= s.str(); + ofstream os (p.string().c_str()); + + os << "\n" + << "\n" + << " urn:uuid:" << _uuid << "\n" + << " " << _name << "\n" + << " " << Metadata::instance()->issue_date << "\n" + << " " << Metadata::instance()->creator << "\n" + << " " << _name << "\n" + << " " << content_kind_to_string (_content_kind) << "\n" + << " \n" + << " urn:uri:" << _uuid << "_" << Metadata::instance()->issue_date << "\n" + << " " << _uuid << "_" << Metadata::instance()->issue_date << "\n" + << " \n" + << " \n" + << " \n"; + + for (list >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) { + (*i)->write_to_cpl (os); + } + + os << " \n" + << " \n" + << " \n" + << "\n"; + + os.close (); + + _digest = make_digest (p.string (), 0); + _length = filesystem::file_size (p.string ()); +} + +void +CPL::write_to_pkl (ostream& s) const +{ + s << " \n" + << " urn:uuid:" << _uuid << "\n" + << " " << _digest << "\n" + << " " << _length << "\n" + << " text/xml\n" + << " \n"; +} + +list > +CPL::assets () const +{ + list > a; + for (list >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) { + if ((*i)->main_picture ()) { + a.push_back ((*i)->main_picture ()); + } + if ((*i)->main_sound ()) { + a.push_back ((*i)->main_sound ()); + } + if ((*i)->main_subtitle ()) { + a.push_back ((*i)->main_subtitle ()); + } + } + + return a; +} + +void +CPL::write_to_assetmap (ostream& s) const +{ + s << " \n" + << " urn:uuid:" << _uuid << "\n" + << " \n" + << " \n" + << " " << _uuid << "_cpl.xml\n" + << " 1\n" + << " 0\n" + << " " << _length << "\n" + << " \n" + << " \n" + << " \n"; +} + + + list -DCP::equals (DCP const & other, EqualityOptions opt) const +CPL::equals (CPL const & other, EqualityOptions opt) const { list notes; @@ -433,4 +539,3 @@ DCP::equals (DCP const & other, EqualityOptions opt) const return notes; } - diff --git a/src/dcp.h b/src/dcp.h index 8dd7a412..79be5ca5 100644 --- a/src/dcp.h +++ b/src/dcp.h @@ -43,6 +43,68 @@ class PictureAsset; class SoundAsset; class SubtitleAsset; class Reel; +class AssetMap; + +class CPL +{ +public: + CPL (std::string directory, std::string name, ContentKind content_kind, int length, int frames_per_second); + CPL (std::string directory, std::string file, boost::shared_ptr asset_map, bool require_mxfs = true); + + void add_reel (boost::shared_ptr reel); + + /** @return the length in frames */ + int length () const { + return _length; + } + + /** @return the type of the content, used by media servers + * to categorise things (e.g. feature, trailer, etc.) + */ + ContentKind content_kind () const { + return _content_kind; + } + + std::list > reels () const { + return _reels; + } + + /** @return the CPL's name, as will be presented on projector + * media servers and theatre management systems. + */ + std::string name () const { + return _name; + } + + /** @return the number of frames per second */ + int frames_per_second () const { + return _fps; + } + + std::list > assets () const; + + std::list equals (CPL const & other, EqualityOptions options) const; + + void write_xml () const; + void write_to_assetmap (std::ostream& s) const; + void write_to_pkl (std::ostream& s) const; + +private: + std::string _directory; + /** the name of the DCP */ + std::string _name; + /** the content kind of the CPL */ + ContentKind _content_kind; + /** length in frames */ + mutable int _length; + /** frames per second */ + int _fps; + /** reels */ + std::list > _reels; + + std::string _uuid; + mutable std::string _digest; +}; /** @class DCP dcp.h libdcp/dcp.h * @brief A class to create or read a DCP. @@ -51,64 +113,29 @@ class Reel; class DCP { public: - /** Construct a DCP. - * - * This is for making a new DCP that you are going to add assets to. + /** Construct a DCP. You can pass an existing DCP's directory + * as the parameter, or a non-existant folder to create a new + * DCP in. * - * @param directory Directory to write files to. - * @param name Name. - * @param content_kind Content kind. - * @param fps Frames per second. - * @param length Length in frames. + * @param directory Directory containing the DCP's files. */ - DCP (std::string directory, std::string name, ContentKind content_kind, int fps, int length); + DCP (std::string directory); - /** Construct a DCP object for an existing DCP. + /** Read an existing DCP's data. * * The DCP's XML metadata will be examined, and you can then look at the contents * of the DCP. * - * @param directory Existing DCP's directory. - * @param read_mxfs true to read MXF files; setting to false can be useful for testing, but - * normally it should be set to true. + * @param require_mxfs true to throw an exception if MXF files are missing; setting to false + * can be useful for testing, but normally it should be set to true. */ - DCP (std::string directory, bool read_mxfs = true); - - void add_reel (boost::shared_ptr reel); + void read (bool require_mxfs = true); /** Write the required XML files to the directory that was * passed into the constructor. */ void write_xml () const; - /** @return the DCP's name, as will be presented on projector - * media servers and theatre management systems. - */ - std::string name () const { - return _name; - } - - /** @return the type of the content, used by media servers - * to categorise things (e.g. feature, trailer, etc.) - */ - ContentKind content_kind () const { - return _content_kind; - } - - /** @return the number of frames per second */ - int frames_per_second () const { - return _fps; - } - - /** @return the length in frames */ - int length () const { - return _length; - } - - std::list > reels () const { - return _reels; - } - /** Compare this DCP with another, according to various options. * @param other DCP to compare this one to. * @param options Options to define just what "equality" means. @@ -117,6 +144,12 @@ public: */ std::list equals (DCP const & other, EqualityOptions options) const; + void add_cpl (boost::shared_ptr cpl); + + std::list > cpls () const { + return _cpls; + } + /** Emitted with a parameter between 0 and 1 to indicate progress * for long jobs. */ @@ -124,33 +157,24 @@ public: private: - /** Write the CPL file. - * @param cpl_uuid UUID to use. - * @return CPL pathname. - */ - std::string write_cpl (std::string cpl_uuid) const; - /** Write the PKL file. * @param pkl_uuid UUID to use. - * @param cpl_uuid UUID of the CPL file. - * @param cpl_digest SHA digest of the CPL file. - * @param cpl_length Length of the CPL file in bytes. */ - std::string write_pkl (std::string pkl_uuid, std::string cpl_uuid, std::string cpl_digest, int cpl_length) const; + std::string write_pkl (std::string pkl_uuid) const; /** Write the VOLINDEX file */ void write_volindex () const; /** Write the ASSETMAP file. - * @param cpl_uuid UUID of our CPL. - * @param cpl_length Length of our CPL in bytes. * @param pkl_uuid UUID of our PKL. * @param pkl_length Length of our PKL in bytes. */ - void write_assetmap (std::string cpl_uuid, int cpl_length, std::string pkl_uuid, int pkl_length) const; + void write_assetmap (std::string pkl_uuid, int pkl_length) const; + + std::list > assets () const; struct Files { - std::string cpl; + std::list cpls; std::string pkl; std::string asset_map; std::list subtitles; @@ -158,16 +182,7 @@ private: /** the directory that we are writing to */ std::string _directory; - /** the name of the DCP */ - std::string _name; - /** the content kind of the DCP */ - ContentKind _content_kind; - /** frames per second */ - int _fps; - /** length in frames */ - int _length; - /** reels */ - std::list > _reels; + std::list > _cpls; }; } diff --git a/src/reel.cc b/src/reel.cc index 431af69a..50426cc1 100644 --- a/src/reel.cc +++ b/src/reel.cc @@ -46,38 +46,6 @@ Reel::write_to_cpl (ostream& s) const } } -void -Reel::write_to_pkl (ostream& s) const -{ - if (_main_picture) { - _main_picture->write_to_pkl (s); - } - - if (_main_sound) { - _main_sound->write_to_pkl (s); - } - - if (_main_subtitle) { - _main_subtitle->write_to_pkl (s); - } -} - -void -Reel::write_to_assetmap (ostream& s) const -{ - if (_main_picture) { - _main_picture->write_to_assetmap (s); - } - - if (_main_sound) { - _main_sound->write_to_assetmap (s); - } - - if (_main_subtitle) { - _main_subtitle->write_to_assetmap (s); - } -} - list Reel::equals (boost::shared_ptr other, EqualityOptions opt) const { diff --git a/src/reel.h b/src/reel.h index 2148e122..58caed31 100644 --- a/src/reel.h +++ b/src/reel.h @@ -53,8 +53,6 @@ public: } void write_to_cpl (std::ostream & s) const; - void write_to_pkl (std::ostream & s) const; - void write_to_assetmap (std::ostream & s) const; std::list equals (boost::shared_ptr other, EqualityOptions opt) const; diff --git a/src/util.cc b/src/util.cc index c171b2c7..4434b98c 100644 --- a/src/util.cc +++ b/src/util.cc @@ -127,7 +127,7 @@ libdcp::content_kind_from_string (string type) return FEATURE; } else if (type == "short") { return SHORT; - } else if (type == "trailer") { + } else if (type == "trailer" || type == "Trailer") { return TRAILER; } else if (type == "test") { return TEST; diff --git a/test/ref/DCP/9892e944-5046-4dbb-af7c-f50742f62fc2_cpl.xml b/test/ref/DCP/81fb54df-e1bf-4647-8788-ea7ba154375b_cpl.xml similarity index 79% rename from test/ref/DCP/9892e944-5046-4dbb-af7c-f50742f62fc2_cpl.xml rename to test/ref/DCP/81fb54df-e1bf-4647-8788-ea7ba154375b_cpl.xml index 1cd273fc..59d50075 100644 --- a/test/ref/DCP/9892e944-5046-4dbb-af7c-f50742f62fc2_cpl.xml +++ b/test/ref/DCP/81fb54df-e1bf-4647-8788-ea7ba154375b_cpl.xml @@ -1,14 +1,14 @@ - urn:uuid:9892e944-5046-4dbb-af7c-f50742f62fc2 + urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b A Test DCP 2012-07-17T04:45:18+00:00 OpenDCP 0.0.25 A Test DCP feature - urn:uri:9892e944-5046-4dbb-af7c-f50742f62fc2_2012-07-17T04:45:18+00:00 - 9892e944-5046-4dbb-af7c-f50742f62fc2_2012-07-17T04:45:18+00:00 + urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00 + 81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00 @@ -16,7 +16,7 @@ urn:uuid:379fa64c-ad71-46cf-bef7-b45624006610 - urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b + urn:uuid:d36f4bb3-c4fa-4a95-9915-6fec3110cd71 video.mxf 24 1 24 @@ -26,7 +26,7 @@ 32 32 - urn:uuid:67b9341e-cadd-4dac-9d5c-f5a1d59f2d06 + urn:uuid:c38bdd62-ce03-4988-8603-195f134207c7 audio.mxf 24 1 24 diff --git a/test/ref/DCP/ASSETMAP.xml b/test/ref/DCP/ASSETMAP.xml index b0168478..defe18da 100644 --- a/test/ref/DCP/ASSETMAP.xml +++ b/test/ref/DCP/ASSETMAP.xml @@ -19,10 +19,10 @@ - urn:uuid:9892e944-5046-4dbb-af7c-f50742f62fc2 + urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b - 9892e944-5046-4dbb-af7c-f50742f62fc2_cpl.xml + 81fb54df-e1bf-4647-8788-ea7ba154375b_cpl.xml 1 0 1526 @@ -30,24 +30,24 @@ - urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b + urn:uuid:c38bdd62-ce03-4988-8603-195f134207c7 - video.mxf + audio.mxf 1 0 - 26080 + 305326 - urn:uuid:67b9341e-cadd-4dac-9d5c-f5a1d59f2d06 + urn:uuid:d36f4bb3-c4fa-4a95-9915-6fec3110cd71 - audio.mxf + video.mxf 1 0 - 305326 + 26080 diff --git a/test/ref/DCP/audio.mxf b/test/ref/DCP/audio.mxf index 52f92d21813a354a8797a771c23a08c6c619eba9..9bc735afc03e7d041ef4982312865b584dbd0d96 100644 GIT binary patch delta 961 zcmZ2?QE1&op$$Q-lU3LR;;fk%IF`-iVHV(*VX$UpU}9vlW@lhw00L_c27y02)pq|( z^OtI8@d&tfJJimajX?q^#R$X#Q<`4XYU=v&t?WG}p|p+vr8P5yK>5Sp9_M&`HTQS) zSpPf0Xf^o&Yl;fGLK{v7f$m9r-X;Cx+NJWYjH@`qdP*9 z3E_y!!~4wlFLvPH!IQwt#dwj0jZfQzDVULwmk|V%8JZawJZ!ia1klx~GcqW!acP?X z6|pih@+$}feRR0{Zqhks&yF@`$#`KW_T%*K3xI)4f;q zx?s^?CoP3WxOrgIhvRk~xWzW)r_BhM5V{C%%Qsp%_e4q6Q z?pr0BZ>m#VUOF}`jyF4WM0^qFWJWH7$swEulNC651g?HF zzI-~*hoyC$x9&Kma|= zCV%BpFhP$nY=MQL(UW_U$(P0X8|uWIC#^d5ZbpolkhR8*ABqC+Tpg$0%f9h>?VH8! zj0^&cLN?oE>~_09N#M}4ZSLDAg98v($2Ql_uT_%fheiS)eYT2sS=| z4{ZG8|J-tuyScaoHuGh&sq=U)Si&IxJisr69U6E67~W`pz}NnOj}eHOfS7sv13ngm dnF2E=y>tn1^WD9^<}16?H~mA?6;`nH0RWU7RcrtN delta 921 zcmZ2?QE1&op$$Q-d5632CY@vU>}X?_j2CudKW@#$z_Dy553>Nj41+Z*0}~^YH9G?f z0}xnqFbFL9GCM9w-}Q6%^5k>!SNJNd*%%~%Qj9<>U?ii)F-gWTzB6Y*?#AFK4Qplw zf$m9r-X;CmJPEv9j2BrZ-(wG({EJOsvJR)*WLX|A z0haJDK1Nnvx4T}mY@F`Bs&{e?hlxOcQDnDxi_4y+1?_Q`X~)qIsW5eQjvqMM37jaIu;gp#Cfx}?3Jum;{$(#z4LpTK{ALi5(5OkL+uess-tVeL) zD#;$kc(92Wf{t7|0zM6OpenDCP 0.0.25 - urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b - video.mxf - VB9LCTmiD9OLlw4SvrEWUm5d67Q= - 26080 + urn:uuid:c38bdd62-ce03-4988-8603-195f134207c7 + audio.mxf + +qImGHkt/XouNaJ1V/+7BtcB4VU= + 305326 application/mxf - urn:uuid:67b9341e-cadd-4dac-9d5c-f5a1d59f2d06 - audio.mxf - HapNpn7MjiJLa1OHRI61Rx8N/is= - 305326 + urn:uuid:d36f4bb3-c4fa-4a95-9915-6fec3110cd71 + video.mxf + E2vhyxdJQhEzSQZdp31w84ZZpfk= + 26080 application/mxf - urn:uuid:9892e944-5046-4dbb-af7c-f50742f62fc2 - PbXuvpUOKccTLMxg/lEbaXvNCT4= + urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b + TTn7vvdUQi/G+KaW1Pym/DjxULM= 1526 text/xml diff --git a/test/ref/DCP/video.mxf b/test/ref/DCP/video.mxf index 70040fc3c3563b9cb645a0a76ced9e604e962102..645fb85affaaca1d273f5fff2b5f7abf10a850c5 100644 GIT binary patch delta 1066 zcmaEGn(@JD#tk-X0&a(2yNW(_zt+}rBSp^lsMus5HaQ2`(|Q^%|Gk(OOCQV-6P&%w znvFq%fq{V$hy`Buvd&G3cXnRP|Mr+{#Eu8n%s?^kE?)KT4qfZTDlXr5oHcRsDz+3A zbcHsY3<6p643`Bg@jKnt{41@(!<}og5&N_VblsAS3>rY2m_W8Y?YvgD#LlH;{?*=P z{o>p;=q{6FLb%L*#S6Q?@h-6o_sowxsxil8vI2*M3A&&j-kXp7@|rqRH2;mEz}dpdIUE`$=r+4x(Wu(}BxB)x=SQ=(GT5RPf6kqJf+I{} z`S+XR5%rFS>pr&~6J5a_(^gQG%E<0}Zkc!Lo9+9eI40Y1N(i7UnrzE!BH;V-$hLEt zF5f#VdbY&c+&w+Hk=J0d9hbpme{P=1dYp2Tx%s#R%1w*RyH z3X}7=^aU{NS<7W4F#G*BzD4b>QL9|C`m@ca3xJJm<^~&SG2__&*TfqJ)wXUWMW_e#U!f1=0JlP z#Xtt5$0oKgMvoj9CWa;kH-=1x9EQnGJo8PuC&z4D?&v8sQ}t-Mer?IS@E*xITJxOP zHWn#xiEe4T=+4L>@H<$r-!#=_U7yq5N}o7kQ-RDeBd} z2Zxs^A2_@O((5GUv~+yp_gCMZ9mlyKZSr4UiOD5=0?;VnpB%!cAb@WFb%*7Y8M$C%qxd1wpm0$3c)h5r;dF-`i!0CkGe-?AL^PnQgGNJu4!ZaL z|3_pB`PJPU&aZb;U7O2T)_strU^1J)L;-Zc&C3NEg9Xxen#i5H>$_%d%-4li=j*a< Jwn$mQ2mn+oeCz-K delta 992 zcmaEGn(@JD#tk-X0`jZ7H=JMZq`Eejv8?+bOTlCxHaUkG$M(NI?&S7p-}eVwRF9vO zv1VhCU|?Wi1Y!ZV!>?UMpSoXbYq^mk=X+Glnwdc$Yo6hlVn1;?4@@Xuljd~uJvLSm+w2ynmAd3L&5}IP@R!MfsISsgprYvm64HO zK^SOD_E4X7OH}V=_3LfOu5%7I^ zWZSt+m+zewJzHXJ?w+3fmseu)Elz{Ud0hGe<)%iB*Y>+6Zj_u^Gre5Pb@Ey+BZ0Pp zs#HdH-*d~nQ{Qag7sUZK8$(c^TSsN~`)z!S+Fheoxn%Wcn@<;DOCrUHk&|gaS#BiGc+aOQ?pJ0}Wvmv*BV8K#wVG;fEgZE=&wf3~mgW z3^@#wop|Oe$)48JaQW}Wyjc2RhM3^&W$AU2a#}h*@%yW9&yM3M{AxF+r}aVF3~M*7ePi&E&)n{0@&1W@9b+@?lX2Sdfj0; zWkxP)*gymL6CWsm19TJ)${w#5bv2ysuw!xMnSbX0|09y}<$UkWM}B!tohh3C#!%pF p;bb;}i2~??o0khT1`GTS7VI}oby?Tvw0F6?%c9qtEmBr60ss%kXLSGo diff --git a/test/ref/info.log b/test/ref/info.log index ba0c9991..fe961a32 100644 --- a/test/ref/info.log +++ b/test/ref/info.log @@ -1,49 +1,71 @@ DCP: ../libdcp-test/ASTERIX_TSR_F_FR-DE_51_2K_20120411_SE_2D - Length: 1439 - Frames per second: 24 -Reel 1 -Reel 2 - Subtitle: 30 subtitles in Custom + CPL: ASTERIX_TSR_F_FR-DE_51_2K_20120411_SE_2D + Length: 1439 + Frames per second: 24 + Reel 1 + Reel 2 + Subtitle: 30 subtitles in Custom DCP: ../libdcp-test/WRECK-IT-RALPH_TLR-A-3D_S_EN-DEFR_INT_51_2K_DI_20120620_TEU_i3D - Length: 3385 - Frames per second: 24 -Reel 1 + CPL: WRECK-IT-RALPH_TLR-A-3D_S_EN-DEFR_INT_51_2K_DI_20120620_TEU_i3D + Length: 3385 + Frames per second: 24 + Reel 1 DCP: ../libdcp-test/AVATAR-3D_TLR-H_F_EN-XX_INTL-TXTD_2K_51_TCF_20091022_DUK-i3D-ngb - Length: 4960 - Frames per second: 24 -Reel 1 + CPL: AVATAR-3D_TLR-H_F_EN-XX_INTL-TXTD_2K_51_TCF_20091022_DUK-i3D-ngb + Length: 4960 + Frames per second: 24 + Reel 1 DCP: ../libdcp-test/END-OF-TIME_TLR_F_XX-XX_CH_51_2K_LOK_20120726_DGL_OV - Length: 2865 - Frames per second: 24 -Reel 1 -Reel 2 + CPL: + Length: 2865 + Frames per second: 24 + Reel 1 + Reel 2 DCP: ../libdcp-test/THE-GUARD_TRL_F_EN-DE-FR_CH_51_2K_20110718_TIT - Length: 3201 - Frames per second: 24 -Reel 1 + CPL: THE-GUARD_TRL_F_EN-DE-FR_CH_51_2K_20110718_TIT + Length: 3201 + Frames per second: 24 + Reel 1 +DCP: ../libdcp-test/SANS-ISSUE_TLR_F_EN-FR_FR_51_2K_SND_20120316_ECL_OV + CPL: SANS-ISSUE_TLR_F_FR-XX_FR_51_2K_SND_20120316_ECL_OV + Length: 2972 + Frames per second: 24 + Reel 1 + Reel 2 + CPL: SANS-ISSUE_TLR_F_EN-FR_FR_51_2K_SND_20120316_ECL_OV + Length: 2972 + Frames per second: 24 + Reel 1 + Reel 2 + Subtitle: 49 subtitles in French DCP: ../libdcp-test/BARBARA_TLR_F_DE-FR_CH_51_2K_LOK_20120410_OV - Length: 2917 - Frames per second: 24 -Reel 1 - Subtitle: 31 subtitles in French + CPL: BARBARA_TLR_F_DE-FR_CH_51_2K_LOK_20120410_OV + Length: 2917 + Frames per second: 24 + Reel 1 + Subtitle: 31 subtitles in French DCP: ../libdcp-test/MACHINE-GUN-PREACH_TLR-1_F_EN-de-fr_CH_51_2K_TIT_20111107 - Length: 3513 - Frames per second: 24 -Reel 1 - Subtitle: 94 subtitles in English + CPL: MACHINE-GUN-PREACH_TLR-1_F_EN-de-fr_CH_51_2K_TIT_20111107 + Length: 3513 + Frames per second: 24 + Reel 1 + Subtitle: 94 subtitles in English DCP: ../libdcp-test/ASTERIX_TLR-01_F_FR-DE_CH_51_2K_FRE_20120730_DGL_OV - Length: 3080 - Frames per second: 24 -Reel 1 - Subtitle: 49 subtitles in French + CPL: + Length: 3080 + Frames per second: 24 + Reel 1 + Subtitle: 49 subtitles in French DCP: ../libdcp-test/EPIC-3D_TLR-D_S_EN-DE-FR_CH_51_48_ST_20120718_TIT_i3D-ngb_OV - Length: 3166 - Frames per second: 24 -Reel 1 - Subtitle: 32 subtitles in English + CPL: + Length: 3166 + Frames per second: 24 + Reel 1 + Subtitle: 32 subtitles in English DCP: ../libdcp-test/ELLES_TLR_C_FR-DE_20_2K_20120412_SE - Length: 2794 - Frames per second: 24 -Reel 1 -Reel 2 - Subtitle: 52 subtitles in Custom + CPL: ELLES_TLR_C_FR-DE_20_2K_20120412_SE + Length: 2794 + Frames per second: 24 + Reel 1 + Reel 2 + Subtitle: 52 subtitles in Custom diff --git a/test/tests.cc b/test/tests.cc index 43c95905..ce9dae75 100644 --- a/test/tests.cc +++ b/test/tests.cc @@ -63,7 +63,8 @@ BOOST_AUTO_TEST_CASE (dcp_test) t->issue_date = "2012-07-17T04:45:18+00:00"; filesystem::remove_all ("build/test/foo"); filesystem::create_directories ("build/test/foo"); - libdcp::DCP d ("build/test/foo", "A Test DCP", libdcp::FEATURE, 24, 24); + libdcp::DCP d ("build/test/foo"); + shared_ptr cpl (new libdcp::CPL ("build/test/foo", "A Test DCP", libdcp::FEATURE, 24, 24)); shared_ptr mp (new libdcp::MonoPictureAsset ( sigc::ptr_fun (&j2c), @@ -86,14 +87,15 @@ BOOST_AUTO_TEST_CASE (dcp_test) 2 )); - d.add_reel (shared_ptr (new libdcp::Reel (mp, ms, shared_ptr ()))); + cpl->add_reel (shared_ptr (new libdcp::Reel (mp, ms, shared_ptr ()))); + d.add_cpl (cpl); d.write_xml (); } BOOST_AUTO_TEST_CASE (error_test) { - libdcp::DCP d ("build/test/bar", "A Test DCP", libdcp::TEST, 24, 24); + libdcp::DCP d ("build/test/bar"); vector p; p.push_back ("frobozz"); @@ -104,11 +106,15 @@ BOOST_AUTO_TEST_CASE (error_test) BOOST_AUTO_TEST_CASE (read_dcp) { libdcp::DCP d ("test/ref/DCP"); + d.read (); - BOOST_CHECK_EQUAL (d.name(), "A Test DCP"); - BOOST_CHECK_EQUAL (d.content_kind(), libdcp::FEATURE); - BOOST_CHECK_EQUAL (d.frames_per_second(), 24); - BOOST_CHECK_EQUAL (d.length(), 24); + list > cpls = d.cpls (); + BOOST_CHECK_EQUAL (cpls.size(), 1); + + BOOST_CHECK_EQUAL (cpls.front()->name(), "A Test DCP"); + BOOST_CHECK_EQUAL (cpls.front()->content_kind(), libdcp::FEATURE); + BOOST_CHECK_EQUAL (cpls.front()->frames_per_second(), 24); + BOOST_CHECK_EQUAL (cpls.front()->length(), 24); } BOOST_AUTO_TEST_CASE (subtitles1) diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc index ba1fed0a..7d49d699 100644 --- a/tools/dcpinfo.cc +++ b/tools/dcpinfo.cc @@ -58,31 +58,39 @@ main (int argc, char* argv[]) DCP* dcp = 0; try { - dcp = new DCP (argv[optind], false); + dcp = new DCP (argv[optind]); + dcp->read (false); } catch (FileError& e) { cerr << "Could not read DCP " << argv[optind] << "; " << e.what() << " " << e.filename() << "\n"; exit (EXIT_FAILURE); } - cout << "DCP: " << argv[optind] << "\n" - << "\tLength: " << dcp->length() << "\n" - << "\tFrames per second: " << dcp->frames_per_second() << "\n"; + cout << "DCP: " << argv[optind] << "\n"; - list > reels = dcp->reels (); + list > cpls = dcp->cpls (); - int R = 1; - for (list >::const_iterator i = reels.begin(); i != reels.end(); ++i) { - cout << "Reel " << R << "\n"; - if ((*i)->main_picture()) { - cout << "\tPicture: " << (*i)->main_picture()->width() << "x" << (*i)->main_picture()->height() << "\n"; - } - if ((*i)->main_sound()) { - cout << "\tSound: " << (*i)->main_sound()->channels() << " channels at " << (*i)->main_sound()->sampling_rate() << "Hz\n"; - } - if ((*i)->main_subtitle()) { - cout << "\tSubtitle: " << (*i)->main_subtitle()->subtitles().size() << " subtitles in " << (*i)->main_subtitle()->language() << "\n"; + for (list >::iterator i = cpls.begin(); i != cpls.end(); ++i) { + cout << " CPL: " << (*i)->name() << "\n" + << " Length: " << (*i)->length() << "\n" + << " Frames per second: " << (*i)->frames_per_second() << "\n"; + + list > reels = (*i)->reels (); + + int R = 1; + for (list >::const_iterator j = reels.begin(); j != reels.end(); ++j) { + cout << " Reel " << R << "\n"; + + if ((*j)->main_picture()) { + cout << " Picture: " << (*j)->main_picture()->width() << "x" << (*j)->main_picture()->height() << "\n"; + } + if ((*j)->main_sound()) { + cout << " Sound: " << (*j)->main_sound()->channels() << " channels at " << (*j)->main_sound()->sampling_rate() << "Hz\n"; + } + if ((*j)->main_subtitle()) { + cout << " Subtitle: " << (*j)->main_subtitle()->subtitles().size() << " subtitles in " << (*j)->main_subtitle()->language() << "\n"; + } + ++R; } - ++R; } return 0; -- 2.30.2