X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fvideo_content.h;h=b478666bb0ae28462ccac08e371bc27060094791;hp=30dcac231ffef8fe59455454a88d98b2f8792338;hb=15a83d720780d58f905d40f8493cdcb86596eaee;hpb=58f0530b1687673ea6e24a083063c3fdf2bff0b2 diff --git a/src/lib/video_content.h b/src/lib/video_content.h index 30dcac231..b478666bb 100644 --- a/src/lib/video_content.h +++ b/src/lib/video_content.h @@ -1,104 +1,108 @@ /* - Copyright (C) 2013-2014 Carl Hetherington + Copyright (C) 2013-2020 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ #ifndef DCPOMATIC_VIDEO_CONTENT_H #define DCPOMATIC_VIDEO_CONTENT_H -#include "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; +class Film; +class Content; class VideoContentProperty { public: - static int const VIDEO_SIZE; - static int const VIDEO_FRAME_RATE; - static int const VIDEO_FRAME_TYPE; - static int const VIDEO_CROP; - static int const VIDEO_SCALE; + static int const USE; + static int const SIZE; + static int const FRAME_TYPE; + static int const CROP; + static int const SCALE; static int const COLOUR_CONVERSION; - static int const VIDEO_FADE_IN; - static int const VIDEO_FADE_OUT; + 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 virtual Content +class VideoContent : public ContentPart, public boost::enable_shared_from_this { public: - typedef int Frame; - - VideoContent (boost::shared_ptr); - VideoContent (boost::shared_ptr, DCPTime, ContentTime); - VideoContent (boost::shared_ptr, boost::filesystem::path); - VideoContent (boost::shared_ptr, cxml::ConstNodePtr, int); - VideoContent (boost::shared_ptr, std::vector >); + explicit VideoContent (Content* parent); + VideoContent (Content* parent, std::vector >); void as_xml (xmlpp::Node *) const; std::string technical_summary () const; - virtual std::string information () const; - virtual std::string identifier () const; + std::string identifier () const; + void take_settings_from (boost::shared_ptr c); - ContentTime video_length () const { + Frame length () const { boost::mutex::scoped_lock lm (_mutex); - return _video_length; + return _length; } - ContentTime video_length_after_3d_combine () const { + Frame length_after_3d_combine () const { boost::mutex::scoped_lock lm (_mutex); - if (_video_frame_type == VIDEO_FRAME_TYPE_3D_ALTERNATE) { - return ContentTime (_video_length.get() / 2); + if (_frame_type == VIDEO_FRAME_TYPE_3D_ALTERNATE) { + return _length / 2; } - - return _video_length; - } - dcp::Size video_size () const { - boost::mutex::scoped_lock lm (_mutex); - return _video_size; + return _length; } - - float video_frame_rate () const { + + dcp::Size size () const { boost::mutex::scoped_lock lm (_mutex); - return _video_frame_rate; + return _size; } - void set_video_frame_type (VideoFrameType); - void set_video_frame_rate (float); + void set_frame_type (VideoFrameType); void set_left_crop (int); void set_right_crop (int); 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_default_colour_conversion (bool signal = true); - void set_fade_in (ContentTime); - void set_fade_out (ContentTime); - - VideoFrameType video_frame_type () const { + 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 _video_frame_type; + return _frame_type; } Crop crop () const { @@ -126,69 +130,109 @@ 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; } - boost::optional sample_aspect_ratio () const { + boost::optional sample_aspect_ratio () const { boost::mutex::scoped_lock lm (_mutex); return _sample_aspect_ratio; } - ContentTime fade_in () const { + bool yuv () const { + boost::mutex::scoped_lock lm (_mutex); + return _yuv; + } + + Frame fade_in () const { boost::mutex::scoped_lock lm (_mutex); return _fade_in; } - ContentTime fade_out () const { + Frame fade_out () const { boost::mutex::scoped_lock lm (_mutex); return _fade_out; } - - dcp::Size video_size_after_3d_split () const; - dcp::Size video_size_after_crop () const; - ContentTime dcp_time_to_content_time (DCPTime) const; + 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 (VideoFrame) const; + boost::optional fade (boost::shared_ptr film, Frame) const; - void scale_and_crop_to_fit_width (); - void scale_and_crop_to_fit_height (); + std::string processing_description (boost::shared_ptr film); - std::string processing_description () const; + void set_length (Frame); -protected: - void take_from_video_examiner (boost::shared_ptr); + void take_from_examiner (boost::shared_ptr); + void add_properties (std::list &) const; - ContentTime _video_length; - float _video_frame_rate; + void modify_position (boost::shared_ptr film, dcpomatic::DCPTime& pos) const; + void modify_trim_start (dcpomatic::ContentTime& pos) const; + + static boost::shared_ptr from_xml (Content* parent, cxml::ConstNodePtr, int); private: + friend struct ffmpeg_pts_offset_test; 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 (); - - dcp::Size _video_size; - VideoFrameType _video_frame_type; - Crop _crop; - VideoContentScale _scale; + + bool _use; + Frame _length; boost::optional _colour_conversion; - /** Sample aspect ratio obtained from the content file's header, - if there is one. - */ - boost::optional _sample_aspect_ratio; - ContentTime _fade_in; - ContentTime _fade_out; + dcp::Size _size; + VideoFrameType _frame_type; + Crop _crop; + /** 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