X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fvideo_content.h;h=d5ba38022b883e16facf06094681994e1b6324e6;hp=aa541fc32b85bd05f870d7a0776ee5a3427e54e5;hb=422be0eece2bf6ee80db1d3c21553cd82efff789;hpb=9af90d8c2c88b86a2d6b7b9c4e7096e0ba4a4cf0 diff --git a/src/lib/video_content.h b/src/lib/video_content.h index aa541fc32..d5ba38022 100644 --- a/src/lib/video_content.h +++ b/src/lib/video_content.h @@ -1,96 +1,83 @@ /* - Copyright (C) 2013-2014 Carl Hetherington + Copyright (C) 2013-2016 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 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; }; -class VideoContent : public virtual Content +class VideoContent : public ContentPart, public boost::enable_shared_from_this { public: - VideoContent (boost::shared_ptr); - VideoContent (boost::shared_ptr, DCPTime, Frame); - VideoContent (boost::shared_ptr, boost::filesystem::path); - VideoContent (boost::shared_ptr, cxml::ConstNodePtr, int); - VideoContent (boost::shared_ptr, std::vector >); + VideoContent (Content* parent); + VideoContent (Content* parent, std::vector >); void as_xml (xmlpp::Node *) const; std::string technical_summary () const; - virtual std::string identifier () const; - - virtual void set_default_colour_conversion (); + std::string identifier () const; - /** @return points at which to split this content when - * REELTYPE_BY_VIDEO_CONTENT is in use. - */ - virtual std::list reel_split_points () const; - - Frame video_length () const { + Frame length () const { boost::mutex::scoped_lock lm (_mutex); - return _video_length; + return _length; } - Frame 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 _video_length / 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; } - double video_frame_rate () const; - - /** @return true if this content has a specific video frame rate, false - * if it should use the DCP's rate. - */ - bool has_own_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 (double); + void set_frame_type (VideoFrameType); void set_left_crop (int); void set_right_crop (int); @@ -104,9 +91,9 @@ public: void set_fade_in (Frame); void set_fade_out (Frame); - VideoFrameType video_frame_type () const { + VideoFrameType frame_type () const { boost::mutex::scoped_lock lm (_mutex); - return _video_frame_type; + return _frame_type; } Crop crop () const { @@ -150,6 +137,11 @@ public: return _sample_aspect_ratio; } + bool yuv () const { + boost::mutex::scoped_lock lm (_mutex); + return _yuv; + } + Frame fade_in () const { boost::mutex::scoped_lock lm (_mutex); return _fade_in; @@ -160,10 +152,8 @@ public: 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; + dcp::Size size_after_3d_split () const; + dcp::Size size_after_crop () const; boost::optional fade (Frame) const; @@ -172,31 +162,32 @@ public: std::string processing_description () const; -protected: - void take_from_video_examiner (boost::shared_ptr); - void add_properties (std::list > &) const; + void set_length (Frame); - Frame _video_length; - /** Video frame rate, or not set if this content should use the DCP's frame rate */ - boost::optional _video_frame_rate; - boost::optional _colour_conversion; + void take_from_examiner (boost::shared_ptr); + void add_properties (std::list &) 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; + VideoContent (Content* parent, cxml::ConstNodePtr, int); void setup_default_colour_conversion (); - dcp::Size _video_size; - VideoFrameType _video_frame_type; + Frame _length; + boost::optional _colour_conversion; + dcp::Size _size; + VideoFrameType _frame_type; Crop _crop; VideoContentScale _scale; - /** Sample aspect ratio obtained from the content file's header, - if there is one. - */ + /** Sample aspect ratio obtained from the content file's header, if there is one */ boost::optional _sample_aspect_ratio; + bool _yuv; Frame _fade_in; Frame _fade_out; };