X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fdcp.cc;h=8de1ddd9dbbeaf2fbe3278a74779a44c702be8f4;hb=5c29a3586ea262abcc8829bf267d38d8a5a84d9b;hp=907f7dd5105fcb34d31278bf9000d8345dd687a3;hpb=403c1e43d7e12af9ae72291f4bdff78fd242f9f6;p=libdcp.git 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; } -