X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=64bb159c7ba7a2892c5d07d07b34cdc6e31c81f7;hb=d1957e43ef4a3966e35b9f28b8faf96e925d2310;hp=876d312ae427666c23649aca3db4e5690d0e36f1;hpb=006e38346a8bcdcc889979b7c00802d9bb8fc6f8;p=dcpomatic.git diff --git a/src/lib/film.h b/src/lib/film.h index 876d312ae..64bb159c7 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2019 Carl Hetherington + Copyright (C) 2012-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -36,7 +36,9 @@ #include #include #include +#include #include +#include #include #include #include @@ -55,16 +57,39 @@ class Content; class Playlist; class AudioContent; class AudioProcessor; -class AudioMapping; class Ratio; class Job; -class ScreenKDM; +class Film; struct isdcf_name_test; +struct recover_test_2d_encrypted; + +class InfoFileHandle +{ +public: + ~InfoFileHandle (); + + FILE* get () const { + return _handle; + } + + boost::filesystem::path file () const { + return _file; + } + +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; +}; /** @class Film * - * @brief A representation of some audio and video content, and details of - * how they should be presented in a DCP. + * @brief A representation of some audio, video, subtitle and closed-caption content, + * and details of how they should be presented in a DCP. * * The content of a Film is held in a Playlist (created and managed by the Film). */ @@ -74,15 +99,16 @@ public: explicit Film (boost::optional dir); ~Film (); - boost::filesystem::path info_file (dcpomatic::DCPTimePeriod p) const; + boost::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; void send_dcp_to_tms (); - void make_dcp (); + void make_dcp (bool gui = false, bool check = true); /** @return Logger. * It is safe to call this from any thread. @@ -142,16 +168,6 @@ public: boost::optional disable_forensic_marking_audio ) const; - std::list > make_kdms ( - std::list > screens, - boost::filesystem::path cpl_file, - boost::posix_time::ptime from, - boost::posix_time::ptime until, - dcp::Formulation formulation, - bool disable_forensic_marking_picture, - boost::optional disable_forensic_marking_audio - ) const; - int state_version () const { return _state_version; } @@ -174,6 +190,14 @@ public: bool references_dcp_video () const; bool references_dcp_audio () const; + void set_tolerant (bool t) { + _tolerant = t; + } + + bool tolerant () const { + return _tolerant; + } + /** Identifiers for the parts of our state; used for signalling changes. */ @@ -188,9 +212,7 @@ public: DCP_CONTENT_TYPE, CONTAINER, RESOLUTION, - SIGNED, ENCRYPTED, - KEY, J2K_BANDWIDTH, ISDCF_METADATA, VIDEO_FRAME_RATE, @@ -202,10 +224,10 @@ public: AUDIO_PROCESSOR, REEL_TYPE, REEL_LENGTH, - UPLOAD_AFTER_MAKE_DCP, REENCODE_J2K, MARKERS, - RATINGS + RATINGS, + CONTENT_VERSION }; @@ -235,11 +257,6 @@ public: return _resolution; } - /* signed is a reserved word */ - bool is_signed () const { - return _signed; - } - bool encrypted () const { return _encrypted; } @@ -289,10 +306,6 @@ public: return _reel_length; } - bool upload_after_make_dcp () const { - return _upload_after_make_dcp; - } - std::string context_id () const { return _context_id; } @@ -310,6 +323,10 @@ public: return _ratings; } + std::string content_version () const { + return _content_version; + } + /* SET */ void set_directory (boost::filesystem::path); @@ -322,11 +339,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); @@ -338,11 +353,12 @@ 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); /** Emitted when some property has of the Film is about to change or has changed */ mutable boost::signals2::signal Change; @@ -350,6 +366,11 @@ public: /** Emitted when some property of our content has changed */ 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. + */ + mutable boost::signals2::signal LengthChange; + /** Emitted when we have something important to tell the user */ boost::signals2::signal Message; @@ -359,16 +380,22 @@ public: private: friend struct ::isdcf_name_test; + friend struct ::recover_test_2d_encrypted; template friend class ChangeSignaller; + boost::filesystem::path info_file (dcpomatic::DCPTimePeriod p) const; + void signal_change (ChangeType, Property); void signal_change (ChangeType, int); 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_length_change (); 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; @@ -391,7 +418,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 @@ -418,12 +444,14 @@ 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; int _state_version; @@ -432,9 +460,17 @@ private: /** film being used as a template, or 0 */ boost::shared_ptr _template_film; + /** Be tolerant of errors in content (currently applies to DCP only). + Not saved as state. + */ + bool _tolerant; + + mutable boost::mutex _info_file_mutex; + boost::signals2::scoped_connection _playlist_change_connection; boost::signals2::scoped_connection _playlist_order_changed_connection; boost::signals2::scoped_connection _playlist_content_change_connection; + boost::signals2::scoped_connection _playlist_length_change_connection; std::list _job_connections; std::list _audio_analysis_connections;