X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_content.cc;h=d0f434e5a87af1e0b0da304ca73c136620c7623e;hp=62284e4333e06a1ceb62bfaebc99fd83a41a7ab4;hb=386e25f3b9d3fa59cbdeed458d9b3e0d21e338b8;hpb=84012cdd64f451891febd36154b7226ea21a899b diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index 62284e433..d0f434e5a 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -29,6 +29,7 @@ #include "compose.hpp" #include "dcp_decoder.h" #include "log.h" +#include "dcpomatic_log.h" #include "text_content.h" #include #include @@ -54,6 +55,7 @@ using boost::optional; 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; @@ -64,8 +66,6 @@ int const DCPContentProperty::NAME = 605; int const DCPContentProperty::TEXTS = 606; int const DCPContentProperty::CPL = 607; -#define LOG_GENERAL(...) dcpomatic_log->log(String::compose(__VA_ARGS__), LogEntry::TYPE_GENERAL); - DCPContent::DCPContent (boost::filesystem::path p) : _encrypted (false) , _needs_assets (false) @@ -151,16 +151,7 @@ DCPContent::DCPContent (cxml::ConstNodePtr node, int version) void DCPContent::read_directory (boost::filesystem::path p) { - LOG_GENERAL ("DCPContent::read_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 ())) { - LOG_GENERAL ("Inside there's directory %1", i->path().string()); - read_directory (i->path()); - } - } + read_sub_directory (p); bool have_assetmap = false; BOOST_FOREACH (boost::filesystem::path i, paths()) { @@ -174,6 +165,22 @@ DCPContent::read_directory (boost::filesystem::path p) } } +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 ())) { + 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 film, shared_ptr job) { @@ -186,14 +193,13 @@ DCPContent::examine (shared_ptr film, shared_ptr job) ChangeSignaller cc_assets (this, DCPContentProperty::NEEDS_ASSETS); ChangeSignaller cc_kdm (this, DCPContentProperty::NEEDS_KDM); ChangeSignaller cc_name (this, DCPContentProperty::NAME); - ChangeSignaller cc_streams (this, AudioContentProperty::STREAMS); if (job) { job->set_progress_unknown (); } Content::examine (film, job); - shared_ptr examiner (new DCPExaminer (shared_from_this ())); + shared_ptr examiner (new DCPExaminer(shared_from_this(), film ? film->tolerant() : true)); if (examiner->has_video()) { { @@ -205,7 +211,6 @@ DCPContent::examine (shared_ptr film, shared_ptr job) } if (examiner->has_audio()) { - ChangeSignaller cc (this, AudioContentProperty::STREAMS); { boost::mutex::scoped_lock lm (_mutex); audio.reset (new AudioContent (this)); @@ -213,7 +218,7 @@ DCPContent::examine (shared_ptr film, shared_ptr job) 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); } @@ -222,7 +227,7 @@ DCPContent::examine (shared_ptr film, shared_ptr job) boost::mutex::scoped_lock lm (_mutex); _name = examiner->name (); for (int i = 0; i < TEXT_COUNT; ++i) { - if (examiner->has_text(static_cast(i))) { + for (int j = 0; j < examiner->text_count(static_cast(i)); ++j) { text.push_back (shared_ptr(new TextContent(this, static_cast(i), static_cast(i)))); } } @@ -342,10 +347,19 @@ DCPContent::full_length (shared_ptr film) const if (!video) { return DCPTime(); } - FrameRateChange const frc (active_video_frame_rate(film), film->video_frame_rate()); + 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(); + } + return DCPTime::from_frames (video->length(), 24); +} + string DCPContent::identifier () const { @@ -407,7 +421,7 @@ DCPContent::directories () const void DCPContent::add_properties (shared_ptr film, list& p) const { - Content::add_properties (p); + Content::add_properties (film, p); if (video) { video->add_properties (p); } @@ -465,7 +479,7 @@ DCPContent::reels (shared_ptr film) const if (reel_lengths.empty ()) { /* Old metadata with no reel lengths; get them here instead */ try { - scoped_ptr examiner (new DCPExaminer (shared_from_this())); + scoped_ptr examiner (new DCPExaminer(shared_from_this(), film->tolerant())); reel_lengths = examiner->reel_lengths (); } catch (...) { /* Could not examine the DCP; guess reels */ @@ -535,10 +549,10 @@ DCPContent::can_reference (shared_ptr film, function reel_list; try { reel_list = reels (film); - } catch (dcp::DCPReadError) { + } 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; } @@ -612,14 +626,14 @@ DCPContent::can_reference_audio (shared_ptr film, string& why_not) c { shared_ptr decoder; try { - decoder.reset (new DCPDecoder (film, shared_from_this(), false)); - } catch (dcp::DCPReadError) { + decoder.reset (new DCPDecoder (film, shared_from_this(), false, film->tolerant(), shared_ptr())); + } 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; } @@ -647,12 +661,11 @@ DCPContent::can_reference_text (shared_ptr film, TextType type, stri { shared_ptr decoder; try { - decoder.reset (new DCPDecoder (film, shared_from_this(), false)); - } catch (dcp::DCPReadError) { - + decoder.reset (new DCPDecoder (film, shared_from_this(), false, film->tolerant(), shared_ptr())); + } 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; }