X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=4c71c9e1618efabdf9b7ce95f850d551cb1306e7;hp=b03b0258e7f074316b9c3560911a14f55dec1120;hb=e519feaca11005d330e7b8403b948d4ad9cc3ae8;hpb=4edc14c8b1410e24f68b510cc14409b96c0338a3 diff --git a/src/lib/film.h b/src/lib/film.h index b03b0258e..4c71c9e16 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -32,6 +32,7 @@ #include "frame_rate_change.h" #include "signaller.h" #include "dcp_text_track.h" +#include #include #include #include @@ -57,11 +58,12 @@ class Content; class Playlist; class AudioContent; class AudioProcessor; -class AudioMapping; class Ratio; class Job; class Film; struct isdcf_name_test; +struct recover_test_2d_encrypted; +struct atmos_encrypted_passthrough_test; class InfoFileHandle { @@ -139,6 +141,7 @@ public: dcp::Size full_frame () const; dcp::Size frame_size () const; + dcp::Size active_area () const; std::vector cpls () const; @@ -172,9 +175,7 @@ public: return _state_version; } - std::string subtitle_language () const; - - std::vector audio_output_names () const; + std::vector audio_output_names () const; void repeat_content (ContentList, int); @@ -189,6 +190,7 @@ public: bool references_dcp_video () const; bool references_dcp_audio () const; + bool contains_atmos_content () const; void set_tolerant (bool t) { _tolerant = t; @@ -212,9 +214,7 @@ public: DCP_CONTENT_TYPE, CONTAINER, RESOLUTION, - SIGNED, ENCRYPTED, - KEY, J2K_BANDWIDTH, ISDCF_METADATA, VIDEO_FRAME_RATE, @@ -226,11 +226,20 @@ public: AUDIO_PROCESSOR, REEL_TYPE, REEL_LENGTH, - UPLOAD_AFTER_MAKE_DCP, REENCODE_J2K, MARKERS, RATINGS, - CONTENT_VERSION + CONTENT_VERSIONS, + NAME_LANGUAGE, + AUDIO_LANGUAGE, + RELEASE_TERRITORY, + VERSION_NUMBER, + STATUS, + CHAIN, + DISTRIBUTOR, + FACILITY, + LUMINANCE, + SUBTITLE_LANGUAGES }; @@ -260,11 +269,6 @@ public: return _resolution; } - /* signed is a reserved word */ - bool is_signed () const { - return _signed; - } - bool encrypted () const { return _encrypted; } @@ -314,10 +318,6 @@ public: return _reel_length; } - bool upload_after_make_dcp () const { - return _upload_after_make_dcp; - } - std::string context_id () const { return _context_id; } @@ -326,8 +326,10 @@ public: return _reencode_j2k; } + typedef std::map Markers; + boost::optional marker (dcp::Marker type) const; - std::map markers () const { + Markers markers () const { return _markers; } @@ -335,8 +337,48 @@ public: return _ratings; } - std::string content_version () const { - return _content_version; + std::vector content_versions () const { + return _content_versions; + } + + dcp::LanguageTag name_language () const { + return _name_language; + } + + dcp::LanguageTag audio_language () const { + return _audio_language; + } + + dcp::LanguageTag::RegionSubtag release_territory () const { + return _release_territory; + } + + int version_number () const { + return _version_number; + } + + dcp::Status status () const { + return _status; + } + + std::string chain () const { + return _chain; + } + + std::string distributor () const { + return _distributor; + } + + std::string facility () const { + return _facility; + } + + dcp::Luminance luminance () const { + return _luminance; + } + + std::vector subtitle_languages () const { + return _subtitle_languages; } /* SET */ @@ -353,9 +395,7 @@ public: void set_dcp_content_type (DCPContentType const *); void set_container (Ratio const *, bool user_explicit = true); void set_resolution (Resolution, bool user_explicit = true); - void set_signed (bool); void set_encrypted (bool); - void set_key (dcp::Key key); void set_j2k_bandwidth (int); void set_isdcf_metadata (ISDCFMetadata); void set_video_frame_rate (int rate, bool user_explicit = false); @@ -367,13 +407,26 @@ public: void set_audio_processor (AudioProcessor const * processor); void set_reel_type (ReelType); void set_reel_length (int64_t); - void set_upload_after_make_dcp (bool); void set_reencode_j2k (bool); void set_marker (dcp::Marker type, dcpomatic::DCPTime time); void unset_marker (dcp::Marker type); void clear_markers (); void set_ratings (std::vector r); - void set_content_version (std::string v); + void set_content_versions (std::vector v); + void set_name_language (dcp::LanguageTag lang); + void set_audio_language (dcp::LanguageTag lang); + void set_release_territory (dcp::LanguageTag::RegionSubtag region); + void set_version_number (int v); + void set_status (dcp::Status s); + void set_chain (std::string c); + void set_facility (std::string f); + void set_distributor (std::string d); + void set_luminance (dcp::Luminance l); + void set_subtitle_language (dcp::LanguageTag language); + void unset_subtitle_language (); + void set_subtitle_languages (std::vector languages); + + void add_ffoc_lfoc (Markers& markers) const; /** Emitted when some property has of the Film is about to change or has changed */ mutable boost::signals2::signal Change; @@ -395,6 +448,8 @@ public: private: friend struct ::isdcf_name_test; + friend struct ::recover_test_2d_encrypted; + friend struct ::atmos_encrypted_passthrough_test; template friend class ChangeSignaller; boost::filesystem::path info_file (dcpomatic::DCPTimePeriod p) const; @@ -432,7 +487,6 @@ private: Ratio const * _container; /** DCP resolution (2K or 4K) */ Resolution _resolution; - bool _signed; bool _encrypted; dcp::Key _key; /** context ID used when encrypting picture assets; we keep it so that we can @@ -459,7 +513,6 @@ private: ReelType _reel_type; /** Desired reel length in bytes, if _reel_type == REELTYPE_BY_LENGTH */ int64_t _reel_length; - bool _upload_after_make_dcp; bool _reencode_j2k; /** true if the user has ever explicitly set the video frame rate of this film */ bool _user_explicit_video_frame_rate; @@ -467,7 +520,17 @@ private: bool _user_explicit_resolution; std::map _markers; std::vector _ratings; - std::string _content_version; + std::vector _content_versions; + dcp::LanguageTag _name_language; + dcp::LanguageTag _audio_language; + dcp::LanguageTag::RegionSubtag _release_territory; + int _version_number; + dcp::Status _status; + std::string _chain; + std::string _distributor; + std::string _facility; + dcp::Luminance _luminance; + std::vector _subtitle_languages; int _state_version;