X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=6828df21aa366cad9e7506cedad0b5925a9d2dff;hp=5bf6c55f7b12a7898dd6afe62f24e3b7b9886f97;hb=9b946fc5250eff5a5dd4a661896916fcd5d9bd4b;hpb=476ec5c7e33314b9a0a073e144c9ca996a179321 diff --git a/src/lib/film.h b/src/lib/film.h index 5bf6c55f7..6828df21a 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -32,10 +32,10 @@ #include "frame_rate_change.h" #include "signaller.h" #include "dcp_text_track.h" +#include #include #include #include -#include #include #include #include @@ -61,10 +61,13 @@ class Ratio; class Job; class Film; struct isdcf_name_test; +struct recover_test_2d_encrypted; +struct atmos_encrypted_passthrough_test; class InfoFileHandle { public: + InfoFileHandle (boost::mutex& mutex, boost::filesystem::path file, bool read); ~InfoFileHandle (); FILE* get () const { @@ -78,8 +81,6 @@ public: private: friend class Film; - InfoFileHandle (boost::mutex& mutex, boost::filesystem::path file, bool read); - boost::mutex::scoped_lock _lock; FILE* _handle; boost::filesystem::path _file; @@ -92,19 +93,19 @@ private: * * The content of a Film is held in a Playlist (created and managed by the Film). */ -class Film : public boost::enable_shared_from_this, public Signaller, public boost::noncopyable +class Film : public std::enable_shared_from_this, public Signaller, public boost::noncopyable { public: explicit Film (boost::optional dir); ~Film (); - boost::shared_ptr info_file_handle (dcpomatic::DCPTimePeriod period, bool read) const; + std::shared_ptr info_file_handle (dcpomatic::DCPTimePeriod period, bool read) const; boost::filesystem::path j2c_path (int, Frame, Eyes, bool) const; boost::filesystem::path internal_video_asset_dir () const; boost::filesystem::path internal_video_asset_filename (dcpomatic::DCPTimePeriod p) const; - boost::filesystem::path audio_analysis_path (boost::shared_ptr) const; - boost::filesystem::path subtitle_analysis_path (boost::shared_ptr) const; + boost::filesystem::path audio_analysis_path (std::shared_ptr) const; + boost::filesystem::path subtitle_analysis_path (std::shared_ptr) const; void send_dcp_to_tms (); void make_dcp (bool gui = false, bool check = true); @@ -112,7 +113,7 @@ public: /** @return Logger. * It is safe to call this from any thread. */ - boost::shared_ptr log () const { + std::shared_ptr log () const { return _log; } @@ -124,9 +125,9 @@ public: void write_metadata () const; void write_metadata (boost::filesystem::path path) const; void write_template (boost::filesystem::path path) const; - boost::shared_ptr metadata (bool with_content_paths = true) const; + std::shared_ptr metadata (bool with_content_paths = true) const; - void copy_from (boost::shared_ptr film); + void copy_from (std::shared_ptr film); std::string isdcf_name (bool if_created_now) const; std::string dcp_name (bool if_created_now = false) const; @@ -138,6 +139,7 @@ public: dcp::Size full_frame () const; dcp::Size frame_size () const; + dcp::Size active_area () const; std::vector cpls () const; @@ -171,13 +173,11 @@ 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); - boost::shared_ptr playlist () const { + std::shared_ptr playlist () const { return _playlist; } @@ -188,6 +188,7 @@ public: bool references_dcp_video () const; bool references_dcp_audio () const; + bool contains_atmos_content () const; void set_tolerant (bool t) { _tolerant = t; @@ -211,9 +212,7 @@ public: DCP_CONTENT_TYPE, CONTAINER, RESOLUTION, - SIGNED, ENCRYPTED, - KEY, J2K_BANDWIDTH, ISDCF_METADATA, VIDEO_FRAME_RATE, @@ -225,11 +224,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 }; @@ -259,11 +267,6 @@ public: return _resolution; } - /* signed is a reserved word */ - bool is_signed () const { - return _signed; - } - bool encrypted () const { return _encrypted; } @@ -313,10 +316,6 @@ public: return _reel_length; } - bool upload_after_make_dcp () const { - return _upload_after_make_dcp; - } - std::string context_id () const { return _context_id; } @@ -325,8 +324,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; } @@ -334,8 +335,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 */ @@ -343,18 +384,16 @@ public: void set_directory (boost::filesystem::path); void set_name (std::string); void set_use_isdcf_name (bool); - void examine_and_add_content (boost::shared_ptr content, bool disable_audio_analysis = false); - void add_content (boost::shared_ptr); - void remove_content (boost::shared_ptr); + void examine_and_add_content (std::shared_ptr content, bool disable_audio_analysis = false); + void add_content (std::shared_ptr); + void remove_content (std::shared_ptr); void remove_content (ContentList); - void move_content_earlier (boost::shared_ptr); - void move_content_later (boost::shared_ptr); + void move_content_earlier (std::shared_ptr); + void move_content_later (std::shared_ptr); 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); @@ -366,19 +405,32 @@ 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; /** Emitted when some property of our content has changed */ - mutable boost::signals2::signal, int, bool)> ContentChange; + mutable boost::signals2::signal, int, bool)> ContentChange; /** Emitted when the film's length might have changed; this is not like a normal property as its value is derived from the playlist, so it has its own signal. @@ -394,6 +446,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; @@ -403,9 +457,9 @@ private: std::string video_identifier () const; void playlist_change (ChangeType); void playlist_order_changed (); - void playlist_content_change (ChangeType type, boost::weak_ptr, int, bool frequent); + void playlist_content_change (ChangeType type, std::weak_ptr, int, bool frequent); void playlist_length_change (); - void maybe_add_content (boost::weak_ptr, boost::weak_ptr, bool disable_audio_analysis); + void maybe_add_content (std::weak_ptr, std::weak_ptr, bool disable_audio_analysis); void audio_analysis_finished (); void check_settings_consistency (); void maybe_set_container_and_resolution (); @@ -413,8 +467,8 @@ private: static std::string const metadata_file; /** Log to write to */ - boost::shared_ptr _log; - boost::shared_ptr _playlist; + std::shared_ptr _log; + std::shared_ptr _playlist; /** Complete path to directory containing the film metadata; * must not be relative. @@ -431,7 +485,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,7 +511,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; @@ -466,14 +518,24 @@ 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; /** true if our state has changed since we last saved it */ mutable bool _dirty; /** film being used as a template, or 0 */ - boost::shared_ptr _template_film; + std::shared_ptr _template_film; /** Be tolerant of errors in content (currently applies to DCP only). Not saved as state.