X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Freel.cc;h=3c3c78925bc1681fa870a669d635dd100731a738;hb=660f1059c3b2c1ee08cd390cf6d5a0b5900a7edc;hp=b729695c33c58c54c048c78a14ca8632d581a090;hpb=8ae03cb54a9fdc2c6f77bacabc8e85fcdd8c0619;p=libdcp.git diff --git a/src/reel.cc b/src/reel.cc index b729695c..3c3c7892 100644 --- a/src/reel.cc +++ b/src/reel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2014-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,6 @@ */ -#include #include "reel.h" #include "util.h" #include "picture_asset.h" @@ -25,67 +24,103 @@ #include "stereo_picture_asset.h" #include "sound_asset.h" #include "subtitle_asset.h" -#include "kdm.h" +#include "reel_mono_picture_asset.h" +#include "reel_stereo_picture_asset.h" +#include "reel_sound_asset.h" +#include "reel_subtitle_asset.h" +#include "decrypted_kdm_key.h" +#include "decrypted_kdm.h" +#include "interop_subtitle_asset.h" +#include using std::string; using std::list; using std::cout; using boost::shared_ptr; using boost::dynamic_pointer_cast; -using namespace libdcp; +using namespace dcp; + +Reel::Reel (boost::shared_ptr node) + : Object (node->string_child ("Id")) +{ + shared_ptr asset_list = node->node_child ("AssetList"); + + shared_ptr main_picture = asset_list->optional_node_child ("MainPicture"); + if (main_picture) { + _main_picture.reset (new ReelMonoPictureAsset (main_picture)); + } + + shared_ptr main_stereoscopic_picture = asset_list->optional_node_child ("MainStereoscopicPicture"); + if (main_stereoscopic_picture) { + _main_picture.reset (new ReelStereoPictureAsset (main_stereoscopic_picture)); + } + + shared_ptr main_sound = asset_list->optional_node_child ("MainSound"); + if (main_sound) { + _main_sound.reset (new ReelSoundAsset (main_sound)); + } + + shared_ptr main_subtitle = asset_list->optional_node_child ("MainSubtitle"); + if (main_subtitle) { + _main_subtitle.reset (new ReelSubtitleAsset (main_subtitle)); + } + + node->ignore_child ("AnnotationText"); + node->done (); +} void -Reel::write_to_cpl (xmlpp::Element* node, bool interop) const +Reel::write_to_cpl (xmlpp::Element* node, Standard standard) const { xmlpp::Element* reel = node->add_child ("Reel"); 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, interop); + _main_picture->write_to_cpl (asset_list, standard); } if (_main_sound) { - _main_sound->write_to_cpl (asset_list, interop); + _main_sound->write_to_cpl (asset_list, standard); } if (_main_subtitle) { - _main_subtitle->write_to_cpl (asset_list, interop); + _main_subtitle->write_to_cpl (asset_list, standard); } - 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, interop); + _main_picture->write_to_cpl (asset_list, standard); } } - + bool -Reel::equals (boost::shared_ptr other, EqualityOptions opt, boost::function note) const +Reel::equals (boost::shared_ptr other, EqualityOptions opt, NoteHandler note) const { if ((_main_picture && !other->_main_picture) || (!_main_picture && other->_main_picture)) { - note (ERROR, "reel has different assets"); + note (DCP_ERROR, "Reel: assets differ"); return false; } - + if (_main_picture && !_main_picture->equals (other->_main_picture, opt, note)) { return false; } if ((_main_sound && !other->_main_sound) || (!_main_sound && other->_main_sound)) { - note (ERROR, "reel has different assets"); + note (DCP_ERROR, "Reel: assets differ"); return false; } - + if (_main_sound && !_main_sound->equals (other->_main_sound, opt, note)) { return false; } if ((_main_subtitle && !other->_main_subtitle) || (!_main_subtitle && other->_main_subtitle)) { - note (ERROR, "reel has different assets"); + note (DCP_ERROR, "Reel: assets differ"); return false; } - + if (_main_subtitle && !_main_subtitle->equals (other->_main_subtitle, opt, note)) { return false; } @@ -100,27 +135,53 @@ Reel::encrypted () const } void -Reel::add_kdm (KDM const & kdm) +Reel::add (DecryptedKDM const & kdm) { - list keys = kdm.keys (); - - for (list::iterator i = keys.begin(); i != keys.end(); ++i) { - if (i->key_id() == _main_picture->key_id()) { - _main_picture->set_key (i->key ()); + list keys = kdm.keys (); + + for (list::iterator i = keys.begin(); i != keys.end(); ++i) { + if (i->id() == _main_picture->key_id()) { + _main_picture->asset()->set_key (i->key ()); } - if (i->key_id() == _main_sound->key_id()) { - _main_sound->set_key (i->key ()); + if (i->id() == _main_sound->key_id()) { + _main_sound->asset()->set_key (i->key ()); } } } void -Reel::set_mxf_keys (Key key) +Reel::add (shared_ptr asset) { - _main_picture->set_key (key); + shared_ptr p = dynamic_pointer_cast (asset); + shared_ptr so = dynamic_pointer_cast (asset); + shared_ptr su = dynamic_pointer_cast (asset); + if (p) { + _main_picture = p; + } else if (so) { + _main_sound = so; + } else if (su) { + _main_subtitle = su; + } +} + +void +Reel::resolve_refs (list > objects) +{ + if (_main_picture) { + _main_picture->asset_ref().resolve (objects); + } + if (_main_sound) { - _main_sound->set_key (key); + _main_sound->asset_ref().resolve (objects); } - /* XXX: subtitle asset? */ + if (_main_subtitle) { + _main_subtitle->asset_ref().resolve (objects); + + /* Interop subtitle handling is all special cases */ + shared_ptr iop = dynamic_pointer_cast (_main_subtitle->asset_ref().object ()); + if (iop) { + iop->resolve_fonts (objects); + } + } }