using boost::dynamic_pointer_cast;
using dcp::raw_convert;
-int const DCPContentProperty::CAN_BE_PLAYED = 600;
-int const DCPContentProperty::REFERENCE_VIDEO = 601;
-int const DCPContentProperty::REFERENCE_AUDIO = 602;
-int const DCPContentProperty::REFERENCE_SUBTITLE = 603;
+int const DCPContentProperty::NEEDS_ASSETS = 600;
+int const DCPContentProperty::NEEDS_KDM = 601;
+int const DCPContentProperty::REFERENCE_VIDEO = 602;
+int const DCPContentProperty::REFERENCE_AUDIO = 603;
+int const DCPContentProperty::REFERENCE_SUBTITLE = 604;
+int const DCPContentProperty::NAME = 605;
DCPContent::DCPContent (shared_ptr<const Film> film, boost::filesystem::path p)
: Content (film)
}
_three_d = node->optional_bool_child("ThreeD").get_value_or (false);
_cpl = node->optional_string_child("CPL");
+ BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children("ReelLength")) {
+ _reel_lengths.push_back (raw_convert<int64_t> (i->content ()));
+ }
}
void
void
DCPContent::examine (shared_ptr<Job> job)
{
- bool const could_be_played = can_be_played ();
+ bool const needed_assets = needs_assets ();
+ bool const needed_kdm = needs_kdm ();
+ string const old_name = name ();
job->set_progress_unknown ();
Content::examine (job);
_standard = examiner->standard ();
_three_d = examiner->three_d ();
_cpl = examiner->cpl ();
+ _reel_lengths = examiner->reel_lengths ();
+ }
+
+ if (needed_assets != needs_assets ()) {
+ signal_changed (DCPContentProperty::NEEDS_ASSETS);
+ }
+
+ if (needed_kdm != needs_kdm ()) {
+ signal_changed (DCPContentProperty::NEEDS_KDM);
}
- if (could_be_played != can_be_played ()) {
- signal_changed (DCPContentProperty::CAN_BE_PLAYED);
+ if (old_name != name ()) {
+ signal_changed (DCPContentProperty::NAME);
}
video->set_frame_type (_three_d ? VIDEO_FRAME_TYPE_3D : VIDEO_FRAME_TYPE_2D);
if (_cpl) {
node->add_child("CPL")->add_child_text (_cpl.get ());
}
+ BOOST_FOREACH (int64_t i, _reel_lengths) {
+ node->add_child("ReelLength")->add_child_text (raw_convert<string> (i));
+ }
}
DCPTime
list<DCPTimePeriod>
DCPContent::reels () const
{
- list<DCPTimePeriod> p;
- scoped_ptr<DCPDecoder> decoder;
- try {
- decoder.reset (new DCPDecoder (shared_from_this(), film()->log()));
- } catch (...) {
- /* Could not load the DCP; guess reels */
- list<DCPTimePeriod> p;
- p.push_back (DCPTimePeriod (position(), end()));
- return p;
+ list<int64_t> reel_lengths = _reel_lengths;
+ if (reel_lengths.empty ()) {
+ /* Old metadata with no reel lengths; get them here instead */
+ try {
+ scoped_ptr<DCPExaminer> examiner (new DCPExaminer (shared_from_this()));
+ reel_lengths = examiner->reel_lengths ();
+ } catch (...) {
+ /* Could not examine the DCP; guess reels */
+ reel_lengths.push_back (length_after_trim().frames_round (film()->video_frame_rate ()));
+ }
}
+ list<DCPTimePeriod> p;
+
/* This content's frame rate must be the same as the output DCP rate, so we can
convert `directly' from ContentTime to DCPTime.
*/
/* The starting point of this content on the timeline */
DCPTime pos = position() - DCPTime (trim_start().get());
- BOOST_FOREACH (shared_ptr<dcp::Reel> i, decoder->reels ()) {
+ BOOST_FOREACH (int64_t i, reel_lengths) {
/* This reel runs from `pos' to `to' */
- DCPTime const to = pos + DCPTime::from_frames (i->main_picture()->duration(), film()->video_frame_rate());
+ DCPTime const to = pos + DCPTime::from_frames (i, film()->video_frame_rate());
if (to > position()) {
p.push_back (DCPTimePeriod (max(position(), pos), min(end(), to)));
if (to > end()) {
list<DCPTimePeriod> const fr = film()->reels ();
+ list<DCPTimePeriod> reel_list;
+ try {
+ reel_list = reels ();
+ } catch (dcp::DCPReadError) {
+ /* We couldn't read the DCP; it's probably missing */
+ return false;
+ }
+
/* fr must contain reels(). It can also contain other reels, but it must at
least contain reels().
*/
- BOOST_FOREACH (DCPTimePeriod i, reels()) {
+ BOOST_FOREACH (DCPTimePeriod i, reel_list) {
if (find (fr.begin(), fr.end(), i) == fr.end ()) {
why_not.push_back (_("The reel lengths in the film differ from those in the DCP; set the reel mode to 'split by video content'."));
return false;
bool
DCPContent::can_reference_video (list<string>& why_not) const
{
+ if (film()->frame_size() != video->size()) {
+ why_not.push_back (_("The video frame size in the film differs from that in the DCP."));
+ return false;
+ }
+
return can_reference (bind (&Content::video, _1), _("There is other video content overlapping this DCP; remove it."), why_not);
}
bool
DCPContent::can_reference_audio (list<string>& why_not) const
{
- DCPDecoder decoder (shared_from_this(), film()->log());
- BOOST_FOREACH (shared_ptr<dcp::Reel> i, decoder.reels()) {
+ shared_ptr<DCPDecoder> decoder;
+ try {
+ decoder.reset (new DCPDecoder (shared_from_this(), film()->log()));
+ } catch (dcp::DCPReadError) {
+ /* We couldn't read the DCP, so it's probably missing */
+ return false;
+ }
+
+ BOOST_FOREACH (shared_ptr<dcp::Reel> i, decoder->reels()) {
if (!i->main_sound()) {
why_not.push_back (_("The DCP does not have sound in all reels."));
return false;
}
}
- return can_reference (bind (&Content::audio, _1), _("There is other audio content overlapping this DCP; remove it."), why_not);
+ return can_reference (bind (&Content::audio, _1), _("There is other audio content overlapping this DCP; remove it."), why_not);
}
bool
DCPContent::can_reference_subtitle (list<string>& why_not) const
{
- DCPDecoder decoder (shared_from_this(), film()->log());
- BOOST_FOREACH (shared_ptr<dcp::Reel> i, decoder.reels()) {
+ shared_ptr<DCPDecoder> decoder;
+ try {
+ decoder.reset (new DCPDecoder (shared_from_this(), film()->log()));
+ } catch (dcp::DCPReadError) {
+ /* We couldn't read the DCP, so it's probably missing */
+ return false;
+ }
+
+ BOOST_FOREACH (shared_ptr<dcp::Reel> i, decoder->reels()) {
if (!i->main_subtitle()) {
why_not.push_back (_("The DCP does not have subtitles in all reels."));
return false;
_reference_audio = dc->_reference_audio;
_reference_subtitle = dc->_reference_subtitle;
}
+
+void
+DCPContent::set_cpl (string id)
+{
+ boost::mutex::scoped_lock lm (_mutex);
+ _cpl = id;
+}
projects / dcpomatic.git / blobdiff