int const DCPContentProperty::REFERENCE_AUDIO = 603;
int const DCPContentProperty::REFERENCE_SUBTITLE = 604;
int const DCPContentProperty::NAME = 605;
+int const DCPContentProperty::HAS_SUBTITLES = 606;
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
DCPContent::read_directory (boost::filesystem::path p)
{
for (boost::filesystem::directory_iterator i(p); i != boost::filesystem::directory_iterator(); ++i) {
- if (boost::filesystem::is_regular_file (i->path ())) {
- _paths.push_back (i->path ());
+ if (boost::filesystem::is_regular_file (i->path())) {
+ _paths.push_back (i->path());
} else if (boost::filesystem::is_directory (i->path ())) {
- read_directory (i->path ());
+ read_directory (i->path());
}
}
}
bool const needed_assets = needs_assets ();
bool const needed_kdm = needs_kdm ();
string const old_name = name ();
+ bool had_subtitles = static_cast<bool> (subtitle);
- job->set_progress_unknown ();
+ if (job) {
+ job->set_progress_unknown ();
+ }
Content::examine (job);
shared_ptr<DCPExaminer> examiner (new DCPExaminer (shared_from_this ()));
signal_changed (AudioContentProperty::STREAMS);
+ bool has_subtitles = false;
{
boost::mutex::scoped_lock lm (_mutex);
_name = examiner->name ();
if (examiner->has_subtitles ()) {
subtitle.reset (new SubtitleContent (this));
+ } else {
+ subtitle.reset ();
}
+ has_subtitles = static_cast<bool> (subtitle);
_encrypted = examiner->encrypted ();
_needs_assets = examiner->needs_assets ();
_kdm_valid = examiner->kdm_valid ();
_standard = examiner->standard ();
_three_d = examiner->three_d ();
_cpl = examiner->cpl ();
+ _reel_lengths = examiner->reel_lengths ();
+ }
+
+ if (had_subtitles != has_subtitles) {
+ signal_changed (DCPContentProperty::HAS_SUBTITLES);
}
if (needed_assets != needs_assets ()) {
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
vector<boost::filesystem::path>
DCPContent::directories () const
{
- return dcp::DCP::directories_from_files (paths ());
+ return dcp::DCP::directories_from_files (paths());
}
void
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_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(), false));
+ } 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;
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(), false));
+ } 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;