X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fdcp.cc;h=c7634b5d3385d1a9cafd5b847dffd41dd4540d66;hb=27e74ac5cf717233914fd017eb9ca67ee7c4af96;hp=b478f18d1d6aca2e5c56b39c201aed147117d2c3;hpb=830d8e01713add5856f44a5246eb65781458d0b8;p=libdcp.git diff --git a/src/dcp.cc b/src/dcp.cc index b478f18d..c7634b5d 100644 --- a/src/dcp.cc +++ b/src/dcp.cc @@ -27,418 +27,270 @@ #include #include #include +#include +#include #include #include "dcp.h" #include "asset.h" #include "sound_asset.h" #include "picture_asset.h" +#include "subtitle_asset.h" #include "util.h" #include "metadata.h" #include "exceptions.h" +#include "parse/pkl.h" +#include "parse/asset_map.h" +#include "reel.h" #include "cpl.h" -#include "pkl.h" -#include "asset_map.h" -using namespace std; -using namespace boost; +using std::string; +using std::list; +using std::stringstream; +using std::ofstream; +using std::ostream; +using boost::shared_ptr; +using boost::lexical_cast; 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) -{ - -} - -void -DCP::add_sound_asset (vector const & files) -{ - _assets.push_back (shared_ptr (new SoundAsset (files, _directory, "audio.mxf", &Progress, _fps, _length))); -} - -void -DCP::add_sound_asset (sigc::slot get_path, int channels) -{ - _assets.push_back (shared_ptr (new SoundAsset (get_path, _directory, "audio.mxf", &Progress, _fps, _length, channels))); -} - -void -DCP::add_picture_asset (vector const & files, int width, int height) -{ - _assets.push_back (shared_ptr (new PictureAsset (files, _directory, "video.mxf", &Progress, _fps, _length, width, height))); -} - -void -DCP::add_picture_asset (sigc::slot get_path, int width, int height) { - _assets.push_back (shared_ptr (new PictureAsset (get_path, _directory, "video.mxf", &Progress, _fps, _length, width, height))); + boost::filesystem::create_directories (directory); } void -DCP::write_xml () const +DCP::write_xml (XMLMetadata const & metadata) 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 (metadata); + } 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, metadata); write_volindex (); - write_assetmap (cpl_uuid, cpl_length, pkl_uuid, filesystem::file_size (pkl_path)); + write_assetmap (pkl_uuid, boost::filesystem::file_size (pkl_path), metadata); } -string -DCP::write_cpl (string cpl_uuid) const +std::string +DCP::write_pkl (string pkl_uuid, XMLMetadata const & metadata) const { - filesystem::path p; + assert (!_cpls.empty ()); + + boost::filesystem::path p; p /= _directory; stringstream s; - s << cpl_uuid << "_cpl.xml"; + s << pkl_uuid << "_pkl.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"; - - cpl << " \n" - << " urn:uuid:" << make_uuid() << "\n" - << " \n"; - - for (list >::const_iterator i = _assets.begin(); i != _assets.end(); ++i) { - (*i)->write_to_cpl (cpl); - } - cpl << " \n" - << " \n" - << " \n" - << "\n"; + xmlpp::Document doc; + xmlpp::Element* root = doc.create_root_node ("PackingList", "http://www.smpte-ra.org/schemas/429-8/2007/PKL"); - return p.string (); -} + root->add_child("Id")->add_child_text ("urn:uuid:" + pkl_uuid); + /* XXX: this is a bit of a hack */ + root->add_child("AnnotationText")->add_child_text (_cpls.front()->name()); + root->add_child("IssueDate")->add_child_text (metadata.issue_date); + root->add_child("Issuer")->add_child_text (metadata.issuer); + root->add_child("Creator")->add_child_text (metadata.creator); -std::string -DCP::write_pkl (string pkl_uuid, string cpl_uuid, string cpl_digest, int cpl_length) const -{ - filesystem::path p; - p /= _directory; - stringstream s; - s << pkl_uuid << "_pkl.xml"; - p /= s.str(); - ofstream pkl (p.string().c_str()); - - pkl << "\n" - << "\n" - << " urn:uuid:" << pkl_uuid << "\n" - << " " << _name << "\n" - << " " << Metadata::instance()->issue_date << "\n" - << " " << Metadata::instance()->issuer << "\n" - << " " << Metadata::instance()->creator << "\n" - << " \n"; - - for (list >::const_iterator i = _assets.begin(); i != _assets.end(); ++i) { - (*i)->write_to_pkl (pkl); - } + xmlpp::Node* asset_list = root->add_child ("AssetList"); - pkl << " \n" - << " urn:uuid:" << cpl_uuid << "\n" - << " " << cpl_digest << "\n" - << " " << cpl_length << "\n" - << " text/xml\n" - << " \n"; + list > a = assets (); + for (list >::const_iterator i = a.begin(); i != a.end(); ++i) { + (*i)->write_to_pkl (asset_list); + } - pkl << " \n" - << "\n"; + for (list >::const_iterator i = _cpls.begin(); i != _cpls.end(); ++i) { + (*i)->write_to_pkl (asset_list); + } + doc.write_to_file_formatted (p.string (), "UTF-8"); return p.string (); } void DCP::write_volindex () const { - filesystem::path p; + boost::filesystem::path p; p /= _directory; p /= "VOLINDEX.xml"; - ofstream vi (p.string().c_str()); - vi << "\n" - << "\n" - << " 1\n" - << "\n"; + xmlpp::Document doc; + xmlpp::Element* root = doc.create_root_node ("VolumeIndex", "http://www.smpte-ra.org/schemas/429-9/2007/AM"); + root->add_child("Index")->add_child_text ("1"); + doc.write_to_file_formatted (p.string (), "UTF-8"); } 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, XMLMetadata const & metadata) const { - filesystem::path p; + boost::filesystem::path p; p /= _directory; p /= "ASSETMAP.xml"; - ofstream am (p.string().c_str()); - - am << "\n" - << "\n" - << " urn:uuid:" << make_uuid() << "\n" - << " " << Metadata::instance()->creator << "\n" - << " 1\n" - << " " << Metadata::instance()->issue_date << "\n" - << " " << Metadata::instance()->issuer << "\n" - << " \n"; - - am << " \n" - << " urn:uuid:" << pkl_uuid << "\n" - << " true\n" - << " \n" - << " \n" - << " " << pkl_uuid << "_pkl.xml\n" - << " 1\n" - << " 0\n" - << " " << pkl_length << "\n" - << " \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"; + + xmlpp::Document doc; + xmlpp::Element* root = doc.create_root_node ("AssetMap", "http://www.smpte-ra.org/schemas/429-9/2007/AM"); + + root->add_child("Id")->add_child_text ("urn:uuid:" + make_uuid()); + root->add_child("Creator")->add_child_text (metadata.creator); + root->add_child("VolumeCount")->add_child_text ("1"); + root->add_child("IssueDate")->add_child_text (metadata.issue_date); + root->add_child("Issuer")->add_child_text (metadata.issuer); + xmlpp::Node* asset_list = root->add_child ("AssetList"); + + xmlpp::Node* asset = asset_list->add_child ("Asset"); + asset->add_child("Id")->add_child_text ("urn:uuid:" + pkl_uuid); + asset->add_child("PackingList")->add_child_text ("true"); + xmlpp::Node* chunk_list = asset->add_child ("ChunkList"); + xmlpp::Node* chunk = chunk_list->add_child ("Chunk"); + chunk->add_child("Path")->add_child_text (pkl_uuid + "_pkl.xml"); + chunk->add_child("VolumeIndex")->add_child_text ("1"); + chunk->add_child("Offset")->add_child_text ("0"); + chunk->add_child("Length")->add_child_text (lexical_cast (pkl_length)); - for (list >::const_iterator i = _assets.begin(); i != _assets.end(); ++i) { - (*i)->write_to_assetmap (am); + for (list >::const_iterator i = _cpls.begin(); i != _cpls.end(); ++i) { + (*i)->write_to_assetmap (asset_list); } - am << " \n" - << "\n"; + list > a = assets (); + for (list >::const_iterator i = a.begin(); i != a.end(); ++i) { + (*i)->write_to_assetmap (asset_list); + } + + doc.write_to_file_formatted (p.string (), "UTF-8"); } -DCP::DCP (string directory) - : _directory (directory) +void +DCP::read (bool require_mxfs) { Files files; - scan (files, directory); - - if (files.cpl.empty ()) { - throw FileError ("no CPL file found", ""); - } - - if (files.pkl.empty ()) { - throw FileError ("no PKL file found", ""); - } - - if (files.asset_map.empty ()) { - throw FileError ("no AssetMap file found", ""); - } - /* Read the XML */ - shared_ptr cpl; + shared_ptr asset_map; try { - cpl.reset (new CPL (files.cpl)); - } catch (FileError& e) { - throw FileError ("could not load CPL file", files.cpl); - } - - shared_ptr pkl; - try { - pkl.reset (new PKL (files.pkl)); - } catch (FileError& e) { - throw FileError ("could not load PKL file", files.pkl); - } - - shared_ptr asset_map; - try { - asset_map.reset (new AssetMap (files.asset_map)); + boost::filesystem::path p = _directory; + p /= "ASSETMAP"; + if (boost::filesystem::exists (p)) { + asset_map.reset (new libdcp::parse::AssetMap (p.string ())); + } else { + p = _directory; + p /= "ASSETMAP.xml"; + if (boost::filesystem::exists (p)) { + asset_map.reset (new libdcp::parse::AssetMap (p.string ())); + } else { + boost::throw_exception (DCPReadError ("could not find AssetMap file")); + } + } + } catch (FileError& e) { - throw FileError ("could not load AssetMap file", files.asset_map); - } - - /* Cross-check */ - /* XXX */ - - /* Now cherry-pick the required bits into our own data structure */ - - _name = cpl->annotation_text; - _content_kind = cpl->content_kind; - - shared_ptr cpl_assets = cpl->reels.front()->asset_list; - - /* XXX */ - _fps = cpl_assets->main_picture->frame_rate.numerator; - _length = cpl_assets->main_picture->duration; - - string n = pkl->asset_from_id(cpl_assets->main_picture->id)->original_file_name; - if (n.empty ()) { - n = cpl_assets->main_picture->annotation_text; + boost::throw_exception (FileError ("could not load AssetMap file", files.asset_map)); } - _assets.push_back (shared_ptr ( - new PictureAsset ( - _directory, - n, - _fps, - _length - ) - )); - - if (cpl_assets->main_sound) { - - n = pkl->asset_from_id(cpl_assets->main_sound->id)->original_file_name; - if (n.empty ()) { - n = cpl_assets->main_sound->annotation_text; + for (list >::const_iterator i = asset_map->assets.begin(); i != asset_map->assets.end(); ++i) { + if ((*i)->chunks.size() != 1) { + boost::throw_exception (XMLError ("unsupported asset chunk count")); } - - _assets.push_back (shared_ptr ( - new SoundAsset ( - _directory, - n, - _fps, - _length - ) - )); - } -} - -void -DCP::scan (Files& files, string directory) const -{ - for (filesystem::directory_iterator i = filesystem::directory_iterator(directory); i != filesystem::directory_iterator(); ++i) { + boost::filesystem::path t = _directory; + t /= (*i)->chunks.front()->path; - string const t = i->path().string (); - - if (filesystem::is_directory (*i)) { - scan (files, t); - continue; - } - - if (ends_with (t, ".mxf") || ends_with (t, ".ttf")) { + if (boost::algorithm::ends_with (t.string(), ".mxf") || boost::algorithm::ends_with (t.string(), ".ttf")) { continue; } xmlpp::DomParser* p = new xmlpp::DomParser; - try { - p->parse_file (t); + p->parse_file (t.string()); } catch (std::exception& e) { delete p; continue; } - - if (!p) { - delete p; - continue; - } string const root = p->get_document()->get_root_node()->get_name (); delete p; - + if (root == "CompositionPlaylist") { - if (files.cpl.empty ()) { - files.cpl = t; - } else { - throw DCPReadError ("duplicate CPLs found"); - } + files.cpls.push_back (t.string()); } else if (root == "PackingList") { if (files.pkl.empty ()) { - files.pkl = t; - } else { - throw DCPReadError ("duplicate PKLs found"); - } - } else if (root == "AssetMap") { - if (files.asset_map.empty ()) { - files.asset_map = t; + files.pkl = t.string(); } else { - throw DCPReadError ("duplicate AssetMaps found"); + boost::throw_exception (DCPReadError ("duplicate PKLs found")); } - files.asset_map = t; - } else if (root == "DCSubtitle") { - files.subtitles.push_back (t); } } -} - - -list -DCP::equals (DCP const & other, EqualityOptions opt) const -{ - list notes; - if (opt.flags & LIBDCP_METADATA) { - if (_name != other._name) { - notes.push_back ("names differ"); - } - if (_content_kind != other._content_kind) { - notes.push_back ("content kinds differ"); - } - if (_fps != other._fps) { - notes.push_back ("frames per second differ"); - } - if (_length != other._length) { - notes.push_back ("lengths differ"); - } + if (files.cpls.empty ()) { + boost::throw_exception (FileError ("no CPL files found", "")); } - if (_assets.size() != other._assets.size()) { - notes.push_back ("asset counts differ"); + if (files.pkl.empty ()) { + boost::throw_exception (FileError ("no PKL file found", "")); } - - list >::const_iterator a = _assets.begin (); - list >::const_iterator b = other._assets.begin (); - - while (a != _assets.end ()) { - list n = (*a)->equals (*b, opt); - notes.merge (n); - ++a; - ++b; + + shared_ptr pkl; + try { + pkl.reset (new parse::PKL (files.pkl)); + } catch (FileError& e) { + boost::throw_exception (FileError ("could not load PKL file", files.pkl)); } - return notes; + /* 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))); + } } -shared_ptr -DCP::picture_asset () const +bool +DCP::equals (DCP const & other, EqualityOptions opt, boost::function note) const { - for (list >::const_iterator i = _assets.begin(); i != _assets.end(); ++i) { - shared_ptr p = dynamic_pointer_cast (*i); - if (p) { - return p; + if (_cpls.size() != other._cpls.size()) { + note (ERROR, "CPL counts differ"); + return false; + } + + list >::const_iterator a = _cpls.begin (); + list >::const_iterator b = other._cpls.begin (); + + while (a != _cpls.end ()) { + if (!(*a)->equals (*b->get(), opt, note)) { + return false; } + ++a; + ++b; } - return shared_ptr (); + return true; +} + + +void +DCP::add_cpl (shared_ptr cpl) +{ + _cpls.push_back (cpl); } -shared_ptr -DCP::sound_asset () const +class AssetComparator { - for (list >::const_iterator i = _assets.begin(); i != _assets.end(); ++i) { - shared_ptr s = dynamic_pointer_cast (*i); - if (s) { - return s; - } +public: + bool operator() (shared_ptr a, shared_ptr b) { + return a->uuid() < b->uuid(); } +}; - return shared_ptr (); +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; } +