X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=66bcce80628830db9d977a1c4dcd3b42ecb7da7e;hb=4f4a86fb43b00d251e44a7f4463fcb390c605212;hp=40d366f8f68c8a331ee7840c9bf37ee944515f89;hpb=47e29203daec51d313ed8ab8ef759752bce18d45;p=dcpomatic.git diff --git a/src/lib/film.h b/src/lib/film.h index 40d366f8f..66bcce806 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; @@ -189,6 +192,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 +216,7 @@ public: DCP_CONTENT_TYPE, CONTAINER, RESOLUTION, - SIGNED, ENCRYPTED, - KEY, J2K_BANDWIDTH, ISDCF_METADATA, VIDEO_FRAME_RATE, @@ -226,11 +228,19 @@ 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 }; @@ -260,11 +270,6 @@ public: return _resolution; } - /* signed is a reserved word */ - bool is_signed () const { - return _signed; - } - bool encrypted () const { return _encrypted; } @@ -314,10 +319,6 @@ public: return _reel_length; } - bool upload_after_make_dcp () const { - return _upload_after_make_dcp; - } - std::string context_id () const { return _context_id; } @@ -335,8 +336,44 @@ 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; } /* SET */ @@ -351,11 +388,9 @@ public: void move_content_earlier (boost::shared_ptr); void move_content_later (boost::shared_ptr); void set_dcp_content_type (DCPContentType const *); - void set_container (Ratio const *); - void set_resolution (Resolution); - void set_signed (bool); + void set_container (Ratio const *, bool user_explicit = true); + void set_resolution (Resolution, bool user_explicit = true); 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 +402,21 @@ 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); /** Emitted when some property has of the Film is about to change or has changed */ mutable boost::signals2::signal Change; @@ -395,6 +438,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; @@ -409,6 +454,7 @@ private: void maybe_add_content (boost::weak_ptr, boost::weak_ptr, bool disable_audio_analysis); void audio_analysis_finished (); void check_settings_consistency (); + void maybe_set_container_and_resolution (); static std::string const metadata_file; @@ -431,7 +477,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 @@ -458,13 +503,23 @@ 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; + bool _user_explicit_container; + 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; int _state_version;