/*
- Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-2017 Carl Hetherington <cth@carlh.net>
This file is part of libdcp.
#include "reel_stereo_picture_asset.h"
#include "reel_sound_asset.h"
#include "reel_subtitle_asset.h"
+#include "reel_markers_asset.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>
+#include <stdint.h>
+
+/* Centos 6 does not have this */
+#ifndef INT64_MAX
+#define INT64_MAX 0x7fffffffffffffff
+#endif
using std::string;
using std::list;
using std::cout;
-using std::max;
+using std::min;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using namespace dcp;
_main_subtitle.reset (new ReelSubtitleAsset (main_subtitle));
}
- shared_ptr<cxml::Node> atmos = asset_list->optional_node_child ("axd:AuxData");
+ shared_ptr<cxml::Node> main_markers = asset_list->optional_node_child ("MainMarkers");
+ if (main_markers) {
+ _main_markers.reset (new ReelMarkersAsset (main_markers));
+ }
+
+ /* 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));
}
reel->add_child("Id")->add_child_text ("urn:uuid:" + make_uuid());
xmlpp::Element* asset_list = reel->add_child ("AssetList");
+ if (_main_markers) {
+ _main_markers->write_to_cpl (asset_list, standard);
+ }
+
if (_main_picture && dynamic_pointer_cast<ReelMonoPictureAsset> (_main_picture)) {
/* Mono pictures come before other stuff... */
_main_picture->write_to_cpl (asset_list, standard);
_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 (_main_markers && !_main_markers->equals (other->_main_markers, opt, note)) {
+ 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 ())
);
}
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<ReelMarkersAsset> m = dynamic_pointer_cast<ReelMarkersAsset> (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 (m) {
+ _main_markers = m;
+ } else if (c) {
+ _closed_captions.push_back (c);
} else if (a) {
_atmos = a;
}
}
+list<shared_ptr<ReelAsset> >
+Reel::assets () const
+{
+ list<shared_ptr<ReelAsset> > a;
+ if (_main_picture) {
+ a.push_back (_main_picture);
+ }
+ if (_main_sound) {
+ a.push_back (_main_sound);
+ }
+ if (_main_subtitle) {
+ a.push_back (_main_subtitle);
+ }
+ std::copy (_closed_captions.begin(), _closed_captions.end(), back_inserter(a));
+ if (_atmos) {
+ a.push_back (_atmos);
+ }
+ return a;
+}
+
void
Reel::resolve_refs (list<shared_ptr<Asset> > assets)
{
_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);
+ }
}
}
int64_t
Reel::duration () const
{
- int64_t d = 0;
-
if (_main_picture) {
- d = max (d, _main_picture->duration ());
+ return _main_picture->actual_duration();
}
+
+ int64_t d = INT64_MAX;
+
if (_main_sound) {
- d = max (d, _main_sound->duration ());
+ d = min (d, _main_sound->actual_duration());
}
if (_main_subtitle) {
- d = max (d, _main_subtitle->duration ());
+ d = min (d, _main_subtitle->actual_duration());
+ }
+ if (_main_markers) {
+ d = min (d, _main_markers->actual_duration());
+ }
+ BOOST_FOREACH (shared_ptr<ReelClosedCaptionAsset> i, _closed_captions) {
+ d = min (d, i->actual_duration());
}
if (_atmos) {
- d = max (d, _atmos->duration ());
+ d = min (d, _atmos->actual_duration());
}
+ DCP_ASSERT (d < INT64_MAX);
+
return d;
}
projects / libdcp.git / blobdiff