X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fvideo_content.h;h=7ecc2813a067cf70f83509f5f1fe6aa23bf755ce;hp=8313c73eeb8a32b8d65a79e2caa6d22466966042;hb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;hpb=4e411ea97b4dab8a5fa282d1d4cf7971ef1e24ad diff --git a/src/lib/video_content.h b/src/lib/video_content.h index 8313c73ee..7ecc2813a 100644 --- a/src/lib/video_content.h +++ b/src/lib/video_content.h @@ -1,121 +1,84 @@ /* - 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 FADE_IN; + static int const FADE_OUT; }; -class VideoContentScale +class VideoContent : public ContentPart, public boost::enable_shared_from_this { public: - VideoContentScale (); - VideoContentScale (Ratio const *); - VideoContentScale (bool); - VideoContentScale (cxml::NodePtr); - - dcp::Size size (boost::shared_ptr, dcp::Size, dcp::Size) const; - std::string id () const; - std::string name () const; - void as_xml (xmlpp::Node *) const; - - Ratio const * ratio () const { - return _ratio; - } - - bool scale () const { - return _scale; - } - - static void setup_scales (); - static std::vector all () { - return _scales; - } - -private: - /** a ratio to stretch the content to, or 0 for no stretch */ - Ratio const * _ratio; - /** true if we want to scale the content */ - bool _scale; - - static std::vector _scales; -}; - -bool operator== (VideoContentScale const & a, VideoContentScale const & b); -bool operator!= (VideoContentScale const & a, VideoContentScale const & b); - -class VideoContent : public virtual Content -{ -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_frame_type (VideoFrameType); void set_left_crop (int); void set_right_crop (int); @@ -123,11 +86,15 @@ public: void set_bottom_crop (int); void set_scale (VideoContentScale); + void unset_colour_conversion (); void set_colour_conversion (ColourConversion); - - VideoFrameType video_frame_type () const { + + void set_fade_in (Frame); + void set_fade_out (Frame); + + VideoFrameType frame_type () const { boost::mutex::scoped_lock lm (_mutex); - return _video_frame_type; + return _frame_type; } Crop crop () const { @@ -161,35 +128,72 @@ public: return _scale; } - ColourConversion colour_conversion () const { + boost::optional colour_conversion () const { boost::mutex::scoped_lock lm (_mutex); return _colour_conversion; } - dcp::Size video_size_after_3d_split () const; - dcp::Size video_size_after_crop () const; + boost::optional sample_aspect_ratio () const { + boost::mutex::scoped_lock lm (_mutex); + 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; + } + + Frame fade_out () const { + boost::mutex::scoped_lock lm (_mutex); + return _fade_out; + } + + dcp::Size size_after_3d_split () const; + dcp::Size size_after_crop () const; + + boost::optional fade (boost::shared_ptr film, Frame) const; - ContentTime dcp_time_to_content_time (DCPTime) const; + void scale_and_crop_to_fit_width (boost::shared_ptr film); + void scale_and_crop_to_fit_height (boost::shared_ptr film); -protected: - void take_from_video_examiner (boost::shared_ptr); + std::string processing_description (boost::shared_ptr film) const; - ContentTime _video_length; - float _video_frame_rate; + void set_length (Frame); + + void take_from_examiner (boost::shared_ptr); + void add_properties (std::list &) const; + + void modify_position (boost::shared_ptr film, DCPTime& pos) const; + void modify_trim_start (ContentTime& pos) const; + + static boost::shared_ptr from_xml (Content* parent, cxml::ConstNodePtr, int); private: - friend class ffmpeg_pts_offset_test; - friend class best_dcp_frame_rate_test_single; - friend class best_dcp_frame_rate_test_double; - friend class audio_sampling_rate_test; + 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; - ColourConversion _colour_conversion; + /** 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; }; #endif