/*
- Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-2017 Carl Hetherington <cth@carlh.net>
This file is part of libdcp.
You should have received a copy of the GNU General Public License
along with libdcp. If not, see <http://www.gnu.org/licenses/>.
+
+ In addition, as a special exception, the copyright holders give
+ permission to link the code of portions of this program with the
+ OpenSSL library under certain conditions as described in each
+ individual source file, and distribute linked combinations
+ including the two.
+
+ You must obey the GNU General Public License in all respects
+ for all of the code used other than OpenSSL. If you modify
+ file(s) with this exception, you may extend this exception to your
+ version of the file(s), but you are not obligated to do so. If you
+ do not wish to do so, delete this exception statement from your
+ version. If you delete this exception statement from all source
+ files in the program, then also delete it here.
*/
#include "reel.h"
#include "decrypted_kdm_key.h"
#include "decrypted_kdm.h"
#include "interop_subtitle_asset.h"
+#include "smpte_subtitle_asset.h"
#include "reel_atmos_asset.h"
+#include "reel_closed_caption_asset.h"
#include <libxml++/nodes/element.h>
+#include <boost/foreach.hpp>
using std::string;
using std::list;
_main_subtitle.reset (new ReelSubtitleAsset (main_subtitle));
}
- shared_ptr<cxml::Node> atmos = asset_list->optional_node_child ("axd:AuxData");
+ /* XXX: it's not ideal that we silently tolerate Interop or SMPTE nodes here */
+ /* XXX: not sure if Interop supports multiple closed captions */
+ list<shared_ptr<cxml::Node> > closed_captions = asset_list->node_children ("MainClosedCaption");
+ if (closed_captions.empty()) {
+ closed_captions = asset_list->node_children ("ClosedCaption");
+ }
+ BOOST_FOREACH (shared_ptr<cxml::Node> i, closed_captions) {
+ _closed_captions.push_back (shared_ptr<ReelClosedCaptionAsset>(new ReelClosedCaptionAsset(i)));
+ }
+
+ shared_ptr<cxml::Node> atmos = asset_list->optional_node_child ("AuxData");
if (atmos) {
_atmos.reset (new ReelAtmosAsset (atmos));
}
_main_subtitle->write_to_cpl (asset_list, standard);
}
+ BOOST_FOREACH (shared_ptr<ReelClosedCaptionAsset> i, _closed_captions) {
+ i->write_to_cpl (asset_list, standard);
+ }
+
if (_main_picture && dynamic_pointer_cast<ReelStereoPictureAsset> (_main_picture)) {
/* ... but stereo pictures must come after */
_main_picture->write_to_cpl (asset_list, standard);
Reel::equals (boost::shared_ptr<const Reel> other, EqualityOptions opt, NoteHandler note) const
{
if ((_main_picture && !other->_main_picture) || (!_main_picture && other->_main_picture)) {
- note (DCP_ERROR, "Reel: assets differ");
+ note (DCP_ERROR, "Reel: picture assets differ");
return false;
}
}
if ((_main_sound && !other->_main_sound) || (!_main_sound && other->_main_sound)) {
- note (DCP_ERROR, "Reel: assets differ");
+ note (DCP_ERROR, "Reel: sound assets differ");
return false;
}
}
if ((_main_subtitle && !other->_main_subtitle) || (!_main_subtitle && other->_main_subtitle)) {
- note (DCP_ERROR, "Reel: assets differ");
+ note (DCP_ERROR, "Reel: subtitle assets differ");
return false;
}
return false;
}
+ if (_closed_captions.size() != other->_closed_captions.size()) {
+ return false;
+ }
+
+ list<shared_ptr<ReelClosedCaptionAsset> >::const_iterator i = _closed_captions.begin();
+ list<shared_ptr<ReelClosedCaptionAsset> >::const_iterator j = other->_closed_captions.begin();
+ while (i != _closed_captions.end()) {
+ if (!(*i)->equals(*j, opt, note)) {
+ return false;
+ }
+ ++i;
+ ++j;
+ }
+
if ((_atmos && !other->_atmos) || (!_atmos && other->_atmos)) {
- note (DCP_ERROR, "Reel: assets differ");
+ note (DCP_ERROR, "Reel: atmos assets differ");
return false;
}
bool
Reel::encrypted () const
{
+ bool ecc = false;
+ BOOST_FOREACH (shared_ptr<ReelClosedCaptionAsset> i, _closed_captions) {
+ if (i->encrypted()) {
+ ecc = true;
+ }
+ }
+
return (
(_main_picture && _main_picture->encrypted ()) ||
(_main_sound && _main_sound->encrypted ()) ||
+ (_main_subtitle && _main_subtitle->encrypted ()) ||
+ ecc ||
(_atmos && _atmos->encrypted ())
);
}
if (_main_sound && i->id() == _main_sound->key_id()) {
_main_sound->asset()->set_key (i->key ());
}
+ if (_main_subtitle && i->id() == _main_subtitle->key_id()) {
+ shared_ptr<SMPTESubtitleAsset> s = dynamic_pointer_cast<SMPTESubtitleAsset> (_main_subtitle->asset());
+ if (s) {
+ s->set_key (i->key ());
+ }
+ }
+ BOOST_FOREACH (shared_ptr<ReelClosedCaptionAsset> j, _closed_captions) {
+ if (i->id() == j->key_id()) {
+ shared_ptr<SMPTESubtitleAsset> s = dynamic_pointer_cast<SMPTESubtitleAsset> (j->asset());
+ if (s) {
+ s->set_key (i->key ());
+ }
+ }
+ }
if (_atmos && i->id() == _atmos->key_id()) {
_atmos->asset()->set_key (i->key ());
}
shared_ptr<ReelPictureAsset> p = dynamic_pointer_cast<ReelPictureAsset> (asset);
shared_ptr<ReelSoundAsset> so = dynamic_pointer_cast<ReelSoundAsset> (asset);
shared_ptr<ReelSubtitleAsset> su = dynamic_pointer_cast<ReelSubtitleAsset> (asset);
+ shared_ptr<ReelClosedCaptionAsset> c = dynamic_pointer_cast<ReelClosedCaptionAsset> (asset);
shared_ptr<ReelAtmosAsset> a = dynamic_pointer_cast<ReelAtmosAsset> (asset);
if (p) {
_main_picture = p;
_main_sound = so;
} else if (su) {
_main_subtitle = su;
+ } else if (c) {
+ _closed_captions.push_back (c);
} else if (a) {
_atmos = a;
}
_main_subtitle->asset_ref().resolve (assets);
/* Interop subtitle handling is all special cases */
- shared_ptr<InteropSubtitleAsset> iop = dynamic_pointer_cast<InteropSubtitleAsset> (_main_subtitle->asset_ref().asset ());
- if (iop) {
- iop->resolve_fonts (assets);
+ if (_main_subtitle->asset_ref().resolved()) {
+ shared_ptr<InteropSubtitleAsset> iop = dynamic_pointer_cast<InteropSubtitleAsset> (_main_subtitle->asset_ref().asset());
+ if (iop) {
+ iop->resolve_fonts (assets);
+ }
+ }
+ }
+
+ BOOST_FOREACH (shared_ptr<ReelClosedCaptionAsset> i, _closed_captions) {
+ i->asset_ref().resolve(assets);
+
+ /* Interop subtitle handling is all special cases */
+ if (i->asset_ref().resolved()) {
+ shared_ptr<InteropSubtitleAsset> iop = dynamic_pointer_cast<InteropSubtitleAsset> (i->asset_ref().asset());
+ if (iop) {
+ iop->resolve_fonts (assets);
+ }
}
}
if (_main_subtitle) {
d = max (d, _main_subtitle->duration ());
}
+ BOOST_FOREACH (shared_ptr<ReelClosedCaptionAsset> i, _closed_captions) {
+ d = max (d, i->duration());
+ }
if (_atmos) {
d = max (d, _atmos->duration ());
}
projects / libdcp.git / blobdiff