X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_content.cc;h=9e767596cf7619e34ae6673a53d21c054036496a;hp=84c864d990414a112ea7305edf546c6728aa4e0e;hb=73654117144c6de0ec4efe39ddc88485df546cc9;hpb=c51f4dd82ada91d5e1c2c6a9b61089195e1fa85d diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index 84c864d99..9e767596c 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -1,23 +1,26 @@ /* - Copyright (C) 2014-2015 Carl Hetherington + 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 . */ #include "dcp_content.h" +#include "video_content.h" +#include "audio_content.h" #include "dcp_examiner.h" #include "job.h" #include "film.h" @@ -25,6 +28,7 @@ #include "overlaps.h" #include "compose.hpp" #include "dcp_decoder.h" +#include "subtitle_content.h" #include #include #include @@ -40,10 +44,13 @@ using std::string; using std::cout; using std::distance; using std::pair; +using std::vector; using std::list; using boost::shared_ptr; using boost::scoped_ptr; using boost::optional; +using boost::function; +using dcp::raw_convert; int const DCPContentProperty::CAN_BE_PLAYED = 600; int const DCPContentProperty::REFERENCE_VIDEO = 601; @@ -52,27 +59,39 @@ int const DCPContentProperty::REFERENCE_SUBTITLE = 603; DCPContent::DCPContent (shared_ptr film, boost::filesystem::path p) : Content (film) - , VideoContent (film) - , SingleStreamAudioContent (film) - , SubtitleContent (film) - , _has_subtitles (false) , _encrypted (false) , _kdm_valid (false) , _reference_video (false) , _reference_audio (false) , _reference_subtitle (false) + , _three_d (false) { + video.reset (new VideoContent (this)); + audio.reset (new AudioContent (this)); + read_directory (p); + set_default_colour_conversion (); } DCPContent::DCPContent (shared_ptr film, cxml::ConstNodePtr node, int version) : Content (film, node) - , VideoContent (film, node, version) - , SingleStreamAudioContent (film, node, version) - , SubtitleContent (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"), + node->number_child ("AudioLength"), + AudioMapping (node->node_child ("AudioMapping"), version) + ) + ) + ); + _name = node->string_child ("Name"); - _has_subtitles = node->bool_child ("HasSubtitles"); + _encrypted = node->bool_child ("Encrypted"); if (node->optional_node_child ("KDM")) { _kdm = dcp::EncryptedKDM (node->string_child ("KDM")); @@ -81,6 +100,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 @@ -104,20 +134,38 @@ DCPContent::examine (shared_ptr job) Content::examine (job); shared_ptr examiner (new DCPExaminer (shared_from_this ())); - take_from_video_examiner (examiner); - take_from_audio_examiner (examiner); + video->take_from_examiner (examiner); + set_default_colour_conversion (); + + { + boost::mutex::scoped_lock lm (_mutex); + + 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); + as->set_mapping (m); + } + + signal_changed (AudioContentProperty::STREAMS); { boost::mutex::scoped_lock lm (_mutex); _name = examiner->name (); - _has_subtitles = examiner->has_subtitles (); + if (examiner->has_subtitles ()) { + 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 @@ -131,8 +179,8 @@ string DCPContent::technical_summary () const { return Content::technical_summary() + " - " - + VideoContent::technical_summary() + " - " - + AudioContent::technical_summary() + " - "; + + video->technical_summary() + " - " + + audio->technical_summary() + " - "; } void @@ -141,13 +189,24 @@ DCPContent::as_xml (xmlpp::Node* node) const node->add_child("Type")->add_child_text ("DCP"); Content::as_xml (node); - VideoContent::as_xml (node); - SingleStreamAudioContent::as_xml (node); - SubtitleContent::as_xml (node); + + if (video) { + video->as_xml (node); + } + + 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")); + } + + if (subtitle) { + subtitle->as_xml (node); + } boost::mutex::scoped_lock lm (_mutex); node->add_child("Name")->add_child_text (_name); - node->add_child("HasSubtitles")->add_child_text (_has_subtitles ? "1" : "0"); node->add_child("Encrypted")->add_child_text (_encrypted ? "1" : "0"); if (_kdm) { node->add_child("KDM")->add_child_text (_kdm->as_xml ()); @@ -156,23 +215,38 @@ 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 DCPContent::full_length () const { - FrameRateChange const frc (video_frame_rate (), film()->video_frame_rate ()); - return DCPTime::from_frames (llrint (video_length () * frc.factor ()), film()->video_frame_rate ()); + FrameRateChange const frc (active_video_frame_rate (), film()->video_frame_rate ()); + return DCPTime::from_frames (llrint (video->length () * frc.factor ()), film()->video_frame_rate ()); } string DCPContent::identifier () const { - SafeStringStream s; - s << VideoContent::identifier() << "_" << SubtitleContent::identifier () << " " - << (_reference_video ? "1" : "0") - << (_reference_subtitle ? "1" : "0"); - return s.str (); + string s = Content::identifier() + "_" + video->identifier() + "_"; + if (subtitle) { + s += subtitle->identifier () + " "; + } + + s += string (_reference_video ? "1" : "0") + string (_reference_subtitle ? "1" : "0"); + return s; } void @@ -205,16 +279,18 @@ DCPContent::directory () const } void -DCPContent::add_properties (list >& p) const +DCPContent::add_properties (list& p) const { - SingleStreamAudioContent::add_properties (p); + Content::add_properties (p); + video->add_properties (p); + audio->add_properties (p); } void DCPContent::set_default_colour_conversion () { /* Default to no colour conversion for DCPs */ - unset_colour_conversion (); + video->unset_colour_conversion (); } void @@ -256,7 +332,7 @@ DCPContent::reels () const list p; scoped_ptr decoder; try { - decoder.reset (new DCPDecoder (shared_from_this(), false)); + decoder.reset (new DCPDecoder (shared_from_this(), film()->log())); } catch (...) { /* Could not load the DCP; guess reels */ list p; @@ -284,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; @@ -311,33 +397,33 @@ DCPContent::can_reference (string overlapping, list& why_not) const bool DCPContent::can_reference_video (list& why_not) const { - return can_reference (_("There is other video content overlapping this DCP; remove it."), why_not); + 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 { - DCPDecoder decoder (shared_from_this(), false); - 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 (_("There is other audio content overlapping this DCP; remove it."), why_not); + 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 { - DCPDecoder decoder (shared_from_this(), false); - 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 (_("There is other subtitle content overlapping this DCP; remove it."), why_not); + 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); }