X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_content.h;h=69520fbd65a017fde85da1099105a3945d0286d2;hp=1edc3a3aaaac7276a600499f60b7a93d7f4d0100;hb=ac34066d5e448d1984d11a180be74e31b6e13b5c;hpb=6f344b876689a1234a5eb75041882f06f5d9fe5c diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h index 1edc3a3aa..69520fbd6 100644 --- a/src/lib/dcp_content.h +++ b/src/lib/dcp_content.h @@ -1,19 +1,20 @@ /* - Copyright (C) 2014-2016 Carl Hetherington + Copyright (C) 2014-2018 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 . */ @@ -24,62 +25,56 @@ * @brief DCPContent class. */ -#include "single_stream_audio_content.h" -#include "subtitle_content.h" +#include "content.h" #include #include class DCPContentProperty { public: - static int const CAN_BE_PLAYED; + static int const NEEDS_KDM; + static int const NEEDS_ASSETS; static int const REFERENCE_VIDEO; static int const REFERENCE_AUDIO; - static int const REFERENCE_SUBTITLE; + static int const REFERENCE_TEXT; + static int const NAME; + static int const TEXTS; + static int const CPL; }; +class ContentPart; + /** @class DCPContent * @brief An existing DCP used as input. */ -class DCPContent : public SingleStreamAudioContent, public SubtitleContent +class DCPContent : public Content { public: - DCPContent (boost::shared_ptr, boost::filesystem::path p); - DCPContent (boost::shared_ptr, cxml::ConstNodePtr, int version); + DCPContent (boost::filesystem::path p); + DCPContent (cxml::ConstNodePtr, int version); - boost::shared_ptr shared_from_this () { - return boost::dynamic_pointer_cast (Content::shared_from_this ()); + std::shared_ptr shared_from_this () { + return std::dynamic_pointer_cast (Content::shared_from_this ()); } - boost::shared_ptr shared_from_this () const { - return boost::dynamic_pointer_cast (Content::shared_from_this ()); + std::shared_ptr shared_from_this () const { + return std::dynamic_pointer_cast (Content::shared_from_this ()); } - DCPTime full_length () const; + dcpomatic::DCPTime full_length (std::shared_ptr film) const; + dcpomatic::DCPTime approximate_length () const; - void examine (boost::shared_ptr); + void examine (std::shared_ptr film, std::shared_ptr); std::string summary () const; std::string technical_summary () const; - void as_xml (xmlpp::Node *) const; + void as_xml (xmlpp::Node *, bool with_paths) const; std::string identifier () const; + void take_settings_from (std::shared_ptr c); void set_default_colour_conversion (); - std::list reel_split_points () const; - - /* SubtitleContent */ - - bool has_text_subtitles () const { - boost::mutex::scoped_lock lm (_mutex); - return _has_subtitles; - } - - bool has_image_subtitles () const { - return false; - } + std::list reel_split_points (std::shared_ptr film) const; - double subtitle_video_frame_rate () const; - - boost::filesystem::path directory () const; + std::vector directories () const; bool encrypted () const { boost::mutex::scoped_lock lm (_mutex); @@ -87,12 +82,15 @@ public: } void add_kdm (dcp::EncryptedKDM); + void add_ov (boost::filesystem::path ov); boost::optional kdm () const { return _kdm; } bool can_be_played () const; + bool needs_kdm () const; + bool needs_assets () const; void set_reference_video (bool r); @@ -101,7 +99,7 @@ public: return _reference_video; } - bool can_reference_video (std::list &) const; + bool can_reference_video (std::shared_ptr film, std::string &) const; void set_reference_audio (bool r); @@ -110,29 +108,84 @@ public: return _reference_audio; } - bool can_reference_audio (std::list &) const; + bool can_reference_audio (std::shared_ptr film, std::string &) const; + + void set_reference_text (TextType type, bool r); + + /** @param type Original type of texts in the DCP. + * @return true if these texts are to be referenced. + */ + bool reference_text (TextType type) const { + boost::mutex::scoped_lock lm (_mutex); + return _reference_text[static_cast(type)]; + } + + bool can_reference_text (std::shared_ptr film, TextType type, std::string &) const; + + void set_cpl (std::string id); + + boost::optional cpl () const { + boost::mutex::scoped_lock lm (_mutex); + return _cpl; + } + + std::string name () const { + boost::mutex::scoped_lock lm (_mutex); + return _name; + } + + bool three_d () const { + boost::mutex::scoped_lock lm (_mutex); + return _three_d; + } - void set_reference_subtitle (bool r); + boost::optional content_kind () const { + boost::mutex::scoped_lock lm (_mutex); + return _content_kind; + } - bool reference_subtitle () const { + dcp::Standard standard () const { boost::mutex::scoped_lock lm (_mutex); - return _reference_subtitle; + DCPOMATIC_ASSERT (_standard); + return _standard.get (); + } + + std::map markers () const { + return _markers; } - bool can_reference_subtitle (std::list &) const; + bool kdm_timing_window_valid () const; -protected: - void add_properties (std::list& p) const; + Resolution resolution () const; + + std::vector ratings () const { + return _ratings; + } + + std::vector content_versions () const { + return _content_versions; + } private: + friend struct reels_test5; + + void add_properties (std::shared_ptr film, std::list& p) const; + void read_directory (boost::filesystem::path); - std::list reels () const; - template bool can_reference (std::string overlapping, std::list& why_not) const; + void read_sub_directory (boost::filesystem::path); + std::list reels (std::shared_ptr film) const; + bool can_reference ( + std::shared_ptr film, + std::function )>, + std::string overlapping, + std::string& why_not + ) const; std::string _name; - bool _has_subtitles; /** true if our DCP is encrypted */ bool _encrypted; + /** true if this DCP needs more assets before it can be played */ + bool _needs_assets; boost::optional _kdm; /** true if _kdm successfully decrypts the first frame of our DCP */ bool _kdm_valid; @@ -144,10 +197,24 @@ private: * rather than by rewrapping. */ bool _reference_audio; - /** true if the subtitle in this DCP should be included in the output by reference - * rather than by rewrapping. + /** true if the texts in this DCP should be included in the output by reference + * rather than by rewrapping. The types here are the original text types, + * not what they are being used for. + */ + bool _reference_text[static_cast(TextType::COUNT)]; + + boost::optional _standard; + boost::optional _content_kind; + bool _three_d; + /** ID of the CPL to use; older metadata might not specify this: in that case + * just use the only CPL. */ - bool _reference_subtitle; + boost::optional _cpl; + /** List of the lengths of the reels in this DCP */ + std::list _reel_lengths; + std::map _markers; + std::vector _ratings; + std::vector _content_versions; }; #endif