X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=f5a7c1246c38c2f133f8d82044be6531b26662f8;hb=89115db77729a2c99f1a09ff6a461720e16f889e;hp=9c5f561e65775b978b431bf2541ba8efd546cdb2;hpb=1bff0990433ab0ce588acaef7c589fa623bd998b;p=dcpomatic.git diff --git a/src/lib/film.h b/src/lib/film.h index 9c5f561e6..f5a7c1246 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -22,8 +22,8 @@ * how they should be presented in a DCP. */ -#ifndef DVDOMATIC_FILM_H -#define DVDOMATIC_FILM_H +#ifndef DCPOMATIC_FILM_H +#define DCPOMATIC_FILM_H #include #include @@ -36,9 +36,9 @@ #include "dci_metadata.h" #include "types.h" #include "ffmpeg_content.h" +#include "playlist.h" class DCPContentType; -class Format; class Job; class Filter; class Log; @@ -47,7 +47,6 @@ class AnalyseAudioJob; class ExternalAudioStream; class Content; class Player; -class Playlist; /** @class Film * @brief A representation of some audio and video content, and details of @@ -56,18 +55,19 @@ class Playlist; class Film : public boost::enable_shared_from_this { public: - Film (std::string d, bool must_exist = true); + 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 video_mxf_dir () const; - std::string video_mxf_filename () const; - std::string audio_analysis_path () 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; - void examine_content (boost::shared_ptr); - void analyse_audio (); void send_dcp_to_tms (); void make_dcp (); @@ -83,11 +83,9 @@ public: std::string file (std::string f) const; std::string dir (std::string d) const; - int target_audio_sample_rate () const; - + void read_metadata (); void write_metadata () const; - libdcp::Size cropped_size (libdcp::Size) const; std::string dci_name (bool if_created_now) const; std::string dcp_name (bool if_created_now = false) const; @@ -96,29 +94,32 @@ public: return _dirty; } + libdcp::Size full_frame () const; + bool have_dcp () const; boost::shared_ptr player () const; + boost::shared_ptr playlist () const; + + OutputAudioFrame dcp_audio_frame_rate () const; + + OutputAudioFrame time_to_audio_frames (Time) const; + OutputVideoFrame time_to_video_frames (Time) const; + Time video_frames_to_time (OutputVideoFrame) const; + Time audio_frames_to_time (OutputAudioFrame) const; /* Proxies for some Playlist methods */ - ContentAudioFrame audio_length () const; - int audio_channels () const; - int audio_frame_rate () const; - int64_t audio_channel_layout () const; - bool has_audio () const; - - float video_frame_rate () const; - libdcp::Size video_size () const; - ContentVideoFrame video_length () const; + Playlist::ContentList content () const; + + Time length () const; + bool has_subtitles () const; + OutputVideoFrame best_dcp_video_frame_rate () const; - std::vector ffmpeg_subtitle_streams () const; - boost::optional ffmpeg_subtitle_stream () const; - std::vector ffmpeg_audio_streams () const; - boost::optional ffmpeg_audio_stream () const; + void set_loop (int); + int loop () const; - void set_ffmpeg_subtitle_stream (FFmpegSubtitleStream); - void set_ffmpeg_audio_stream (FFmpegAudioStream); + void set_sequence_video (bool); /** Identifiers for the parts of our state; used for signalling changes. @@ -127,26 +128,20 @@ public: NONE, NAME, USE_DCI_NAME, - TRUST_CONTENT_HEADERS, - /** The content list has changed (i.e. content has been added, moved around or removed) */ + /** The playlist's content list has changed (i.e. content has been added, moved around or removed) */ CONTENT, + LOOP, DCP_CONTENT_TYPE, - FORMAT, - CROP, - FILTERS, + CONTAINER, SCALER, - TRIM_START, - TRIM_END, - AB, - AUDIO_GAIN, - AUDIO_DELAY, WITH_SUBTITLES, SUBTITLE_OFFSET, SUBTITLE_SCALE, COLOUR_LUT, J2K_BANDWIDTH, DCI_METADATA, - DCP_FRAME_RATE + DCP_VIDEO_FRAME_RATE, + MINIMUM_AUDIO_CHANNELS }; @@ -167,34 +162,14 @@ public: return _use_dci_name; } - bool trust_content_headers () const { - boost::mutex::scoped_lock lm (_state_mutex); - return _trust_content_headers; - } - - ContentList content () const { - boost::mutex::scoped_lock lm (_state_mutex); - return _content; - } - DCPContentType const * dcp_content_type () const { boost::mutex::scoped_lock lm (_state_mutex); return _dcp_content_type; } - Format const * format () const { - boost::mutex::scoped_lock lm (_state_mutex); - return _format; - } - - Crop crop () const { + Ratio const * container () const { boost::mutex::scoped_lock lm (_state_mutex); - return _crop; - } - - std::vector filters () const { - boost::mutex::scoped_lock lm (_state_mutex); - return _filters; + return _container; } Scaler const * scaler () const { @@ -202,31 +177,6 @@ public: return _scaler; } - int trim_start () const { - boost::mutex::scoped_lock lm (_state_mutex); - return _trim_start; - } - - int trim_end () const { - boost::mutex::scoped_lock lm (_state_mutex); - return _trim_end; - } - - bool ab () const { - boost::mutex::scoped_lock lm (_state_mutex); - return _ab; - } - - float audio_gain () const { - boost::mutex::scoped_lock lm (_state_mutex); - return _audio_gain; - } - - int audio_delay () const { - boost::mutex::scoped_lock lm (_state_mutex); - return _audio_delay; - } - bool with_subtitles () const { boost::mutex::scoped_lock lm (_state_mutex); return _with_subtitles; @@ -257,9 +207,20 @@ public: return _dci_metadata; } - int dcp_frame_rate () const { + /* XXX: -> "video_frame_rate" */ + int dcp_video_frame_rate () const { + boost::mutex::scoped_lock lm (_state_mutex); + return _dcp_video_frame_rate; + } + + int dcp_audio_channels () const { boost::mutex::scoped_lock lm (_state_mutex); - return _dcp_frame_rate; + return _dcp_audio_channels; + } + + int minimum_audio_channels () const { + boost::mutex::scoped_lock lm (_state_mutex); + return _minimum_audio_channels; } /* SET */ @@ -267,33 +228,21 @@ public: void set_directory (std::string); void set_name (std::string); void set_use_dci_name (bool); - void set_trust_content_headers (bool); + void examine_and_add_content (boost::shared_ptr); void add_content (boost::shared_ptr); void remove_content (boost::shared_ptr); - void move_content_earlier (boost::shared_ptr); - void move_content_later (boost::shared_ptr); void set_dcp_content_type (DCPContentType const *); - void set_format (Format const *); - void set_crop (Crop); - void set_left_crop (int); - void set_right_crop (int); - void set_top_crop (int); - void set_bottom_crop (int); - void set_filters (std::vector); + void set_container (Ratio const *); void set_scaler (Scaler const *); - void set_trim_start (int); - void set_trim_end (int); - void set_ab (bool); - void set_audio_gain (float); - void set_audio_delay (int); 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_frame_rate (int); + void set_dcp_video_frame_rate (int); void set_dci_date_today (); + void set_minimum_audio_channels (int); /** Emitted when some property has of the Film has changed */ mutable boost::signals2::signal Changed; @@ -301,24 +250,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; - void read_metadata (); - void content_changed (boost::weak_ptr, int); - boost::shared_ptr ffmpeg () 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); /** 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; @@ -328,35 +273,16 @@ private: /** Mutex for _directory */ mutable boost::mutex _directory_mutex; - /** Name for DVD-o-matic */ + /** Name for DCP-o-matic */ std::string _name; /** True if a auto-generated DCI-compliant name should be used for our DCP */ bool _use_dci_name; - bool _trust_content_headers; - ContentList _content; /** The type of content that this Film represents (feature, trailer etc.) */ DCPContentType const * _dcp_content_type; - /** The format to present this Film in (flat, scope, etc.) */ - Format const * _format; - /** The crop to apply to the source */ - Crop _crop; - /** Video filters that should be used when generating DCPs */ - std::vector _filters; + /** The container to put this Film in (flat, scope, etc.) */ + Ratio const * _container; /** Scaler algorithm to use */ Scaler const * _scaler; - /** Frames to trim off the start of the DCP */ - int _trim_start; - /** Frames to trim off the end of the DCP */ - int _trim_end; - /** true to create an A/B comparison DCP, where the left half of the image - is the video without any filters or post-processing, and the right half - has the specified filters and post-processing. - */ - bool _ab; - /** Gain to apply to audio in dB */ - float _audio_gain; - /** Delay to apply to audio (positive moves audio later) in milliseconds */ - int _audio_delay; /** True if subtitles should be shown for this film */ bool _with_subtitles; /** y offset for placing subtitles, in source pixels; +ve is further down @@ -375,9 +301,11 @@ private: /** DCI naming stuff */ DCIMetadata _dci_metadata; /** Frames per second to run our DCP at */ - int _dcp_frame_rate; + int _dcp_video_frame_rate; /** The date that we should use in a DCI name */ boost::gregorian::date _dci_date; + int _dcp_audio_channels; + int _minimum_audio_channels; /** true if our state has changed since we last saved it */ mutable bool _dirty;