X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=809eabdaa9a1257cae980be9ce68a2c0b78e8452;hb=373f010a7f04add1f49169cbaa60cb7ae5f508d4;hp=2bf1a0e901b6bc15cc150eeffdec81b1815f86ce;hpb=39c36075c62ce4c148ce14de0ae7b29d8427be2b;p=dcpomatic.git diff --git a/src/lib/film.h b/src/lib/film.h index 2bf1a0e90..809eabdaa 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -28,45 +28,43 @@ #include #include #include -#include -#include #include #include +#include #include "util.h" -#include "dci_metadata.h" #include "types.h" -#include "ffmpeg_content.h" -#include "playlist.h" +#include "dci_metadata.h" class DCPContentType; -class Job; -class Filter; class Log; -class ExamineContentJob; -class AnalyseAudioJob; -class ExternalAudioStream; class Content; class Player; +class Playlist; +class AudioContent; +class Scaler; +class Screen; /** @class Film + * * @brief A representation of some audio and video 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). */ -class Film : public boost::enable_shared_from_this +class Film : public boost::enable_shared_from_this, public boost::noncopyable { public: - Film (std::string d); - Film (Film const &); + Film (boost::filesystem::path); std::string info_dir () const; - std::string j2c_path (int f, bool t) const; - std::string info_path (int f) const; + std::string j2c_path (int, Eyes, bool) const; + std::string info_path (int, Eyes) const; std::string internal_video_mxf_dir () const; std::string internal_video_mxf_filename () const; boost::filesystem::path audio_analysis_path (boost::shared_ptr) const; - std::string dcp_video_mxf_filename () const; - std::string dcp_audio_mxf_filename () const; + std::string video_mxf_filename () const; + std::string audio_mxf_filename () const; void send_dcp_to_tms (); void make_dcp (); @@ -98,10 +96,10 @@ public: bool have_dcp () const; - boost::shared_ptr player () const; + boost::shared_ptr make_player () const; boost::shared_ptr playlist () const; - OutputAudioFrame dcp_audio_frame_rate () const; + OutputAudioFrame audio_frame_rate () const; OutputAudioFrame time_to_audio_frames (Time) const; OutputVideoFrame time_to_video_frames (Time) const; @@ -110,16 +108,18 @@ public: /* Proxies for some Playlist methods */ - Playlist::ContentList content () const; + ContentList content () const; Time length () const; bool has_subtitles () const; - OutputVideoFrame best_dcp_video_frame_rate () const; + OutputVideoFrame best_video_frame_rate () const; - void set_loop (int); - int loop () const; - - void set_sequence_video (bool); + void make_kdms ( + std::list >, + boost::posix_time::ptime from, + boost::posix_time::ptime until, + std::string directory + ) const; /** Identifiers for the parts of our state; used for signalling changes. @@ -130,82 +130,91 @@ public: USE_DCI_NAME, /** The playlist's content list has changed (i.e. content has been added, moved around or removed) */ CONTENT, - LOOP, DCP_CONTENT_TYPE, CONTAINER, + RESOLUTION, SCALER, WITH_SUBTITLES, - COLOUR_LUT, + ENCRYPTED, J2K_BANDWIDTH, DCI_METADATA, - DCP_VIDEO_FRAME_RATE, - DCP_AUDIO_CHANNELS + VIDEO_FRAME_RATE, + AUDIO_CHANNELS, + /** The setting of _three_d has been changed */ + THREE_D, + SEQUENCE_VIDEO, + INTEROP, }; /* GET */ std::string directory () const { - boost::mutex::scoped_lock lm (_directory_mutex); return _directory; } std::string name () const { - boost::mutex::scoped_lock lm (_state_mutex); return _name; } bool use_dci_name () const { - boost::mutex::scoped_lock lm (_state_mutex); return _use_dci_name; } DCPContentType const * dcp_content_type () const { - boost::mutex::scoped_lock lm (_state_mutex); return _dcp_content_type; } Ratio const * container () const { - boost::mutex::scoped_lock lm (_state_mutex); return _container; } + Resolution resolution () const { + return _resolution; + } + Scaler const * scaler () const { - boost::mutex::scoped_lock lm (_state_mutex); return _scaler; } bool with_subtitles () const { - boost::mutex::scoped_lock lm (_state_mutex); return _with_subtitles; } - int colour_lut () const { - boost::mutex::scoped_lock lm (_state_mutex); - return _colour_lut; + bool encrypted () const { + return _encrypted; } int j2k_bandwidth () const { - boost::mutex::scoped_lock lm (_state_mutex); return _j2k_bandwidth; } DCIMetadata dci_metadata () const { - boost::mutex::scoped_lock lm (_state_mutex); return _dci_metadata; } - /* XXX: -> "video_frame_rate" */ - int dcp_video_frame_rate () const { - boost::mutex::scoped_lock lm (_state_mutex); - return _dcp_video_frame_rate; + /** @return The frame rate of the DCP */ + int video_frame_rate () const { + return _video_frame_rate; + } + + int audio_channels () const { + return _audio_channels; + } + + bool three_d () const { + return _three_d; } - int dcp_audio_channels () const { - boost::mutex::scoped_lock lm (_state_mutex); - return _dcp_audio_channels; + bool sequence_video () const { + return _sequence_video; } + bool interop () const { + return _interop; + } + + /* SET */ void set_directory (std::string); @@ -216,14 +225,18 @@ public: void remove_content (boost::shared_ptr); void set_dcp_content_type (DCPContentType const *); void set_container (Ratio const *); + void set_resolution (Resolution); void set_scaler (Scaler const *); void set_with_subtitles (bool); - void set_colour_lut (int); + void set_encrypted (bool); void set_j2k_bandwidth (int); void set_dci_metadata (DCIMetadata); - void set_dcp_video_frame_rate (int); - void set_dcp_audio_channels (int); + void set_video_frame_rate (int); + void set_audio_channels (int); + void set_three_d (bool); void set_dci_date_today (); + void set_sequence_video (bool); + void set_interop (bool); /** Emitted when some property has of the Film has changed */ mutable boost::signals2::signal Changed; @@ -235,13 +248,13 @@ public: static int const state_version; private: - + void signal_changed (Property); - std::string video_state_identifier () const; + std::string video_identifier () const; void playlist_changed (); void playlist_content_changed (boost::weak_ptr, int); std::string filename_safe_name () const; - void add_content_weak (boost::weak_ptr); + void maybe_add_content (boost::weak_ptr, boost::weak_ptr); /** Log to write to */ boost::shared_ptr _log; @@ -251,8 +264,6 @@ private: * must not be relative. */ std::string _directory; - /** Mutex for _directory */ - mutable boost::mutex _directory_mutex; /** Name for DCP-o-matic */ std::string _name; @@ -262,31 +273,33 @@ private: DCPContentType const * _dcp_content_type; /** The container to put this Film in (flat, scope, etc.) */ Ratio const * _container; + /** DCP resolution (2K or 4K) */ + Resolution _resolution; /** Scaler algorithm to use */ Scaler const * _scaler; /** True if subtitles should be shown for this film */ bool _with_subtitles; - /** index of colour LUT to use when converting RGB to XYZ. - * 0: sRGB - * 1: Rec 709 - */ - int _colour_lut; + bool _encrypted; /** bandwidth for J2K files in bits per second */ int _j2k_bandwidth; /** DCI naming stuff */ DCIMetadata _dci_metadata; /** Frames per second to run our DCP at */ - int _dcp_video_frame_rate; + int _video_frame_rate; /** The date that we should use in a DCI name */ boost::gregorian::date _dci_date; - int _dcp_audio_channels; + /** Number of audio channels to put in the DCP */ + int _audio_channels; + /** If true, the DCP will be written in 3D mode; otherwise in 2D. + This will be regardless of what content is on the playlist. + */ + bool _three_d; + bool _sequence_video; + bool _interop; /** true if our state has changed since we last saved it */ mutable bool _dirty; - /** Mutex for all state except _directory */ - mutable boost::mutex _state_mutex; - friend class paths_test; friend class film_metadata_test; };