X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=afd57b7c24703fe171ecf4bae85a6f467454bdf6;hb=127672223cca569986e35c91265e269ed5a6561c;hp=b2daf0f22b724c327e899f181a89a8210ab1bbf2;hpb=336ada36d701c60a2ddd9b0cf69622f92dfc3afc;p=dcpomatic.git diff --git a/src/lib/film.h b/src/lib/film.h index b2daf0f22..afd57b7c2 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -37,19 +37,22 @@ extern "C" { } #include "dcp_content_type.h" #include "util.h" -#include "stream.h" -#include "trim_action.h" +#include "dci_metadata.h" class Format; class Job; class Filter; class Log; class ExamineContentJob; +class AnalyseAudioJob; +class ExternalAudioStream; +class Content; +class Playlist; /** @class Film - * @brief A representation of a video with sound. + * @brief A representation of a video, maybe with sound. * - * A representation of a piece of video (with sound), including naming, + * A representation of a piece of video (maybe with sound), including naming, * the source content file, and how it should be presented in a DCP. */ class Film : public boost::enable_shared_from_this @@ -59,20 +62,23 @@ public: Film (Film const &); ~Film (); - std::string j2k_dir () const; - std::vector audio_files () const; - std::pair thumb_subtitle (int) 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; - void examine_content (); + void examine_content (boost::shared_ptr); + void analyse_audio (); void send_dcp_to_tms (); - void copy_from_dvd (); - void make_dcp (bool); + void make_dcp (); /** @return Logger. * It is safe to call this from any thread. */ - Log* log () const { + boost::shared_ptr log () const { return _log; } @@ -81,45 +87,43 @@ public: std::string file (std::string f) const; std::string dir (std::string d) const; - std::string content_path () const; - ContentType content_type () const; - - bool content_is_dvd () const; - - std::string thumb_file (int) const; - std::string thumb_base (int) const; - int thumb_frame (int) const; - int target_audio_sample_rate () const; void write_metadata () const; void read_metadata (); - Size cropped_size (Size) const; - boost::optional dcp_length () const; - std::string dci_name () const; - std::string dcp_name () 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; + /** @return true if our state has changed since we last saved it */ bool dirty () const { return _dirty; } - int audio_channels () const; + void set_dci_date_today (); + + bool have_dcp () const; + + boost::shared_ptr playlist () const; + /** Identifiers for the parts of our state; + used for signalling changes. + */ enum Property { NONE, NAME, USE_DCI_NAME, + TRUST_CONTENT_HEADER, CONTENT, DCP_CONTENT_TYPE, FORMAT, CROP, FILTERS, SCALER, - DCP_FRAMES, - DCP_TRIM_ACTION, + TRIM_START, + TRIM_END, DCP_AB, - AUDIO_STREAM, AUDIO_GAIN, AUDIO_DELAY, STILL_DURATION, @@ -127,15 +131,10 @@ public: WITH_SUBTITLES, SUBTITLE_OFFSET, SUBTITLE_SCALE, + COLOUR_LUT, + J2K_BANDWIDTH, DCI_METADATA, - THUMBS, - SIZE, - LENGTH, - AUDIO_SAMPLE_RATE, - HAS_SUBTITLES, - AUDIO_STREAMS, - SUBTITLE_STREAMS, - FRAMES_PER_SECOND, + DCP_FRAME_RATE }; @@ -156,7 +155,12 @@ public: return _use_dci_name; } - std::string content () const { + bool trust_content_header () const { + boost::mutex::scoped_lock lm (_state_mutex); + return _trust_content_header; + } + + std::list > content () const { boost::mutex::scoped_lock lm (_state_mutex); return _content; } @@ -186,14 +190,14 @@ public: return _scaler; } - boost::optional dcp_frames () const { + int trim_start () const { boost::mutex::scoped_lock lm (_state_mutex); - return _dcp_frames; + return _trim_start; } - TrimAction dcp_trim_action () const { + int trim_end () const { boost::mutex::scoped_lock lm (_state_mutex); - return _dcp_trim_action; + return _trim_end; } bool dcp_ab () const { @@ -201,17 +205,6 @@ public: return _dcp_ab; } - int audio_stream_index () const { - boost::mutex::scoped_lock lm (_state_mutex); - return _audio_stream; - } - - AudioStream audio_stream () const { - boost::mutex::scoped_lock lm (_state_mutex); - assert (_audio_stream < int (_audio_streams.size())); - return _audio_streams[_audio_stream]; - } - float audio_gain () const { boost::mutex::scoped_lock lm (_state_mutex); return _audio_gain; @@ -222,22 +215,6 @@ public: return _audio_delay; } - int still_duration () const { - boost::mutex::scoped_lock lm (_state_mutex); - return _still_duration; - } - - int subtitle_stream_index () const { - boost::mutex::scoped_lock lm (_state_mutex); - return _subtitle_stream; - } - - SubtitleStream subtitle_stream () const { - boost::mutex::scoped_lock lm (_state_mutex); - assert (_subtitle_stream < int (_subtitle_streams.size())); - return _subtitle_streams[_subtitle_stream]; - } - bool with_subtitles () const { boost::mutex::scoped_lock lm (_state_mutex); return _with_subtitles; @@ -253,93 +230,33 @@ public: return _subtitle_scale; } - std::string audio_language () const { - boost::mutex::scoped_lock lm (_state_mutex); - return _audio_language; - } - - std::string subtitle_language () const { - boost::mutex::scoped_lock lm (_state_mutex); - return _subtitle_language; - } - - std::string territory () const { - boost::mutex::scoped_lock lm (_state_mutex); - return _territory; - } - - std::string rating () const { - boost::mutex::scoped_lock lm (_state_mutex); - return _rating; - } - - std::string studio () const { - boost::mutex::scoped_lock lm (_state_mutex); - return _studio; - } - - std::string facility () const { - boost::mutex::scoped_lock lm (_state_mutex); - return _facility; - } - - std::string package_type () const { - boost::mutex::scoped_lock lm (_state_mutex); - return _package_type; - } - - std::vector thumbs () const { + int colour_lut () const { boost::mutex::scoped_lock lm (_state_mutex); - return _thumbs; - } - - Size size () const { - boost::mutex::scoped_lock lm (_state_mutex); - return _size; + return _colour_lut; } - boost::optional length () const { + int j2k_bandwidth () const { boost::mutex::scoped_lock lm (_state_mutex); - return _length; - } - - int audio_sample_rate () const { - boost::mutex::scoped_lock lm (_state_mutex); - return _audio_sample_rate; - } - - std::string content_digest () const { - boost::mutex::scoped_lock lm (_state_mutex); - return _content_digest; - } - - bool has_subtitles () const { - boost::mutex::scoped_lock lm (_state_mutex); - return _has_subtitles; + return _j2k_bandwidth; } - std::vector audio_streams () const { + DCIMetadata dci_metadata () const { boost::mutex::scoped_lock lm (_state_mutex); - return _audio_streams; + return _dci_metadata; } - std::vector subtitle_streams () const { + int dcp_frame_rate () const { boost::mutex::scoped_lock lm (_state_mutex); - return _subtitle_streams; - } - - float frames_per_second () const { - boost::mutex::scoped_lock lm (_state_mutex); - return _frames_per_second; + return _dcp_frame_rate; } - /* SET */ void set_directory (std::string); void set_name (std::string); void set_use_dci_name (bool); - virtual void set_content (std::string); + void set_trust_content_header (bool); + void add_content (boost::shared_ptr); void set_dcp_content_type (DCPContentType const *); void set_format (Format const *); void set_crop (Crop); @@ -349,52 +266,41 @@ 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_trim_start (int); + void set_trim_end (int); void set_dcp_ab (bool); - void set_audio_stream (int); void set_audio_gain (float); void set_audio_delay (int); void set_still_duration (int); - void set_subtitle_stream (int); void set_with_subtitles (bool); void set_subtitle_offset (int); void set_subtitle_scale (float); - void set_audio_language (std::string); - void set_subtitle_language (std::string); - void set_territory (std::string); - void set_rating (std::string); - void set_studio (std::string); - void set_facility (std::string); - void set_package_type (std::string); - void set_thumbs (std::vector); - void set_size (Size); - void set_length (int); - void unset_length (); - void set_audio_sample_rate (int); - void set_content_digest (std::string); - void set_has_subtitles (bool); - void set_audio_streams (std::vector); - void set_subtitle_streams (std::vector); - void set_frames_per_second (float); + void set_colour_lut (int); + void set_j2k_bandwidth (int); + void set_dci_metadata (DCIMetadata); + void set_dcp_frame_rate (int); /** Emitted when some property has changed */ mutable boost::signals2::signal Changed; - + + boost::signals2::signal AudioAnalysisSucceeded; + + /** Current version number of the state file */ + static int const state_version; + private: /** Log to write to */ - Log* _log; + boost::shared_ptr _log; - /** Any running ExamineContentJob, or 0 */ - boost::shared_ptr _examine_content_job; + /** Any running AnalyseAudioJob, or 0 */ + boost::shared_ptr _analyse_audio_job; - std::string thumb_file_for_frame (int) const; - std::string thumb_base_for_frame (int) const; void signal_changed (Property); void examine_content_finished (); - + void analyse_audio_finished (); + std::string video_state_identifier () const; + /** Complete path to directory containing the film metadata; * must not be relative. */ @@ -406,10 +312,13 @@ private: std::string _name; /** True if a auto-generated DCI-compliant name should be used for our DCP */ bool _use_dci_name; - /** File or directory containing content; may be relative to our directory - * or an absolute path. + typedef std::list > ContentList; + ContentList _content; + /** If this is true, we will believe the length specified by the content + * file's header; if false, we will run through the whole content file + * the first time we see it in order to obtain the length. */ - std::string _content; + bool _trust_content_header; /** 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.) */ @@ -420,25 +329,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 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 _dcp_ab; - /** An index into our _audio_streams vector for the stream to use for audio, or -1 if there is none */ - int _audio_stream; /** Gain to apply to audio in dB */ float _audio_gain; /** Delay to apply to audio (positive moves audio later) in milliseconds */ int _audio_delay; - /** Duration to make still-sourced films (in seconds) */ - int _still_duration; - /** An index into our _subtitle_streams vector for the stream to use for subtitles, or -1 if there is none */ - int _subtitle_stream; /** True if subtitles should be shown for this film */ bool _with_subtitles; /** y offset for placing subtitles, in source pixels; +ve is further down @@ -447,43 +350,29 @@ private: int _subtitle_offset; /** scale factor to apply to subtitles */ float _subtitle_scale; - - /* DCI naming stuff */ - std::string _audio_language; - std::string _subtitle_language; - std::string _territory; - std::string _rating; - std::string _studio; - std::string _facility; - std::string _package_type; - - /* Data which are cached to speed things up */ - - /** Vector of frame indices for each of our `thumbnails' */ - 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; - /** Sample rate of the source audio, in Hz */ - int _audio_sample_rate; - /** MD5 digest of our content file */ - std::string _content_digest; - /** true if the source has subtitles */ - bool _has_subtitles; - /** the audio streams that the source has */ - std::vector _audio_streams; - /** the subtitle streams that the source has */ - std::vector _subtitle_streams; - /** Frames per second of the source */ - float _frames_per_second; - + /** 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 */ + DCIMetadata _dci_metadata; + /** The date that we should use in a DCI name */ + boost::gregorian::date _dci_date; + /** Frames per second to run our DCP at */ + int _dcp_frame_rate; + + /** 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; }; #endif