X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Ffilm.h;h=5aff6f0be31ef1c00176c1e67d7b2aa6de93953b;hb=9b240c6d5d4e2189401498a99f98f41d1b15ed31;hp=5f06a1dc73242c1eb3b1e1757aedf1752d745f42;hpb=edfd92e5554e3389e6456f497f44ca6e866800bf;p=dcpomatic.git diff --git a/src/lib/film.h b/src/lib/film.h index 5f06a1dc7..5aff6f0be 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -33,42 +33,37 @@ #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 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 &); 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; - std::string audio_analysis_path () 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; - void analyse_audio (); void send_dcp_to_tms (); void make_dcp (); @@ -99,7 +94,7 @@ 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; @@ -111,17 +106,12 @@ 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; - void set_loop (int); - int loop () const; - - void set_sequence_video (bool); - /** Identifiers for the parts of our state; used for signalling changes. */ @@ -131,17 +121,18 @@ 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, - SUBTITLE_OFFSET, - SUBTITLE_SCALE, - COLOUR_LUT, J2K_BANDWIDTH, DCI_METADATA, DCP_VIDEO_FRAME_RATE, + DCP_AUDIO_CHANNELS, + /** The setting of _dcp_3d has been changed */ + DCP_3D, + SEQUENCE_VIDEO, }; @@ -172,6 +163,11 @@ public: return _container; } + Resolution resolution () const { + boost::mutex::scoped_lock lm (_state_mutex); + return _resolution; + } + Scaler const * scaler () const { boost::mutex::scoped_lock lm (_state_mutex); return _scaler; @@ -182,21 +178,6 @@ public: return _with_subtitles; } - int subtitle_offset () const { - boost::mutex::scoped_lock lm (_state_mutex); - return _subtitle_offset; - } - - float subtitle_scale () const { - boost::mutex::scoped_lock lm (_state_mutex); - return _subtitle_scale; - } - - int colour_lut () const { - boost::mutex::scoped_lock lm (_state_mutex); - return _colour_lut; - } - int j2k_bandwidth () const { boost::mutex::scoped_lock lm (_state_mutex); return _j2k_bandwidth; @@ -218,6 +199,17 @@ public: return _dcp_audio_channels; } + bool dcp_3d () const { + boost::mutex::scoped_lock lm (_state_mutex); + return _dcp_3d; + } + + bool sequence_video () const { + boost::mutex::scoped_lock lm (_state_mutex); + return _sequence_video; + } + + /* SET */ void set_directory (std::string); @@ -228,15 +220,16 @@ 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_subtitle_offset (int); - void set_subtitle_scale (float); - void set_colour_lut (int); 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_dcp_3d (bool); void set_dci_date_today (); + void set_sequence_video (bool); /** Emitted when some property has of the Film has changed */ mutable boost::signals2::signal Changed; @@ -244,24 +237,20 @@ public: /** Emitted when some property of our content has changed */ mutable boost::signals2::signal, int)> ContentChanged; - boost::signals2::signal AudioAnalysisSucceeded; - /** Current version number of the state file */ static int const state_version; private: - + void signal_changed (Property); - void analyse_audio_finished (); - 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 maybe_add_content (boost::weak_ptr, boost::weak_ptr); /** Log to write to */ boost::shared_ptr _log; - /** Any running AnalyseAudioJob, or 0 */ - boost::shared_ptr _analyse_audio_job; boost::shared_ptr _playlist; /** Complete path to directory containing the film metadata; @@ -279,21 +268,12 @@ 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; - /** y offset for placing subtitles, in source pixels; +ve is further down - the frame, -ve is further up. - */ - int _subtitle_offset; - /** scale factor to apply to subtitles */ - float _subtitle_scale; - /** index of colour LUT to use when converting RGB to XYZ. - * 0: sRGB - * 1: Rec 709 - */ - int _colour_lut; /** bandwidth for J2K files in bits per second */ int _j2k_bandwidth; /** DCI naming stuff */ @@ -303,6 +283,11 @@ private: /** The date that we should use in a DCI name */ boost::gregorian::date _dci_date; int _dcp_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 _dcp_3d; + bool _sequence_video; /** true if our state has changed since we last saved it */ mutable bool _dirty;