diff options
17 files changed, 1 insertions, 233 deletions
diff --git a/src/multimedia/platform/android/common/qandroidmultimediautils.cpp b/src/multimedia/platform/android/common/qandroidmultimediautils.cpp index 395cea43a..16cfdafac 100644 --- a/src/multimedia/platform/android/common/qandroidmultimediautils.cpp +++ b/src/multimedia/platform/android/common/qandroidmultimediautils.cpp @@ -84,8 +84,6 @@ QVideoSurfaceFormat::PixelFormat qt_pixelFormatFromAndroidImageFormat(AndroidCam return QVideoSurfaceFormat::Format_NV21; case AndroidCamera::YV12: return QVideoSurfaceFormat::Format_YV12; - case AndroidCamera::RGB565: - return QVideoSurfaceFormat::Format_RGB565; case AndroidCamera::YUY2: return QVideoSurfaceFormat::Format_YUYV; case AndroidCamera::JPEG: @@ -102,8 +100,6 @@ AndroidCamera::ImageFormat qt_androidImageFormatFromPixelFormat(QVideoSurfaceFor return AndroidCamera::NV21; case QVideoSurfaceFormat::Format_YV12: return AndroidCamera::YV12; - case QVideoSurfaceFormat::Format_RGB565: - return AndroidCamera::RGB565; case QVideoSurfaceFormat::Format_YUYV: return AndroidCamera::YUY2; case QVideoSurfaceFormat::Format_Jpeg: diff --git a/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp b/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp index 3abb2ce74..a566211f9 100644 --- a/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp +++ b/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp @@ -707,8 +707,6 @@ void QAndroidCameraSession::processCapturedImage(int id, QVideoSurfaceFormat::PixelFormat QAndroidCameraSession::QtPixelFormatFromAndroidImageFormat(AndroidCamera::ImageFormat format) { switch (format) { - case AndroidCamera::RGB565: - return QVideoSurfaceFormat::Format_RGB565; case AndroidCamera::NV21: return QVideoSurfaceFormat::Format_NV21; case AndroidCamera::YUY2: @@ -725,8 +723,6 @@ QVideoSurfaceFormat::PixelFormat QAndroidCameraSession::QtPixelFormatFromAndroid AndroidCamera::ImageFormat QAndroidCameraSession::AndroidImageFormatFromQtPixelFormat(QVideoSurfaceFormat::PixelFormat format) { switch (format) { - case QVideoSurfaceFormat::Format_RGB565: - return AndroidCamera::RGB565; case QVideoSurfaceFormat::Format_NV21: return AndroidCamera::NV21; case QVideoSurfaceFormat::Format_YUYV: diff --git a/src/multimedia/platform/gstreamer/common/qgstutils.cpp b/src/multimedia/platform/gstreamer/common/qgstutils.cpp index ef220ba5d..9efef6796 100644 --- a/src/multimedia/platform/gstreamer/common/qgstutils.cpp +++ b/src/multimedia/platform/gstreamer/common/qgstutils.cpp @@ -186,8 +186,6 @@ static const VideoFormat qt_videoFormatLookup[] = { QVideoSurfaceFormat::Format_ARGB32, GST_VIDEO_FORMAT_BGRA }, { QVideoSurfaceFormat::Format_ABGR32, GST_VIDEO_FORMAT_RGBA }, { QVideoSurfaceFormat::Format_BGRA32, GST_VIDEO_FORMAT_ARGB }, - { QVideoSurfaceFormat::Format_RGB555 , GST_VIDEO_FORMAT_BGR15 }, - { QVideoSurfaceFormat::Format_BGR555 , GST_VIDEO_FORMAT_RGB15 }, { QVideoSurfaceFormat::Format_Y16 , GST_VIDEO_FORMAT_GRAY16_LE }, { QVideoSurfaceFormat::Format_P010 , GST_VIDEO_FORMAT_P010_10LE }, #else @@ -196,12 +194,9 @@ static const VideoFormat qt_videoFormatLookup[] = { QVideoSurfaceFormat::Format_ARGB32, GST_VIDEO_FORMAT_ARGB }, { QVideoSurfaceFormat::Format_ABGR32, GST_VIDEO_FORMAT_ABGR }, { QVideoSurfaceFormat::Format_BGRA32, GST_VIDEO_FORMAT_BGRA }, - { QVideoSurfaceFormat::Format_RGB555 , GST_VIDEO_FORMAT_RGB15 }, - { QVideoSurfaceFormat::Format_BGR555 , GST_VIDEO_FORMAT_BGR15 }, { QVideoSurfaceFormat::Format_Y16 , GST_VIDEO_FORMAT_GRAY16_BE }, { QVideoSurfaceFormat::Format_P010 , GST_VIDEO_FORMAT_P010_10BE }, #endif - { QVideoSurfaceFormat::Format_RGB565, GST_VIDEO_FORMAT_RGB16 } }; static int indexOfVideoFormat(QVideoSurfaceFormat::PixelFormat format) diff --git a/src/multimedia/platform/gstreamer/common/qgstvideorenderersink.cpp b/src/multimedia/platform/gstreamer/common/qgstvideorenderersink.cpp index 49bf61a62..ebe870779 100644 --- a/src/multimedia/platform/gstreamer/common/qgstvideorenderersink.cpp +++ b/src/multimedia/platform/gstreamer/common/qgstvideorenderersink.cpp @@ -141,9 +141,6 @@ QGstMutableCaps QGstVideoRenderer::getCaps() << QVideoSurfaceFormat::Format_BGRA32 << QVideoSurfaceFormat::Format_Y8 << QVideoSurfaceFormat::Format_Y16 -// << QVideoSurfaceFormat::Format_RGB555 -// << QVideoSurfaceFormat::Format_BGR555 -// << QVideoSurfaceFormat::Format_RGB565 ; caps.addPixelFormats(formats); qDebug() << "CAPS:" << caps.toString(); diff --git a/src/multimedia/platform/windows/evr/evrcustompresenter.cpp b/src/multimedia/platform/windows/evr/evrcustompresenter.cpp index 894a05061..f5416c9ba 100644 --- a/src/multimedia/platform/windows/evr/evrcustompresenter.cpp +++ b/src/multimedia/platform/windows/evr/evrcustompresenter.cpp @@ -1999,10 +1999,6 @@ static QVideoSurfaceFormat::PixelFormat pixelFormatFromMediaType(IMFMediaType *t return QVideoSurfaceFormat::Format_RGB32; if (subtype == MFVideoFormat_ARGB32) return QVideoSurfaceFormat::Format_ARGB32; - if (subtype == MFVideoFormat_RGB565) - return QVideoSurfaceFormat::Format_RGB565; - if (subtype == MFVideoFormat_RGB555) - return QVideoSurfaceFormat::Format_RGB555; if (subtype == MFVideoFormat_AYUV) return QVideoSurfaceFormat::Format_AYUV444; if (subtype == MFVideoFormat_I420) diff --git a/src/multimedia/platform/windows/evr/evrhelpers.cpp b/src/multimedia/platform/windows/evr/evrhelpers.cpp index 071dc08a6..52498b9a4 100644 --- a/src/multimedia/platform/windows/evr/evrhelpers.cpp +++ b/src/multimedia/platform/windows/evr/evrhelpers.cpp @@ -124,10 +124,6 @@ QVideoSurfaceFormat::PixelFormat qt_evr_pixelFormatFromD3DFormat(DWORD format) return QVideoSurfaceFormat::Format_ARGB32; case D3DFMT_X8R8G8B8: return QVideoSurfaceFormat::Format_RGB32; - case D3DFMT_R5G6B5: - return QVideoSurfaceFormat::Format_RGB565; - case D3DFMT_X1R5G5B5: - return QVideoSurfaceFormat::Format_RGB555; case D3DFMT_A8: return QVideoSurfaceFormat::Format_Y8; case D3DFMT_A8B8G8R8: @@ -155,10 +151,6 @@ D3DFORMAT qt_evr_D3DFormatFromPixelFormat(QVideoSurfaceFormat::PixelFormat forma return D3DFMT_A8R8G8B8; case QVideoSurfaceFormat::Format_RGB32: return D3DFMT_X8R8G8B8; - case QVideoSurfaceFormat::Format_RGB565: - return D3DFMT_R5G6B5; - case QVideoSurfaceFormat::Format_RGB555: - return D3DFMT_X1R5G5B5; case QVideoSurfaceFormat::Format_Y8: return D3DFMT_A8; case QVideoSurfaceFormat::Format_BGRA32: diff --git a/src/multimedia/platform/windows/player/mftvideo.cpp b/src/multimedia/platform/windows/player/mftvideo.cpp index f0d36cb8f..360796584 100644 --- a/src/multimedia/platform/windows/player/mftvideo.cpp +++ b/src/multimedia/platform/windows/player/mftvideo.cpp @@ -609,10 +609,6 @@ QVideoSurfaceFormat::PixelFormat MFTransform::formatFromSubtype(const GUID& subt return QVideoSurfaceFormat::Format_ARGB32; else if (subtype == MFVideoFormat_RGB32) return QVideoSurfaceFormat::Format_RGB32; - else if (subtype == MFVideoFormat_RGB565) - return QVideoSurfaceFormat::Format_RGB565; - else if (subtype == MFVideoFormat_RGB555) - return QVideoSurfaceFormat::Format_RGB555; else if (subtype == MFVideoFormat_AYUV) return QVideoSurfaceFormat::Format_AYUV444; else if (subtype == MFVideoFormat_I420) diff --git a/src/multimedia/platform/windows/player/mfvideorenderercontrol.cpp b/src/multimedia/platform/windows/player/mfvideorenderercontrol.cpp index 68317b4c0..8abbc2504 100644 --- a/src/multimedia/platform/windows/player/mfvideorenderercontrol.cpp +++ b/src/multimedia/platform/windows/player/mfvideorenderercontrol.cpp @@ -811,12 +811,6 @@ namespace case QVideoSurfaceFormat::Format_RGB32: mediaType->SetGUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32); break; - case QVideoSurfaceFormat::Format_RGB565: - mediaType->SetGUID(MF_MT_SUBTYPE, MFVideoFormat_RGB565); - break; - case QVideoSurfaceFormat::Format_RGB555: - mediaType->SetGUID(MF_MT_SUBTYPE, MFVideoFormat_RGB555); - break; case QVideoSurfaceFormat::Format_AYUV444: case QVideoSurfaceFormat::Format_AYUV444_Premultiplied: mediaType->SetGUID(MF_MT_SUBTYPE, MFVideoFormat_AYUV); @@ -1046,8 +1040,6 @@ namespace case QVideoSurfaceFormat::Format_AYUV444: return format.frameWidth() * 4; // 16 bpp packed formats. - case QVideoSurfaceFormat::Format_RGB565: - case QVideoSurfaceFormat::Format_RGB555: case QVideoSurfaceFormat::Format_YUYV: case QVideoSurfaceFormat::Format_UYVY: return PAD_TO_DWORD(format.frameWidth() * 2); diff --git a/src/multimedia/video/qvideoframe.cpp b/src/multimedia/video/qvideoframe.cpp index 81cb62611..28516c60a 100644 --- a/src/multimedia/video/qvideoframe.cpp +++ b/src/multimedia/video/qvideoframe.cpp @@ -60,14 +60,10 @@ static bool pixelFormatHasAlpha[QVideoSurfaceFormat::NPixelFormats] = true, //Format_ARGB32, true, //Format_ARGB32_Premultiplied, false, //Format_RGB32, - false, //Format_RGB565, - false, //Format_RGB555, true, //Format_BGRA32, true, //Format_BGRA32_Premultiplied, true, //Format_ABGR32, false, //Format_BGR32, - false, //Format_BGR565, - false, //Format_BGR555, true, //Format_AYUV444, true, //Format_AYUV444_Premultiplied, @@ -172,14 +168,6 @@ private: The frame stored using a 32-bit RGB format (0xffRRGGBB). This is equivalent to QImage::Format_RGB32 - \value Format_RGB565 - The frame is stored using a 16-bit RGB format (5-6-5). This is equivalent to - QImage::Format_RGB16. - - \value Format_RGB555 - The frame is stored using a 16-bit RGB format (5-5-5). This is equivalent to - QImage::Format_RGB555. - \value Format_BGRA32 The frame is stored using a 32-bit BGRA format (0xBBGGRRAA). @@ -192,12 +180,6 @@ private: \value Format_BGR32 The frame is stored using a 32-bit BGR format (0xBBGGRRff). - \value Format_BGR565 - The frame is stored using a 16-bit BGR format (5-6-5). - - \value Format_BGR555 - The frame is stored using a 16-bit BGR format (5-5-5). - \value Format_AYUV444 The frame is stored using a packed 32-bit AYUV format (0xAAYYUUVV). @@ -566,14 +548,10 @@ bool QVideoFrame::map(QVideoFrame::MapMode mode) case QVideoSurfaceFormat::Format_ARGB32: case QVideoSurfaceFormat::Format_ARGB32_Premultiplied: case QVideoSurfaceFormat::Format_RGB32: - case QVideoSurfaceFormat::Format_RGB565: - case QVideoSurfaceFormat::Format_RGB555: case QVideoSurfaceFormat::Format_BGRA32: case QVideoSurfaceFormat::Format_BGRA32_Premultiplied: case QVideoSurfaceFormat::Format_ABGR32: case QVideoSurfaceFormat::Format_BGR32: - case QVideoSurfaceFormat::Format_BGR565: - case QVideoSurfaceFormat::Format_BGR555: case QVideoSurfaceFormat::Format_AYUV444: case QVideoSurfaceFormat::Format_AYUV444_Premultiplied: case QVideoSurfaceFormat::Format_UYVY: diff --git a/src/multimedia/video/qvideoframeconversionhelper.cpp b/src/multimedia/video/qvideoframeconversionhelper.cpp index 672b83a03..346880a29 100644 --- a/src/multimedia/video/qvideoframeconversionhelper.cpp +++ b/src/multimedia/video/qvideoframeconversionhelper.cpp @@ -420,58 +420,6 @@ static void QT_FASTCALL qt_convert_ABGR32_to_ARGB32(const QVideoFrame &frame, uc } } -static void QT_FASTCALL qt_convert_BGR565_to_ARGB32(const QVideoFrame &frame, uchar *output) -{ - FETCH_INFO_PACKED(frame) - MERGE_LOOPS(width, height, stride, 2) - - quint32 *argb = reinterpret_cast<quint32*>(output); - - for (int y = 0; y < height; ++y) { - const quint16 *bgr = reinterpret_cast<const quint16*>(src); - - int x = 0; - for (; x < width - 3; x += 4) { - *argb++ = qConvertBGR565ToARGB32(*bgr++); - *argb++ = qConvertBGR565ToARGB32(*bgr++); - *argb++ = qConvertBGR565ToARGB32(*bgr++); - *argb++ = qConvertBGR565ToARGB32(*bgr++); - } - - // leftovers - for (; x < width; ++x) - *argb++ = qConvertBGR565ToARGB32(*bgr++); - - src += stride; - } -} - -static void QT_FASTCALL qt_convert_BGR555_to_ARGB32(const QVideoFrame &frame, uchar *output) -{ - FETCH_INFO_PACKED(frame) - MERGE_LOOPS(width, height, stride, 2) - - quint32 *argb = reinterpret_cast<quint32*>(output); - - for (int y = 0; y < height; ++y) { - const quint16 *bgr = reinterpret_cast<const quint16*>(src); - - int x = 0; - for (; x < width - 3; x += 4) { - *argb++ = qConvertBGR555ToARGB32(*bgr++); - *argb++ = qConvertBGR555ToARGB32(*bgr++); - *argb++ = qConvertBGR555ToARGB32(*bgr++); - *argb++ = qConvertBGR555ToARGB32(*bgr++); - } - - // leftovers - for (; x < width; ++x) - *argb++ = qConvertBGR555ToARGB32(*bgr++); - - src += stride; - } -} - static inline void planarYUV420_16bit_to_ARGB32(const uchar *y, int yStride, const uchar *u, int uStride, const uchar *v, int vStride, @@ -528,14 +476,10 @@ static VideoFrameConvertFunc qConvertFuncs[QVideoSurfaceFormat::NPixelFormats] = /* Format_ARGB32 */ nullptr, // Not needed /* Format_ARGB32_Premultiplied */ nullptr, // Not needed /* Format_RGB32 */ nullptr, // Not needed - /* Format_RGB565 */ nullptr, // Not needed - /* Format_RGB555 */ nullptr, // Not needed /* Format_BGRA32 */ qt_convert_BGRA32_to_ARGB32, /* Format_BGRA32_Premultiplied */ qt_convert_BGRA32_Premultiplied_to_ARGB32, /* Format_ABGR32 */ qt_convert_ABGR32_to_ARGB32, /* Format_BGR32 */ qt_convert_BGRA32_Premultiplied_to_ARGB32, - /* Format_BGR565 */ qt_convert_BGR565_to_ARGB32, - /* Format_BGR555 */ qt_convert_BGR555_to_ARGB32, /* Format_AYUV444 */ qt_convert_AYUV444_to_ARGB32, /* Format_AYUV444_Premultiplied */ qt_convert_AYUV444_Premultiplied_to_ARGB32, /* Format_YUV420P */ qt_convert_YUV420P_to_ARGB32, diff --git a/src/multimedia/video/qvideoframeconversionhelper_p.h b/src/multimedia/video/qvideoframeconversionhelper_p.h index 1d633995c..5ec919d9f 100644 --- a/src/multimedia/video/qvideoframeconversionhelper_p.h +++ b/src/multimedia/video/qvideoframeconversionhelper_p.h @@ -80,22 +80,6 @@ inline quint32 qConvertBGR24ToARGB32(const uchar *bgr) return 0xFF000000 | bgr[0] | bgr[1] << 8 | bgr[2] << 16; } -inline quint32 qConvertBGR565ToARGB32(quint16 bgr) -{ - return 0xff000000 - | ((((bgr) >> 8) & 0xf8) | (((bgr) >> 13) & 0x7)) - | ((((bgr) << 5) & 0xfc00) | (((bgr) >> 1) & 0x300)) - | ((((bgr) << 19) & 0xf80000) | (((bgr) << 14) & 0x70000)); -} - -inline quint32 qConvertBGR555ToARGB32(quint16 bgr) -{ - return 0xff000000 - | ((((bgr) >> 7) & 0xf8) | (((bgr) >> 12) & 0x7)) - | ((((bgr) << 6) & 0xf800) | (((bgr) << 1) & 0x700)) - | ((((bgr) << 19) & 0xf80000) | (((bgr) << 11) & 0x70000)); -} - #define FETCH_INFO_PACKED(frame) \ const uchar *src = frame.bits(); \ int stride = frame.bytesPerLine(); \ diff --git a/src/multimedia/video/qvideosurfaceformat.cpp b/src/multimedia/video/qvideosurfaceformat.cpp index c0b27c428..6177ba0a6 100644 --- a/src/multimedia/video/qvideosurfaceformat.cpp +++ b/src/multimedia/video/qvideosurfaceformat.cpp @@ -430,10 +430,6 @@ QVideoSurfaceFormat::PixelFormat QVideoSurfaceFormat::pixelFormatFromImageFormat case QImage::Format_ARGB32_Premultiplied: case QImage::Format_RGBA8888_Premultiplied: return QVideoSurfaceFormat::Format_ARGB32_Premultiplied; - case QImage::Format_RGB16: - return QVideoSurfaceFormat::Format_RGB565; - case QImage::Format_RGB555: - return QVideoSurfaceFormat::Format_RGB555; case QImage::Format_Grayscale8: return QVideoSurfaceFormat::Format_Y8; case QImage::Format_Grayscale16: @@ -459,10 +455,6 @@ QImage::Format QVideoSurfaceFormat::imageFormatFromPixelFormat(QVideoSurfaceForm return QImage::Format_ARGB32_Premultiplied; case QVideoSurfaceFormat::Format_RGB32: return QImage::Format_RGB32; - case QVideoSurfaceFormat::Format_RGB565: - return QImage::Format_RGB16; - case QVideoSurfaceFormat::Format_RGB555: - return QImage::Format_RGB555; case QVideoSurfaceFormat::Format_Y8: return QImage::Format_Grayscale8; case QVideoSurfaceFormat::Format_Y16: @@ -471,8 +463,6 @@ QImage::Format QVideoSurfaceFormat::imageFormatFromPixelFormat(QVideoSurfaceForm case QVideoSurfaceFormat::Format_BGRA32: case QVideoSurfaceFormat::Format_BGRA32_Premultiplied: case QVideoSurfaceFormat::Format_BGR32: - case QVideoSurfaceFormat::Format_BGR565: - case QVideoSurfaceFormat::Format_BGR555: case QVideoSurfaceFormat::Format_AYUV444: case QVideoSurfaceFormat::Format_AYUV444_Premultiplied: case QVideoSurfaceFormat::Format_YUV420P: @@ -569,10 +559,6 @@ QDebug operator<<(QDebug dbg, QVideoSurfaceFormat::PixelFormat pf) return dbg << "Format_ARGB32_Premultiplied"; case QVideoSurfaceFormat::Format_RGB32: return dbg << "Format_RGB32"; - case QVideoSurfaceFormat::Format_RGB565: - return dbg << "Format_RGB565"; - case QVideoSurfaceFormat::Format_RGB555: - return dbg << "Format_RGB555"; case QVideoSurfaceFormat::Format_BGRA32: return dbg << "Format_BGRA32"; case QVideoSurfaceFormat::Format_BGRA32_Premultiplied: @@ -581,10 +567,6 @@ QDebug operator<<(QDebug dbg, QVideoSurfaceFormat::PixelFormat pf) return dbg << "Format_ABGR32"; case QVideoSurfaceFormat::Format_BGR32: return dbg << "Format_BGR32"; - case QVideoSurfaceFormat::Format_BGR565: - return dbg << "Format_BGR565"; - case QVideoSurfaceFormat::Format_BGR555: - return dbg << "Format_BGR555"; case QVideoSurfaceFormat::Format_AYUV444: return dbg << "Format_AYUV444"; case QVideoSurfaceFormat::Format_AYUV444_Premultiplied: diff --git a/src/multimedia/video/qvideosurfaceformat.h b/src/multimedia/video/qvideosurfaceformat.h index 8f601e4c2..e3551501a 100644 --- a/src/multimedia/video/qvideosurfaceformat.h +++ b/src/multimedia/video/qvideosurfaceformat.h @@ -65,14 +65,10 @@ public: Format_ARGB32, Format_ARGB32_Premultiplied, Format_RGB32, - Format_RGB565, - Format_RGB555, Format_BGRA32, Format_BGRA32_Premultiplied, Format_ABGR32, Format_BGR32, - Format_BGR565, - Format_BGR555, Format_AYUV444, Format_AYUV444_Premultiplied, diff --git a/src/multimedia/video/qvideotexturehelper.cpp b/src/multimedia/video/qvideotexturehelper.cpp index 2d7832020..56282445d 100644 --- a/src/multimedia/video/qvideotexturehelper.cpp +++ b/src/multimedia/video/qvideotexturehelper.cpp @@ -64,16 +64,6 @@ static const TextureDescription descriptions[QVideoSurfaceFormat::NPixelFormats] { QRhiTexture::BGRA8, QRhiTexture::UnknownFormat, QRhiTexture::UnknownFormat }, { { 1, 1 }, { 1, 1 }, { 1, 1 } } }, - // Format_RGB565 - { 1, - { QRhiTexture::UnknownFormat, QRhiTexture::UnknownFormat, QRhiTexture::UnknownFormat }, - { { 1, 1 }, { 1, 1 }, { 1, 1 } } - }, - // Format_RGB555 - { 1, - { QRhiTexture::UnknownFormat, QRhiTexture::UnknownFormat, QRhiTexture::UnknownFormat }, - { { 1, 1 }, { 1, 1 }, { 1, 1 } } - }, // Format_BGRA32 { 1, { QRhiTexture::BGRA8, QRhiTexture::UnknownFormat, QRhiTexture::UnknownFormat }, @@ -94,16 +84,6 @@ static const TextureDescription descriptions[QVideoSurfaceFormat::NPixelFormats] { QRhiTexture::BGRA8, QRhiTexture::UnknownFormat, QRhiTexture::UnknownFormat }, { { 1, 1 }, { 1, 1 }, { 1, 1 } } }, - // Format_BGR565 - { 1, - { QRhiTexture::UnknownFormat, QRhiTexture::UnknownFormat, QRhiTexture::UnknownFormat }, - { { 1, 1 }, { 1, 1 }, { 1, 1 } } - }, - // Format_BGR555 - { 1, - { QRhiTexture::UnknownFormat, QRhiTexture::UnknownFormat, QRhiTexture::UnknownFormat }, - { { 1, 1 }, { 1, 1 }, { 1, 1 } } - }, // Format_AYUV444 { 1, @@ -215,12 +195,6 @@ QString fragmentShaderFileName(QVideoSurfaceFormat::PixelFormat format) switch (format) { case QVideoSurfaceFormat::Format_Invalid: case QVideoSurfaceFormat::Format_Jpeg: - - case QVideoSurfaceFormat::Format_RGB565: - case QVideoSurfaceFormat::Format_RGB555: - case QVideoSurfaceFormat::Format_BGR565: - case QVideoSurfaceFormat::Format_BGR555: - return QString(); case QVideoSurfaceFormat::Format_Y8: @@ -296,11 +270,6 @@ QByteArray uniformData(const QVideoSurfaceFormat &format, const QMatrix4x4 &tran switch (format.pixelFormat()) { case QVideoSurfaceFormat::Format_Invalid: case QVideoSurfaceFormat::Format_Jpeg: - - case QVideoSurfaceFormat::Format_RGB565: - case QVideoSurfaceFormat::Format_RGB555: - case QVideoSurfaceFormat::Format_BGR565: - case QVideoSurfaceFormat::Format_BGR555: return QByteArray(); case QVideoSurfaceFormat::Format_ARGB32: diff --git a/src/plugins/videonode/imx6/qsgvivantevideonode.cpp b/src/plugins/videonode/imx6/qsgvivantevideonode.cpp index 810536715..d286eaa0c 100644 --- a/src/plugins/videonode/imx6/qsgvivantevideonode.cpp +++ b/src/plugins/videonode/imx6/qsgvivantevideonode.cpp @@ -77,7 +77,6 @@ const QMap<QVideoSurfaceFormat::PixelFormat, GLenum>& QSGVivanteVideoNode::getVi static_VideoFormat2GLFormatMap.insert(QVideoSurfaceFormat::Format_ARGB32, GL_BGRA_EXT); static_VideoFormat2GLFormatMap.insert(QVideoSurfaceFormat::Format_BGR32, GL_RGBA); static_VideoFormat2GLFormatMap.insert(QVideoSurfaceFormat::Format_BGRA32, GL_RGBA); - static_VideoFormat2GLFormatMap.insert(QVideoSurfaceFormat::Format_RGB565, GL_RGB565); } return static_VideoFormat2GLFormatMap; @@ -97,7 +96,6 @@ int QSGVivanteVideoNode::getBytesForPixelFormat(QVideoSurfaceFormat::PixelFormat case QVideoSurfaceFormat::Format_ARGB32: return 4; case QVideoSurfaceFormat::Format_BGR32: return 4; case QVideoSurfaceFormat::Format_BGRA32: return 4; - case QVideoSurfaceFormat::Format_RGB565: return 2; default: return 1; } } diff --git a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp index a99687f22..34dec384e 100644 --- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp +++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp @@ -978,7 +978,7 @@ void tst_QMediaPlayerBackend::surfaceTest_data() QList<QVideoSurfaceFormat::PixelFormat> formatsRGB; formatsRGB << QVideoSurfaceFormat::Format_RGB32 << QVideoSurfaceFormat::Format_ARGB32 - << QVideoSurfaceFormat::Format_RGB565 + << QVideoSurfaceFormat::Format_BGR32 << QVideoSurfaceFormat::Format_BGRA32; QList<QVideoSurfaceFormat::PixelFormat> formatsYUV; diff --git a/tests/auto/unit/multimedia/qvideoframe/tst_qvideoframe.cpp b/tests/auto/unit/multimedia/qvideoframe/tst_qvideoframe.cpp index 89c138b79..b6b470722 100644 --- a/tests/auto/unit/multimedia/qvideoframe/tst_qvideoframe.cpp +++ b/tests/auto/unit/multimedia/qvideoframe/tst_qvideoframe.cpp @@ -287,10 +287,6 @@ void tst_QVideoFrame::createFromImage_data() << QSize(64, 64) << QImage::Format_RGB32 << QVideoSurfaceFormat::Format_RGB32; - QTest::newRow("12x45 RGB16") - << QSize(12, 45) - << QImage::Format_RGB16 - << QVideoSurfaceFormat::Format_RGB565; QTest::newRow("19x46 ARGB32_Premultiplied") << QSize(19, 46) << QImage::Format_ARGB32_Premultiplied @@ -851,12 +847,6 @@ void tst_QVideoFrame::formatConversion_data() QTest::newRow("QImage::Format_ARGB32_Premultiplied | QVideoSurfaceFormat::Format_ARGB32_Premultiplied") << QImage::Format_ARGB32_Premultiplied << QVideoSurfaceFormat::Format_ARGB32_Premultiplied; - QTest::newRow("QImage::Format_RGB16 | QVideoSurfaceFormat::Format_RGB565") - << QImage::Format_RGB16 - << QVideoSurfaceFormat::Format_RGB565; - QTest::newRow("QImage::Format_RGB555 | QVideoSurfaceFormat::Format_RGB555") - << QImage::Format_RGB555 - << QVideoSurfaceFormat::Format_RGB555; QTest::newRow("QImage::Format_MonoLSB") << QImage::Format_MonoLSB @@ -889,12 +879,6 @@ void tst_QVideoFrame::formatConversion_data() QTest::newRow("QVideoSurfaceFormat::Format_BGR32") << QImage::Format_Invalid << QVideoSurfaceFormat::Format_BGR32; - QTest::newRow("QVideoSurfaceFormat::Format_BGR565") - << QImage::Format_Invalid - << QVideoSurfaceFormat::Format_BGR565; - QTest::newRow("QVideoSurfaceFormat::Format_BGR555") - << QImage::Format_Invalid - << QVideoSurfaceFormat::Format_BGR555; QTest::newRow("QVideoSurfaceFormat::Format_AYUV444") << QImage::Format_Invalid << QVideoSurfaceFormat::Format_AYUV444; @@ -1077,20 +1061,6 @@ void tst_QVideoFrame::image_data() << 256 << QImage::Format_RGB32; - QTest::newRow("64x64 RGB565") - << QSize(64, 64) - << QVideoSurfaceFormat::Format_RGB565 - << 16384 - << 128 - << QImage::Format_RGB16; - - QTest::newRow("64x64 RGB555") - << QSize(64, 64) - << QVideoSurfaceFormat::Format_RGB555 - << 16384 - << 128 - << QImage::Format_RGB555; - QTest::newRow("64x64 BGRA32") << QSize(64, 64) << QVideoSurfaceFormat::Format_BGRA32 @@ -1112,19 +1082,6 @@ void tst_QVideoFrame::image_data() << 256 << QImage::Format_ARGB32; - QTest::newRow("64x64 BGR565") - << QSize(64, 64) - << QVideoSurfaceFormat::Format_BGR565 - << 16384 - << 256 - << QImage::Format_ARGB32; - - QTest::newRow("64x64 BGR555") - << QSize(64, 64) - << QVideoSurfaceFormat::Format_BGR555 - << 16384 - << 256 - << QImage::Format_ARGB32; QTest::newRow("64x64 AYUV444") << QSize(64, 64) << QVideoSurfaceFormat::Format_AYUV444 |