X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=168a5e0b207ce3f350549ba61e3bfb6b6fb89015;hb=f89ef49deefe91e2b1972b54ee07bfc22a22f303;hp=b2daf0f22b724c327e899f181a89a8210ab1bbf2;hpb=336ada36d701c60a2ddd9b0cf69622f92dfc3afc;p=dcpomatic.git diff --git a/src/lib/film.h b/src/lib/film.h index b2daf0f22..168a5e0b2 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -38,7 +38,6 @@ extern "C" { #include "dcp_content_type.h" #include "util.h" #include "stream.h" -#include "trim_action.h" class Format; class Job; @@ -88,7 +87,7 @@ public: std::string thumb_file (int) const; std::string thumb_base (int) const; - int thumb_frame (int) const; + SourceFrame thumb_frame (int) const; int target_audio_sample_rate () const; @@ -96,7 +95,7 @@ public: void read_metadata (); Size cropped_size (Size) const; - boost::optional dcp_length () const; + boost::optional dcp_length () const; std::string dci_name () const; std::string dcp_name () const; @@ -106,6 +105,8 @@ public: int audio_channels () const; + void set_dci_date_today (); + enum Property { NONE, NAME, @@ -116,10 +117,12 @@ public: CROP, FILTERS, SCALER, - DCP_FRAMES, - DCP_TRIM_ACTION, + DCP_TRIM_START, + DCP_TRIM_END, DCP_AB, + USE_SOURCE_AUDIO, AUDIO_STREAM, + EXTERNAL_AUDIO, AUDIO_GAIN, AUDIO_DELAY, STILL_DURATION, @@ -186,21 +189,26 @@ public: return _scaler; } - boost::optional dcp_frames () const { + SourceFrame dcp_trim_start () const { boost::mutex::scoped_lock lm (_state_mutex); - return _dcp_frames; + return _dcp_trim_start; } - TrimAction dcp_trim_action () const { + SourceFrame dcp_trim_end () const { boost::mutex::scoped_lock lm (_state_mutex); - return _dcp_trim_action; + return _dcp_trim_end; } - + bool dcp_ab () const { boost::mutex::scoped_lock lm (_state_mutex); return _dcp_ab; } + bool use_source_audio () const { + boost::mutex::scoped_lock lm (_state_mutex); + return _use_source_audio; + } + int audio_stream_index () const { boost::mutex::scoped_lock lm (_state_mutex); return _audio_stream; @@ -211,6 +219,11 @@ public: assert (_audio_stream < int (_audio_streams.size())); return _audio_streams[_audio_stream]; } + + std::vector external_audio () const { + boost::mutex::scoped_lock lm (_state_mutex); + return _external_audio; + } float audio_gain () const { boost::mutex::scoped_lock lm (_state_mutex); @@ -288,7 +301,7 @@ public: return _package_type; } - std::vector thumbs () const { + std::vector thumbs () const { boost::mutex::scoped_lock lm (_state_mutex); return _thumbs; } @@ -298,7 +311,7 @@ public: return _size; } - boost::optional length () const { + boost::optional length () const { boost::mutex::scoped_lock lm (_state_mutex); return _length; } @@ -349,11 +362,12 @@ public: void set_bottom_crop (int); void set_filters (std::vector); void set_scaler (Scaler const *); - void set_dcp_frames (int); - void unset_dcp_frames (); - void set_dcp_trim_action (TrimAction); + void set_dcp_trim_start (int); + void set_dcp_trim_end (int); void set_dcp_ab (bool); + void set_use_source_audio (bool); void set_audio_stream (int); + void set_external_audio (std::vector); void set_audio_gain (float); void set_audio_delay (int); void set_still_duration (int); @@ -368,9 +382,9 @@ public: void set_studio (std::string); void set_facility (std::string); void set_package_type (std::string); - void set_thumbs (std::vector); + void set_thumbs (std::vector); void set_size (Size); - void set_length (int); + void set_length (SourceFrame); void unset_length (); void set_audio_sample_rate (int); void set_content_digest (std::string); @@ -390,11 +404,14 @@ private: /** Any running ExamineContentJob, or 0 */ boost::shared_ptr _examine_content_job; - std::string thumb_file_for_frame (int) const; - std::string thumb_base_for_frame (int) const; + /** The date that we should use in a DCI name */ + boost::gregorian::date _dci_date; + + std::string thumb_file_for_frame (SourceFrame) const; + std::string thumb_base_for_frame (SourceFrame) const; void signal_changed (Property); void examine_content_finished (); - + /** Complete path to directory containing the film metadata; * must not be relative. */ @@ -420,17 +437,19 @@ private: std::vector _filters; /** Scaler algorithm to use */ Scaler const * _scaler; - /** Maximum number of frames to put in the DCP, if applicable */ - boost::optional _dcp_frames; - /** What to do with audio when trimming DCPs */ - TrimAction _dcp_trim_action; + /** Frames to trim off the start of the source */ + SourceFrame _dcp_trim_start; + /** Frames to trim off the end of the source */ + SourceFrame _dcp_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 _dcp_ab; + bool _use_source_audio; /** An index into our _audio_streams vector for the stream to use for audio, or -1 if there is none */ int _audio_stream; + std::vector _external_audio; /** Gain to apply to audio in dB */ float _audio_gain; /** Delay to apply to audio (positive moves audio later) in milliseconds */ @@ -460,11 +479,11 @@ private: /* Data which are cached to speed things up */ /** Vector of frame indices for each of our `thumbnails' */ - std::vector _thumbs; + std::vector _thumbs; /** Size, in pixels, of the source (ignoring cropping) */ Size _size; /** Actual length of the source (in video frames) from examining it */ - boost::optional _length; + boost::optional _length; /** Sample rate of the source audio, in Hz */ int _audio_sample_rate; /** MD5 digest of our content file */