#include "overlaps.h"
#include "compose.hpp"
#include "dcp_decoder.h"
+#include "log.h"
+#include "dcpomatic_log.h"
#include "text_content.h"
#include <dcp/dcp.h>
#include <dcp/raw_convert.h>
using boost::function;
using boost::dynamic_pointer_cast;
using dcp::raw_convert;
+using namespace dcpomatic;
int const DCPContentProperty::NEEDS_ASSETS = 600;
int const DCPContentProperty::NEEDS_KDM = 601;
int const DCPContentProperty::TEXTS = 606;
int const DCPContentProperty::CPL = 607;
-DCPContent::DCPContent (shared_ptr<const Film> film, boost::filesystem::path p)
- : Content (film)
- , _encrypted (false)
+DCPContent::DCPContent (boost::filesystem::path p)
+ : _encrypted (false)
, _needs_assets (false)
, _kdm_valid (false)
, _reference_video (false)
, _reference_audio (false)
, _three_d (false)
{
+ LOG_GENERAL ("Creating DCP content from %1", p.string());
+
read_directory (p);
set_default_colour_conversion ();
}
}
-DCPContent::DCPContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
- : Content (film, node)
+DCPContent::DCPContent (cxml::ConstNodePtr node, int version)
+ : Content (node)
{
video = VideoContent::from_xml (this, node, version);
audio = AudioContent::from_xml (this, node, version);
void
DCPContent::read_directory (boost::filesystem::path p)
{
+ read_sub_directory (p);
+
+ bool have_assetmap = false;
+ BOOST_FOREACH (boost::filesystem::path i, paths()) {
+ if (i.filename() == "ASSETMAP" || i.filename() == "ASSETMAP.xml") {
+ have_assetmap = true;
+ }
+ }
+
+ if (!have_assetmap) {
+ throw DCPError ("No ASSETMAP or ASSETMAP.xml file found: is this a DCP?");
+ }
+}
+
+void
+DCPContent::read_sub_directory (boost::filesystem::path p)
+{
+ LOG_GENERAL ("DCPContent::read_sub_directory reads %1", p.string());
for (boost::filesystem::directory_iterator i(p); i != boost::filesystem::directory_iterator(); ++i) {
if (boost::filesystem::is_regular_file (i->path())) {
+ LOG_GENERAL ("Inside there's regular file %1", i->path().string());
add_path (i->path());
} else if (boost::filesystem::is_directory (i->path ())) {
- read_directory (i->path());
+ LOG_GENERAL ("Inside there's directory %1", i->path().string());
+ read_sub_directory (i->path());
}
}
}
+/** @param film Film, or 0 */
void
-DCPContent::examine (shared_ptr<Job> job)
+DCPContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
{
bool const needed_assets = needs_assets ();
bool const needed_kdm = needs_kdm ();
ChangeSignaller<Content> cc_assets (this, DCPContentProperty::NEEDS_ASSETS);
ChangeSignaller<Content> cc_kdm (this, DCPContentProperty::NEEDS_KDM);
ChangeSignaller<Content> cc_name (this, DCPContentProperty::NAME);
- ChangeSignaller<Content> cc_streams (this, AudioContentProperty::STREAMS);
if (job) {
job->set_progress_unknown ();
}
- Content::examine (job);
+ Content::examine (film, job);
- shared_ptr<DCPExaminer> examiner (new DCPExaminer (shared_from_this ()));
+ shared_ptr<DCPExaminer> examiner (new DCPExaminer(shared_from_this(), film ? film->tolerant() : true));
if (examiner->has_video()) {
{
}
if (examiner->has_audio()) {
- ChangeSignaller<Content> cc (this, AudioContentProperty::STREAMS);
{
boost::mutex::scoped_lock lm (_mutex);
audio.reset (new AudioContent (this));
AudioStreamPtr as (new AudioStream (examiner->audio_frame_rate(), examiner->audio_length(), examiner->audio_channels()));
audio->set_stream (as);
AudioMapping m = as->mapping ();
- film()->make_audio_mapping_default (m);
+ m.make_default (film ? film->audio_processor() : 0);
as->set_mapping (m);
}
boost::mutex::scoped_lock lm (_mutex);
_name = examiner->name ();
for (int i = 0; i < TEXT_COUNT; ++i) {
- if (examiner->has_text(static_cast<TextType>(i))) {
+ for (int j = 0; j < examiner->text_count(static_cast<TextType>(i)); ++j) {
text.push_back (shared_ptr<TextContent>(new TextContent(this, static_cast<TextType>(i), static_cast<TextType>(i))));
}
}
}
DCPTime
-DCPContent::full_length () const
+DCPContent::full_length (shared_ptr<const Film> film) const
+{
+ if (!video) {
+ return DCPTime();
+ }
+ FrameRateChange const frc (film, shared_from_this());
+ return DCPTime::from_frames (llrint(video->length() * frc.factor()), film->video_frame_rate());
+}
+
+DCPTime
+DCPContent::approximate_length () const
{
if (!video) {
return DCPTime();
}
- FrameRateChange const frc (active_video_frame_rate (), film()->video_frame_rate ());
- return DCPTime::from_frames (llrint (video->length () * frc.factor ()), film()->video_frame_rate ());
+ return DCPTime::from_frames (video->length(), 24);
}
string
}
void
-DCPContent::add_properties (list<UserProperty>& p) const
+DCPContent::add_properties (shared_ptr<const Film> film, list<UserProperty>& p) const
{
- Content::add_properties (p);
+ Content::add_properties (film, p);
if (video) {
video->add_properties (p);
}
if (audio) {
- audio->add_properties (p);
+ audio->add_properties (film, p);
}
}
}
list<DCPTimePeriod>
-DCPContent::reels () const
+DCPContent::reels (shared_ptr<const Film> film) const
{
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()));
+ scoped_ptr<DCPExaminer> examiner (new DCPExaminer(shared_from_this(), film->tolerant()));
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 ()));
+ reel_lengths.push_back (length_after_trim(film).frames_round(film->video_frame_rate()));
}
}
BOOST_FOREACH (int64_t i, reel_lengths) {
/* This reel runs from `pos' to `to' */
- DCPTime const to = pos + DCPTime::from_frames (i, 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()) {
+ p.push_back (DCPTimePeriod (max(position(), pos), min(end(film), to)));
+ if (to > end(film)) {
break;
}
}
}
list<DCPTime>
-DCPContent::reel_split_points () const
+DCPContent::reel_split_points (shared_ptr<const Film> film) const
{
list<DCPTime> s;
- BOOST_FOREACH (DCPTimePeriod i, reels()) {
+ BOOST_FOREACH (DCPTimePeriod i, reels(film)) {
s.push_back (i.from);
}
return s;
}
bool
-DCPContent::can_reference (function<bool (shared_ptr<const Content>)> part, string overlapping, string& why_not) const
+DCPContent::can_reference (shared_ptr<const Film> film, function<bool (shared_ptr<const Content>)> part, string overlapping, string& why_not) const
{
/* We must be using the same standard as the film */
if (_standard) {
- if (_standard.get() == dcp::INTEROP && !film()->interop()) {
+ if (_standard.get() == dcp::INTEROP && !film->interop()) {
/// TRANSLATORS: this string will follow "Cannot reference this DCP: "
why_not = _("it is Interop and the film is set to SMPTE.");
return false;
- } else if (_standard.get() == dcp::SMPTE && film()->interop()) {
+ } else if (_standard.get() == dcp::SMPTE && film->interop()) {
/// TRANSLATORS: this string will follow "Cannot reference this DCP: "
why_not = _("it is SMPTE and the film is set to Interop.");
return false;
}
/* And the same frame rate */
- if (!video_frame_rate() || (lrint(video_frame_rate().get()) != film()->video_frame_rate())) {
+ if (!video_frame_rate() || (lrint(video_frame_rate().get()) != film->video_frame_rate())) {
/// TRANSLATORS: this string will follow "Cannot reference this DCP: "
why_not = _("it has a different frame rate to the film.");
return false;
}
- list<DCPTimePeriod> const fr = film()->reels ();
+ list<DCPTimePeriod> const fr = film->reels ();
list<DCPTimePeriod> reel_list;
try {
- reel_list = reels ();
- } catch (dcp::DCPReadError) {
+ reel_list = reels (film);
+ } catch (dcp::DCPReadError &) {
/* We couldn't read the DCP; it's probably missing */
return false;
- } catch (dcp::KDMDecryptionError) {
+ } catch (dcp::KDMDecryptionError &) {
/* We have an incorrect KDM */
return false;
}
}
}
- ContentList a = overlaps (film()->content(), part, position(), end());
+ ContentList a = overlaps (film, film->content(), part, position(), end(film));
if (a.size() != 1 || a.front().get() != this) {
why_not = overlapping;
return false;
}
bool
-DCPContent::can_reference_video (string& why_not) const
+DCPContent::can_reference_video (shared_ptr<const Film> film, string& why_not) const
{
if (!video) {
why_not = _("There is no video in this DCP");
video_res = RESOLUTION_4K;
}
- if (film()->resolution() != video_res) {
+ if (film->resolution() != video_res) {
if (video_res == RESOLUTION_4K) {
/// TRANSLATORS: this string will follow "Cannot reference this DCP: "
why_not = _("it is 4K and the film is 2K.");
why_not = _("it is 2K and the film is 4K.");
}
return false;
- } else if (film()->frame_size() != video->size()) {
+ } else if (film->frame_size() != video->size()) {
/// TRANSLATORS: this string will follow "Cannot reference this DCP: "
why_not = _("its video frame size differs from the film's.");
return false;
}
/// TRANSLATORS: this string will follow "Cannot reference this DCP: "
- return can_reference (bind (&check_video, _1), _("it overlaps other video content; remove the other content."), why_not);
+ return can_reference (film, bind (&check_video, _1), _("it overlaps other video content; remove the other content."), why_not);
}
static
}
bool
-DCPContent::can_reference_audio (string& why_not) const
+DCPContent::can_reference_audio (shared_ptr<const Film> film, string& why_not) const
{
shared_ptr<DCPDecoder> decoder;
try {
- decoder.reset (new DCPDecoder (shared_from_this(), film()->log(), false));
- } catch (dcp::DCPReadError) {
+ decoder.reset (new DCPDecoder (film, shared_from_this(), false, film->tolerant(), shared_ptr<DCPDecoder>()));
+ } catch (dcp::DCPReadError &) {
/* We couldn't read the DCP, so it's probably missing */
return false;
- } catch (DCPError) {
+ } catch (DCPError &) {
/* We couldn't read the DCP, so it's probably missing */
return false;
- } catch (dcp::KDMDecryptionError) {
+ } catch (dcp::KDMDecryptionError &) {
/* We have an incorrect KDM */
return false;
}
}
/// TRANSLATORS: this string will follow "Cannot reference this DCP: "
- return can_reference (bind (&check_audio, _1), _("it overlaps other audio content; remove the other content."), why_not);
+ return can_reference (film, bind (&check_audio, _1), _("it overlaps other audio content; remove the other content."), why_not);
}
static
}
bool
-DCPContent::can_reference_text (TextType type, string& why_not) const
+DCPContent::can_reference_text (shared_ptr<const Film> film, TextType type, string& why_not) const
{
shared_ptr<DCPDecoder> decoder;
try {
- decoder.reset (new DCPDecoder (shared_from_this(), film()->log(), false));
- } catch (dcp::DCPReadError) {
+ decoder.reset (new DCPDecoder (film, shared_from_this(), false, film->tolerant(), shared_ptr<DCPDecoder>()));
+ } catch (dcp::DCPReadError &) {
/* We couldn't read the DCP, so it's probably missing */
return false;
- } catch (dcp::KDMDecryptionError) {
+ } catch (dcp::KDMDecryptionError &) {
/* We have an incorrect KDM */
return false;
}
}
/// TRANSLATORS: this string will follow "Cannot reference this DCP: "
- return can_reference (bind (&check_text, _1), _("it overlaps other text content; remove the other content."), why_not);
+ return can_reference (film, bind (&check_text, _1), _("it overlaps other text content; remove the other content."), why_not);
}
void
projects / dcpomatic.git / blobdiff