From 9d338b85a9aac053bb0b2605f5f7a1b020ad2f73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Sun, 10 Mar 2024 16:50:32 -0300 Subject: [PATCH] Fixed the prores_ks issue. --- lib/tlIO/FFmpegReadVideo.cpp | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/lib/tlIO/FFmpegReadVideo.cpp b/lib/tlIO/FFmpegReadVideo.cpp index 8ed77360..8b07e4a3 100644 --- a/lib/tlIO/FFmpegReadVideo.cpp +++ b/lib/tlIO/FFmpegReadVideo.cpp @@ -279,20 +279,15 @@ namespace tl case AV_PIX_FMT_YUV444P10LE: case AV_PIX_FMT_YUV444P12BE: case AV_PIX_FMT_YUV444P12LE: + _avOutputPixelFormat = AV_PIX_FMT_RGB48; + _info.pixelType = image::PixelType::RGB_U16; + break; case AV_PIX_FMT_YUV444P16BE: case AV_PIX_FMT_YUV444P16LE: - if (options.yuvToRGBConversion) - { - _avOutputPixelFormat = AV_PIX_FMT_RGB48; - _info.pixelType = image::PixelType::RGB_U16; - } - else - { - //! \todo Use the _info.layout.endian field instead of - //! converting endianness. - _avOutputPixelFormat = AV_PIX_FMT_YUV444P16LE; - _info.pixelType = image::PixelType::YUV_444P_U16; - } + //! \todo Use the _info.layout.endian field instead of + //! converting endianness. + _avOutputPixelFormat = AV_PIX_FMT_YUV444P16LE; + _info.pixelType = image::PixelType::YUV_444P_U16; break; case AV_PIX_FMT_GBR24P: _avOutputPixelFormat = AV_PIX_FMT_RGB24; @@ -312,7 +307,6 @@ namespace tl case AV_PIX_FMT_YUVA420P: case AV_PIX_FMT_YUVA422P: case AV_PIX_FMT_YUVA444P: - //! \todo Support these formats natively. _avOutputPixelFormat = AV_PIX_FMT_RGBA; _info.pixelType = image::PixelType::RGBA_U8; break;