From 62f9b78a2eb5f0fc6b9028264bac6ad501d83309 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 25 May 2021 00:57:16 +0200 Subject: Move video level conversion for RGB from FFmpegImageProxy to Image. Since FFmpeg does not do video level conversion for RGB sources when we (sort of) ask it to in Image::crop_scale_window() it seems to make more sense to compensate for that by calling full_to_video_range() in the same place (rather than in FFmpegImageProxy). --- src/lib/ffmpeg_image_proxy.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/lib/ffmpeg_image_proxy.h') diff --git a/src/lib/ffmpeg_image_proxy.h b/src/lib/ffmpeg_image_proxy.h index 92689abe8..21109c9d6 100644 --- a/src/lib/ffmpeg_image_proxy.h +++ b/src/lib/ffmpeg_image_proxy.h @@ -27,9 +27,9 @@ class FFmpegImageProxy : public ImageProxy { public: - explicit FFmpegImageProxy (boost::filesystem::path, VideoRange video_range); - explicit FFmpegImageProxy (dcp::ArrayData, VideoRange video_range); - FFmpegImageProxy (std::shared_ptr xml, std::shared_ptr socket); + explicit FFmpegImageProxy (boost::filesystem::path); + explicit FFmpegImageProxy (dcp::ArrayData); + FFmpegImageProxy (std::shared_ptr socket); Result image ( boost::optional size = boost::optional () @@ -45,7 +45,6 @@ public: private: dcp::ArrayData _data; - VideoRange _video_range; mutable int64_t _pos; /** Path of a file that this image came from, if applicable; stored so that failed-decode errors can give more detail. -- cgit v1.2.3