diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-04-04 17:16:18 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-04-08 12:18:55 +0000 |
| commit | 74c7dc45ed4b79843260e4e16d808987de1aacc8 (patch) | |
| tree | 14d43c3bb5bc65d9a4ace58a310caa0dd3de4e7d /src/multimedia/video/qvideoframeconversionhelper.cpp | |
| parent | ccb7398c3d839f36fcbdcad1e3c9fc13f387713f (diff) | |
Remove endian specific surface formats
For 16bit data, we only support the platforms native
endianness.
Change-Id: Ic04097125622715e6847d568551d572cd317b674
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/multimedia/video/qvideoframeconversionhelper.cpp')
| -rw-r--r-- | src/multimedia/video/qvideoframeconversionhelper.cpp | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/src/multimedia/video/qvideoframeconversionhelper.cpp b/src/multimedia/video/qvideoframeconversionhelper.cpp index bd1c21f24..672b83a03 100644 --- a/src/multimedia/video/qvideoframeconversionhelper.cpp +++ b/src/multimedia/video/qvideoframeconversionhelper.cpp @@ -511,7 +511,7 @@ static inline void planarYUV420_16bit_to_ARGB32(const uchar *y, int yStride, } } -static void QT_FASTCALL qt_convert_P016LE_to_ARGB32(const QVideoFrame &frame, uchar *output) +static void QT_FASTCALL qt_convert_P016_to_ARGB32(const QVideoFrame &frame, uchar *output) { FETCH_INFO_BIPLANAR(frame) planarYUV420_16bit_to_ARGB32(plane1 + 1, plane1Stride, @@ -523,18 +523,6 @@ static void QT_FASTCALL qt_convert_P016LE_to_ARGB32(const QVideoFrame &frame, uc } -static void QT_FASTCALL qt_convert_P016BE_to_ARGB32(const QVideoFrame &frame, uchar *output) -{ - FETCH_INFO_BIPLANAR(frame) - planarYUV420_16bit_to_ARGB32(plane1, plane1Stride, - plane2, plane2Stride, - plane2 + 2, plane2Stride, - 4, - reinterpret_cast<quint32*>(output), - width, height); - -} - static VideoFrameConvertFunc qConvertFuncs[QVideoSurfaceFormat::NPixelFormats] = { /* Format_Invalid */ nullptr, // Not needed /* Format_ARGB32 */ nullptr, // Not needed @@ -563,10 +551,8 @@ static VideoFrameConvertFunc qConvertFuncs[QVideoSurfaceFormat::NPixelFormats] = /* Format_IMC4 */ qt_convert_IMC4_to_ARGB32, /* Format_Y8 */ nullptr, // Not needed /* Format_Y16 */ nullptr, // Not needed - /* Format_P010LE */ qt_convert_P016LE_to_ARGB32, - /* Format_P010BE */ qt_convert_P016BE_to_ARGB32, - /* Format_P016LE */ qt_convert_P016LE_to_ARGB32, - /* Format_P016BE */ qt_convert_P016BE_to_ARGB32, + /* Format_P010 */ qt_convert_P016_to_ARGB32, + /* Format_P016 */ qt_convert_P016_to_ARGB32, /* Format_Jpeg */ nullptr, // Not needed }; |