X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_content.cc;h=431492c7ac29b8b50091d75e1cdbfead4d5e3dac;hb=97c1bc360f912d66d3fc0430b331214e4da79644;hp=dbd9bca8d4cd2fb9d3b87962ab12fcc9b039b772;hpb=90becb40eb48467b6d31d6939bcfcf39c3c9652c;p=dcpomatic.git diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index dbd9bca8d..431492c7a 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2014-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -48,6 +49,7 @@ using std::list; using boost::shared_ptr; using boost::scoped_ptr; using boost::optional; +using boost::function; int const DCPContentProperty::CAN_BE_PLAYED = 600; int const DCPContentProperty::REFERENCE_VIDEO = 601; @@ -61,9 +63,10 @@ DCPContent::DCPContent (shared_ptr film, boost::filesystem::path p) , _reference_video (false) , _reference_audio (false) , _reference_subtitle (false) + , _three_d (false) { - video.reset (new VideoContent (this, film)); - audio.reset (new AudioContent (this, film)); + video.reset (new VideoContent (this)); + audio.reset (new AudioContent (this)); read_directory (p); set_default_colour_conversion (); @@ -72,13 +75,17 @@ DCPContent::DCPContent (shared_ptr film, boost::filesystem::path p) DCPContent::DCPContent (shared_ptr film, cxml::ConstNodePtr node, int version) : Content (film, node) { - video = VideoContent::from_xml (this, film, node, version); - audio = AudioContent::from_xml (this, film, node); - subtitle = SubtitleContent::from_xml (this, film, node, version); + video = VideoContent::from_xml (this, node, version); + audio = AudioContent::from_xml (this, node, version); + subtitle = SubtitleContent::from_xml (this, node, version); audio->set_stream ( AudioStreamPtr ( - new AudioStream (node->number_child ("AudioFrameRate"), AudioMapping (node->node_child ("AudioMapping"), version)) + new AudioStream ( + node->number_child ("AudioFrameRate"), + node->number_child ("AudioLength"), + AudioMapping (node->node_child ("AudioMapping"), version) + ) ) ); @@ -92,6 +99,17 @@ DCPContent::DCPContent (shared_ptr film, cxml::ConstNodePtr node, in _reference_video = node->optional_bool_child ("ReferenceVideo").get_value_or (false); _reference_audio = node->optional_bool_child ("ReferenceAudio").get_value_or (false); _reference_subtitle = node->optional_bool_child ("ReferenceSubtitle").get_value_or (false); + if (node->optional_string_child("Standard")) { + string const s = node->optional_string_child("Standard").get(); + if (s == "Interop") { + _standard = dcp::INTEROP; + } else if (s == "SMPTE") { + _standard = dcp::SMPTE; + } else { + DCPOMATIC_ASSERT (false); + } + } + _three_d = node->optional_bool_child("ThreeD").get_value_or (false); } void @@ -121,7 +139,7 @@ DCPContent::examine (shared_ptr job) { boost::mutex::scoped_lock lm (_mutex); - AudioStreamPtr as (new AudioStream (examiner->audio_frame_rate(), examiner->audio_channels ())); + 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); @@ -134,15 +152,19 @@ DCPContent::examine (shared_ptr job) boost::mutex::scoped_lock lm (_mutex); _name = examiner->name (); if (examiner->has_subtitles ()) { - subtitle.reset (new SubtitleContent (this, film())); + subtitle.reset (new SubtitleContent (this)); } _encrypted = examiner->encrypted (); _kdm_valid = examiner->kdm_valid (); + _standard = examiner->standard (); + _three_d = examiner->three_d (); } if (could_be_played != can_be_played ()) { signal_changed (DCPContentProperty::CAN_BE_PLAYED); } + + video->set_frame_type (_three_d ? VIDEO_FRAME_TYPE_3D : VIDEO_FRAME_TYPE_2D); } string @@ -174,6 +196,7 @@ DCPContent::as_xml (xmlpp::Node* node) const if (audio) { audio->as_xml (node); node->add_child("AudioFrameRate")->add_child_text (raw_convert (audio->stream()->frame_rate())); + node->add_child("AudioLength")->add_child_text (raw_convert (audio->stream()->length())); audio->stream()->mapping().as_xml (node->add_child("AudioMapping")); } @@ -191,6 +214,19 @@ DCPContent::as_xml (xmlpp::Node* node) const node->add_child("ReferenceVideo")->add_child_text (_reference_video ? "1" : "0"); node->add_child("ReferenceAudio")->add_child_text (_reference_audio ? "1" : "0"); node->add_child("ReferenceSubtitle")->add_child_text (_reference_subtitle ? "1" : "0"); + if (_standard) { + switch (_standard.get ()) { + case dcp::INTEROP: + node->add_child("Standard")->add_child_text ("Interop"); + break; + case dcp::SMPTE: + node->add_child("Standard")->add_child_text ("SMPTE"); + break; + default: + DCPOMATIC_ASSERT (false); + } + } + node->add_child("ThreeD")->add_child_text (_three_d ? "1" : "0"); } DCPTime @@ -203,7 +239,7 @@ DCPContent::full_length () const string DCPContent::identifier () const { - SafeStringStream s; + locked_stringstream s; s << Content::identifier() << "_" << video->identifier() << "_"; if (subtitle) { s << subtitle->identifier () << " "; @@ -245,6 +281,8 @@ DCPContent::directory () const void DCPContent::add_properties (list& p) const { + Content::add_properties (p); + video->add_properties (p); audio->add_properties (p); } @@ -294,7 +332,7 @@ DCPContent::reels () const list p; scoped_ptr decoder; try { - decoder.reset (new DCPDecoder (shared_from_this(), film()->log(), false)); + decoder.reset (new DCPDecoder (shared_from_this(), film()->log())); } catch (...) { /* Could not load the DCP; guess reels */ list p; @@ -322,22 +360,32 @@ DCPContent::reel_split_points () const return s; } -template bool -DCPContent::can_reference (string overlapping, list& why_not) const +DCPContent::can_reference (function (shared_ptr)> part, string overlapping, list& why_not) const { + /* We must be using the same standard as the film */ + if (_standard) { + if (_standard.get() == dcp::INTEROP && !film()->interop()) { + why_not.push_back (_("The film is set to SMPTE and this DCP is Interop.")); + return false; + } else if (_standard.get() == dcp::SMPTE && film()->interop()) { + why_not.push_back (_("The film is set to Interop and this DCP is SMPTE.")); + return false; + } + } + list const fr = film()->reels (); /* fr must contain reels(). It can also contain other reels, but it must at least contain reels(). */ BOOST_FOREACH (DCPTimePeriod i, reels()) { if (find (fr.begin(), fr.end(), i) == fr.end ()) { - why_not.push_back (_("Reel lengths in the project differ from those in the DCP; set the reel mode to 'split by video content'.")); + why_not.push_back (_("Reel lengths in the film differ from those in the DCP; set the reel mode to 'split by video content'.")); return false; } } - list > a = overlaps (film()->content(), position(), end()); + ContentList a = overlaps (film()->content(), part, position(), end()); if (a.size() != 1 || a.front().get() != this) { why_not.push_back (overlapping); return false; @@ -349,20 +397,33 @@ DCPContent::can_reference (string overlapping, list& why_not) const bool DCPContent::can_reference_video (list& why_not) const { - /* XXX: this needs to be fixed */ - return true; + 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& why_not) const { - /* XXX: this needs to be fixed */ - return true; + DCPDecoder decoder (shared_from_this(), film()->log()); + BOOST_FOREACH (shared_ptr 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); } bool DCPContent::can_reference_subtitle (list& why_not) const { - /* XXX: this needs to be fixed */ - return true; + DCPDecoder decoder (shared_from_this(), film()->log()); + BOOST_FOREACH (shared_ptr i, decoder.reels()) { + if (!i->main_subtitle()) { + why_not.push_back (_("The DCP does not have subtitles in all reels.")); + return false; + } + } + + return can_reference (bind (&Content::subtitle, _1), _("There is other subtitle content overlapping this DCP; remove it."), why_not); }