Commit f06d3d89 authored by Val Doroshchuk's avatar Val Doroshchuk
Browse files

Fix qConvertFuncs to respect QVideoFrame::Format_YUV422P


After changing sequence in QVideoFrame, need to fix qConvertFuncs

Change-Id: Ie022676a66d9c47a1b89cf5ef61c2146921a2a0b
Reviewed-by: default avatarVille Voutilainen <ville.voutilainen@qt.io>
Showing with 3 additions and 3 deletions
...@@ -1056,7 +1056,6 @@ static VideoFrameConvertFunc qConvertFuncs[QVideoFrame::NPixelFormats] = { ...@@ -1056,7 +1056,6 @@ static VideoFrameConvertFunc qConvertFuncs[QVideoFrame::NPixelFormats] = {
/* Format_ARGB8565_Premultiplied */ nullptr, // Not needed /* Format_ARGB8565_Premultiplied */ nullptr, // Not needed
/* Format_BGRA32 */ qt_convert_BGRA32_to_ARGB32, /* Format_BGRA32 */ qt_convert_BGRA32_to_ARGB32,
/* Format_BGRA32_Premultiplied */ qt_convert_BGRA32_to_ARGB32, /* Format_BGRA32_Premultiplied */ qt_convert_BGRA32_to_ARGB32,
/* Format_ABGR32 */ nullptr,
/* Format_BGR32 */ qt_convert_BGRA32_to_ARGB32, /* Format_BGR32 */ qt_convert_BGRA32_to_ARGB32,
/* Format_BGR24 */ qt_convert_BGR24_to_ARGB32, /* Format_BGR24 */ qt_convert_BGR24_to_ARGB32,
/* Format_BGR565 */ qt_convert_BGR565_to_ARGB32, /* Format_BGR565 */ qt_convert_BGR565_to_ARGB32,
...@@ -1066,7 +1065,6 @@ static VideoFrameConvertFunc qConvertFuncs[QVideoFrame::NPixelFormats] = { ...@@ -1066,7 +1065,6 @@ static VideoFrameConvertFunc qConvertFuncs[QVideoFrame::NPixelFormats] = {
/* Format_AYUV444_Premultiplied */ nullptr, /* Format_AYUV444_Premultiplied */ nullptr,
/* Format_YUV444 */ qt_convert_YUV444_to_ARGB32, /* Format_YUV444 */ qt_convert_YUV444_to_ARGB32,
/* Format_YUV420P */ qt_convert_YUV420P_to_ARGB32, /* Format_YUV420P */ qt_convert_YUV420P_to_ARGB32,
/* Format_YUV422P */ nullptr,
/* Format_YV12 */ qt_convert_YV12_to_ARGB32, /* Format_YV12 */ qt_convert_YV12_to_ARGB32,
/* Format_UYVY */ qt_convert_UYVY_to_ARGB32, /* Format_UYVY */ qt_convert_UYVY_to_ARGB32,
/* Format_YUYV */ qt_convert_YUYV_to_ARGB32, /* Format_YUYV */ qt_convert_YUYV_to_ARGB32,
...@@ -1080,7 +1078,9 @@ static VideoFrameConvertFunc qConvertFuncs[QVideoFrame::NPixelFormats] = { ...@@ -1080,7 +1078,9 @@ static VideoFrameConvertFunc qConvertFuncs[QVideoFrame::NPixelFormats] = {
/* Format_Y16 */ nullptr, /* Format_Y16 */ nullptr,
/* Format_Jpeg */ nullptr, // Not needed /* Format_Jpeg */ nullptr, // Not needed
/* Format_CameraRaw */ nullptr, /* Format_CameraRaw */ nullptr,
/* Format_AdobeDng */ nullptr /* Format_AdobeDng */ nullptr,
/* Format_ABGR32 */ nullptr, // ### Qt 6: reorder
/* Format_YUV422P */ nullptr,
}; };
static void qInitConvertFuncsAsm() static void qInitConvertFuncsAsm()
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment