X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.h;h=22a6090e7a62454cac16ae25fe9be932b4c52df6;hb=8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8;hp=623a1858bc48c6031b602c05bdb27f5814de8eb0;hpb=1a693725f9a8cc6ba58f65b2f1ef03255d295f23;p=dcpomatic.git diff --git a/src/lib/video_content.h b/src/lib/video_content.h index 623a1858b..22a6090e7 100644 --- a/src/lib/video_content.h +++ b/src/lib/video_content.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2016 Carl Hetherington + Copyright (C) 2013-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -22,14 +22,11 @@ #define DCPOMATIC_VIDEO_CONTENT_H #include "colour_conversion.h" -#include "video_content_scale.h" #include "dcpomatic_time.h" #include "user_property.h" #include "types.h" #include "content_part.h" #include -#include -#include class VideoExaminer; class Ratio; @@ -39,6 +36,7 @@ class Content; class VideoContentProperty { public: + static int const USE; static int const SIZE; static int const FRAME_TYPE; static int const CROP; @@ -46,18 +44,22 @@ public: static int const COLOUR_CONVERSION; static int const FADE_IN; static int const FADE_OUT; + static int const RANGE; + static int const CUSTOM_RATIO; + static int const CUSTOM_SIZE; }; -class VideoContent : public ContentPart, public boost::enable_shared_from_this +class VideoContent : public ContentPart, public std::enable_shared_from_this { public: - VideoContent (Content* parent); - VideoContent (Content* parent, std::vector >); + explicit VideoContent (Content* parent); + VideoContent (Content* parent, cxml::ConstNodePtr, int); + VideoContent (Content* parent, std::vector >); void as_xml (xmlpp::Node *) const; std::string technical_summary () const; std::string identifier () const; - void use_template (boost::shared_ptr c); + void take_settings_from (std::shared_ptr c); Frame length () const { boost::mutex::scoped_lock lm (_mutex); @@ -66,7 +68,7 @@ public: Frame length_after_3d_combine () const { boost::mutex::scoped_lock lm (_mutex); - if (_frame_type == VIDEO_FRAME_TYPE_3D_ALTERNATE) { + if (_frame_type == VideoFrameType::THREE_D_ALTERNATE) { return _length / 2; } @@ -85,13 +87,18 @@ public: void set_top_crop (int); void set_bottom_crop (int); - void set_scale (VideoContentScale); + void set_custom_ratio (boost::optional ratio); + void set_custom_size (boost::optional size); + void unset_colour_conversion (); void set_colour_conversion (ColourConversion); void set_fade_in (Frame); void set_fade_out (Frame); + void set_range (VideoRange); + void set_use (bool); + VideoFrameType frame_type () const { boost::mutex::scoped_lock lm (_mutex); return _frame_type; @@ -122,12 +129,19 @@ public: return _crop.bottom; } - /** @return Description of how to scale this content (if indeed it should be scaled) */ - VideoContentScale scale () const { + + boost::optional custom_ratio () const { boost::mutex::scoped_lock lm (_mutex); - return _scale; + return _custom_ratio; } + + boost::optional custom_size () const { + boost::mutex::scoped_lock lm (_mutex); + return _custom_size; + } + + boost::optional colour_conversion () const { boost::mutex::scoped_lock lm (_mutex); return _colour_conversion; @@ -153,22 +167,34 @@ public: return _fade_out; } + VideoRange range () const { + boost::mutex::scoped_lock lm (_mutex); + return _range; + } + + bool use () const { + boost::mutex::scoped_lock lm (_mutex); + return _use; + } + + /* XXX: names for these? */ dcp::Size size_after_3d_split () const; dcp::Size size_after_crop () const; + dcp::Size scaled_size (dcp::Size container_size); - boost::optional fade (Frame) const; - - void scale_and_crop_to_fit_width (); - void scale_and_crop_to_fit_height (); + boost::optional fade (std::shared_ptr film, Frame) const; - std::string processing_description () const; + std::string processing_description (std::shared_ptr film); void set_length (Frame); - void take_from_examiner (boost::shared_ptr); + void take_from_examiner (std::shared_ptr); void add_properties (std::list &) const; - static boost::shared_ptr from_xml (Content* parent, cxml::ConstNodePtr, int); + void modify_position (std::shared_ptr film, dcpomatic::DCPTime& pos) const; + void modify_trim_start (dcpomatic::ContentTime& pos) const; + + static std::shared_ptr from_xml (Content* parent, cxml::ConstNodePtr, int); private: @@ -176,21 +202,35 @@ private: friend struct best_dcp_frame_rate_test_single; friend struct best_dcp_frame_rate_test_double; friend struct audio_sampling_rate_test; + friend struct scaled_size_test1; + friend struct scaled_size_test2; + friend struct scaled_size_legacy_test; - VideoContent (Content* parent, cxml::ConstNodePtr, int); void setup_default_colour_conversion (); + bool _use; Frame _length; boost::optional _colour_conversion; dcp::Size _size; VideoFrameType _frame_type; Crop _crop; - VideoContentScale _scale; + /** ratio to scale cropped image to (or none to guess); i.e. if set, scale to _custom_ratio:1 */ + boost::optional _custom_ratio; + /** size to scale cropped image to; only used if _custom_ratio is none */ + boost::optional _custom_size; + /** ratio obtained from an older metadata file; will be used to set up + * _custom_{ratio,size} (or not, if not required) on the first call to + * scaled_size() + */ + boost::optional _legacy_ratio; /** Sample aspect ratio obtained from the content file's header, if there is one */ boost::optional _sample_aspect_ratio; bool _yuv; + /** fade in time in content frames */ Frame _fade_in; + /** fade out time in content frames */ Frame _fade_out; + VideoRange _range; }; #endif