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)
_name = node->string_child ("Name");
_encrypted = node->bool_child ("Encrypted");
- _needs_assets = node->bool_child ("NeedsAssets");
+ _needs_assets = node->optional_bool_child("NeedsAssets").get_value_or (false);
if (node->optional_node_child ("KDM")) {
_kdm = dcp::EncryptedKDM (node->string_child ("KDM"));
}
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);
_cpl = examiner->cpl ();
}
- if (could_be_played != can_be_played ()) {
- signal_changed (DCPContentProperty::CAN_BE_PLAYED);
+ if (needed_assets != needs_assets ()) {
+ signal_changed (DCPContentProperty::NEEDS_ASSETS);
+ }
+
+ if (needed_kdm != needs_kdm ()) {
+ signal_changed (DCPContentProperty::NEEDS_KDM);
+ }
+
+ if (old_name != name ()) {
+ signal_changed (DCPContentProperty::NAME);
}
video->set_frame_type (_three_d ? VIDEO_FRAME_TYPE_3D : VIDEO_FRAME_TYPE_2D);
return p;
}
- DCPTime from = position ();
- BOOST_FOREACH (shared_ptr<dcp::Reel> i, decoder->reels()) {
- DCPTime const to = from + DCPTime::from_frames (i->main_picture()->duration(), film()->video_frame_rate());
- p.push_back (DCPTimePeriod (from, to));
- from = to;
+ /* 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 ()) {
+ /* This reel runs from `pos' to `to' */
+ DCPTime const to = pos + DCPTime::from_frames (i->main_picture()->duration(), film()->video_frame_rate());
+ if (to > position()) {
+ p.push_back (DCPTimePeriod (max(position(), pos), min(end(), to)));
+ if (to > end()) {
+ break;
+ }
+ }
+ pos = to;
}
return p;
}
}
+ /* And the same frame rate */
+ if (!video_frame_rate() || (lrint(video_frame_rate().get()) != film()->video_frame_rate())) {
+ why_not.push_back (_("The film has a different frame rate to this DCP."));
+ return false;
+ }
+
list<DCPTimePeriod> const fr = film()->reels ();
+
/* fr must contain reels(). It can also contain other reels, but it must at
least contain reels().
*/
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);
}
}
}
- 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
_reference_audio = dc->_reference_audio;
_reference_subtitle = dc->_reference_subtitle;
}
+
+void
+DCPContent::set_cpl (string id)
+{
+ boost::mutex::scoped_lock lm (_mutex);
+ _cpl = id;
+}