X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.h;h=432775651d8d08944089c34679a846873fa486bb;hb=2d5beb0d6794df13ad1df47e84fd7a57d1d1c64d;hp=d2b19480f056f1895ab722d1ee50a96ee1989d37;hpb=1f8b45c7fd49714628009f5ed2161fbaa2b4d729;p=dcpomatic.git diff --git a/src/lib/video_content.h b/src/lib/video_content.h index d2b19480f..432775651 100644 --- a/src/lib/video_content.h +++ b/src/lib/video_content.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2016 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,93 +20,76 @@ #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_RATE; + 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 (boost::shared_ptr); - - dcp::Size size (boost::shared_ptr, dcp::Size, dcp::Size) const; - std::string id () const; - std::string name () const; + VideoContent (Content* parent, boost::shared_ptr); + VideoContent (Content* parent, boost::shared_ptr, cxml::ConstNodePtr, int); + VideoContent (Content* parent, boost::shared_ptr, std::vector >); + void as_xml (xmlpp::Node *) const; + std::string technical_summary () const; + std::string identifier () const; - Ratio const * ratio () const { - return _ratio; + Frame length () const { + boost::mutex::scoped_lock lm (_mutex); + return _length; } - bool scale () const { - return _scale; - } + Frame length_after_3d_combine () const { + boost::mutex::scoped_lock lm (_mutex); + if (_frame_type == VIDEO_FRAME_TYPE_3D_ALTERNATE) { + return _length / 2; + } - static void setup_scales (); - static std::vector all () { - return _scales; + return _length; } -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, boost::shared_ptr, int); - VideoContent (boost::shared_ptr, std::vector >); - - void as_xml (xmlpp::Node *) const; - std::string technical_summary () const; - virtual std::string information () const; - virtual std::string identifier () const; - - ContentTime video_length () const { + dcp::Size size () const { boost::mutex::scoped_lock lm (_mutex); - return _video_length; + return _size; } - dcp::Size video_size () const { - boost::mutex::scoped_lock lm (_mutex); - return _video_size; - } - - float video_frame_rate () const { + double 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_frame_rate () const { boost::mutex::scoped_lock lm (_mutex); - return _video_frame_rate; + return static_cast(_frame_rate); } - void set_video_frame_type (VideoFrameType); + void set_frame_type (VideoFrameType); + void set_frame_rate (double); void set_left_crop (int); void set_right_crop (int); @@ -114,11 +97,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 { @@ -152,35 +139,68 @@ 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; + } - ContentTime dcp_time_to_content_time (DCPTime) const; + bool yuv () const { + boost::mutex::scoped_lock lm (_mutex); + return _yuv; + } -protected: - void take_from_video_examiner (boost::shared_ptr); + Frame fade_in () const { + boost::mutex::scoped_lock lm (_mutex); + return _fade_in; + } - ContentTime _video_length; - float _video_frame_rate; + 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 (Frame) const; + + void scale_and_crop_to_fit_width (); + void scale_and_crop_to_fit_height (); + + std::string processing_description () const; + + void set_length (Frame); + + void take_from_examiner (boost::shared_ptr); + void add_properties (std::list &) const; 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; void setup_default_colour_conversion (); - - dcp::Size _video_size; - VideoFrameType _video_frame_type; + + Frame _length; + /** Video frame rate, or not set if this content should use the DCP's frame rate */ + boost::optional _frame_rate; + 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