diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-05-25 02:48:32 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-05-25 02:48:32 +0100 |
| commit | 8167d04e4dde6297ad936dca5dc691818a4dae41 (patch) | |
| tree | 37aac64d82949ac0086d40259ccd06e35e728597 /src/lib/video_content.h | |
| parent | d8b6ee12af54a37433e96238bdca29171d6e0eb6 (diff) | |
11b5bf6229b8713dffde89a777cd5181335136f6 from master; default colour conversions depending on type and resolution
Diffstat (limited to 'src/lib/video_content.h')
| -rw-r--r-- | src/lib/video_content.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/video_content.h b/src/lib/video_content.h index 0e9f20348..ccc61b1f9 100644 --- a/src/lib/video_content.h +++ b/src/lib/video_content.h @@ -53,6 +53,8 @@ public: std::string technical_summary () const; virtual std::string identifier () const; + virtual void set_default_colour_conversion (); + ContentTime video_length () const { boost::mutex::scoped_lock lm (_mutex); return _video_length; @@ -88,7 +90,6 @@ public: void set_scale (VideoContentScale); void unset_colour_conversion (bool signal = true); void set_colour_conversion (ColourConversion); - void set_default_colour_conversion (); void set_fade_in (ContentTime); void set_fade_out (ContentTime); @@ -166,6 +167,7 @@ protected: ContentTime _video_length; float _video_frame_rate; + boost::optional<ColourConversion> _colour_conversion; private: friend struct ffmpeg_pts_offset_test; @@ -179,7 +181,6 @@ private: VideoFrameType _video_frame_type; Crop _crop; VideoContentScale _scale; - boost::optional<ColourConversion> _colour_conversion; /** Sample aspect ratio obtained from the content file's header, if there is one. */ |