X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.h;h=075f7b7015b623a7be591210aff0efd1af90ccfb;hb=78664f8073256de51355c9162f61a4ae4fa560d7;hp=27b36e9bc65ed73358ae36ef2da2adb32c607f77;hpb=7b2054e2a73844450b5b55c5788c02af671812ce;p=dcpomatic.git diff --git a/src/lib/video_content.h b/src/lib/video_content.h index 27b36e9bc..075f7b701 100644 --- a/src/lib/video_content.h +++ b/src/lib/video_content.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2014 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,11 +20,20 @@ #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 { @@ -35,73 +44,34 @@ public: static int const VIDEO_CROP; static int const VIDEO_SCALE; static int const COLOUR_CONVERSION; + static int const VIDEO_FADE_IN; + static int const VIDEO_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, int round) 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 >); + 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; - virtual std::string information () const; - virtual std::string identifier () const; + std::string identifier () const; + + void set_default_colour_conversion (); - ContentTime video_length () const { + Frame video_length () const { boost::mutex::scoped_lock lm (_mutex); return _video_length; } - ContentTime video_length_after_3d_combine () const { + Frame video_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); + return _video_length / 2; } - + return _video_length; } @@ -109,14 +79,19 @@ public: boost::mutex::scoped_lock lm (_mutex); return _video_size; } - - float video_frame_rate () const { + + 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 { boost::mutex::scoped_lock lm (_mutex); - return _video_frame_rate; + return static_cast(_video_frame_rate); } void set_video_frame_type (VideoFrameType); - void set_video_frame_rate (float); + void set_video_frame_rate (double); void set_left_crop (int); void set_right_crop (int); @@ -124,8 +99,12 @@ public: void set_bottom_crop (int); void set_scale (VideoContentScale); + void unset_colour_conversion (); void set_colour_conversion (ColourConversion); - + + void set_fade_in (Frame); + void set_fade_out (Frame); + VideoFrameType video_frame_type () const { boost::mutex::scoped_lock lm (_mutex); return _video_frame_type; @@ -162,38 +141,73 @@ public: return _scale; } - ColourConversion colour_conversion () const { + boost::optional colour_conversion () const { boost::mutex::scoped_lock lm (_mutex); return _colour_conversion; } + 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 video_size_after_3d_split () const; dcp::Size video_size_after_crop () const; ContentTime dcp_time_to_content_time (DCPTime) const; + boost::optional fade (Frame) const; + void scale_and_crop_to_fit_width (); void scale_and_crop_to_fit_height (); -protected: - void take_from_video_examiner (boost::shared_ptr); + std::string processing_description () const; - ContentTime _video_length; - float _video_frame_rate; + void set_video_length (Frame); + + void take_from_video_examiner (boost::shared_ptr); + void add_properties (std::list &) const; private: + + 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; + 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; 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