diff options
15 files changed, 2 insertions, 262 deletions
diff --git a/src/imports/multimedia/qmldir b/src/imports/multimedia/qmldir index 3444aaa06..48cdb0c8c 100644 --- a/src/imports/multimedia/qmldir +++ b/src/imports/multimedia/qmldir @@ -5,3 +5,4 @@ typeinfo plugins.qmltypes prefer :/qt-project.org/imports/QtMultimedia/ typeinfo plugins.qmltypes Video 5.0 Video.qml + diff --git a/src/multimedia/platform/gstreamer/common/qgstutils.cpp b/src/multimedia/platform/gstreamer/common/qgstutils.cpp index 24bb4a3a1..6d8e14527 100644 --- a/src/multimedia/platform/gstreamer/common/qgstutils.cpp +++ b/src/multimedia/platform/gstreamer/common/qgstutils.cpp @@ -179,7 +179,6 @@ static const VideoFormat qt_videoFormatLookup[] = { QVideoSurfaceFormat::Format_NV12 , GST_VIDEO_FORMAT_NV12 }, { QVideoSurfaceFormat::Format_NV21 , GST_VIDEO_FORMAT_NV21 }, { QVideoSurfaceFormat::Format_AYUV444, GST_VIDEO_FORMAT_AYUV }, - { QVideoSurfaceFormat::Format_YUV444, GST_VIDEO_FORMAT_Y444 }, { QVideoSurfaceFormat::Format_P010LE , GST_VIDEO_FORMAT_P010_10LE }, { QVideoSurfaceFormat::Format_P010BE , GST_VIDEO_FORMAT_P010_10BE }, { QVideoSurfaceFormat::Format_Y8 , GST_VIDEO_FORMAT_GRAY8 }, @@ -202,8 +201,6 @@ static const VideoFormat qt_videoFormatLookup[] = { QVideoSurfaceFormat::Format_BGR555 , GST_VIDEO_FORMAT_BGR15 }, { QVideoSurfaceFormat::Format_Y16 , GST_VIDEO_FORMAT_GRAY16_BE }, #endif - { QVideoSurfaceFormat::Format_RGB24 , GST_VIDEO_FORMAT_RGB }, - { QVideoSurfaceFormat::Format_BGR24 , GST_VIDEO_FORMAT_BGR }, { QVideoSurfaceFormat::Format_RGB565, GST_VIDEO_FORMAT_RGB16 } }; diff --git a/src/multimedia/platform/gstreamer/common/qgstvideorenderersink.cpp b/src/multimedia/platform/gstreamer/common/qgstvideorenderersink.cpp index 8825097f1..4f5f9ba9f 100644 --- a/src/multimedia/platform/gstreamer/common/qgstvideorenderersink.cpp +++ b/src/multimedia/platform/gstreamer/common/qgstvideorenderersink.cpp @@ -105,7 +105,6 @@ QGstMutableCaps QGstVideoRenderer::getCaps() // << QVideoSurfaceFormat::Format_NV12 // << QVideoSurfaceFormat::Format_NV21 << QVideoSurfaceFormat::Format_AYUV444 - << QVideoSurfaceFormat::Format_YUV444 // << QVideoSurfaceFormat::Format_P010LE // << QVideoSurfaceFormat::Format_P010BE // << QVideoSurfaceFormat::Format_Y8 @@ -117,8 +116,6 @@ QGstMutableCaps QGstVideoRenderer::getCaps() // << QVideoSurfaceFormat::Format_RGB555 // << QVideoSurfaceFormat::Format_BGR555 // << QVideoSurfaceFormat::Format_Y16 -// << QVideoSurfaceFormat::Format_RGB24 -// << QVideoSurfaceFormat::Format_BGR24 // << QVideoSurfaceFormat::Format_RGB565 ; // Even if the surface does not support gl textures, @@ -140,7 +137,6 @@ QGstMutableCaps QGstVideoRenderer::getCaps() << QVideoSurfaceFormat::Format_NV12 << QVideoSurfaceFormat::Format_NV21 << QVideoSurfaceFormat::Format_AYUV444 - << QVideoSurfaceFormat::Format_YUV444 << QVideoSurfaceFormat::Format_P010LE << QVideoSurfaceFormat::Format_P010BE << QVideoSurfaceFormat::Format_Y8 @@ -152,8 +148,6 @@ QGstMutableCaps QGstVideoRenderer::getCaps() << QVideoSurfaceFormat::Format_RGB555 << QVideoSurfaceFormat::Format_BGR555 << QVideoSurfaceFormat::Format_Y16 - << QVideoSurfaceFormat::Format_RGB24 - << QVideoSurfaceFormat::Format_BGR24 << 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 894f0b1be..894a05061 100644 --- a/src/multimedia/platform/windows/evr/evrcustompresenter.cpp +++ b/src/multimedia/platform/windows/evr/evrcustompresenter.cpp @@ -1999,8 +1999,6 @@ static QVideoSurfaceFormat::PixelFormat pixelFormatFromMediaType(IMFMediaType *t return QVideoSurfaceFormat::Format_RGB32; if (subtype == MFVideoFormat_ARGB32) return QVideoSurfaceFormat::Format_ARGB32; - if (subtype == MFVideoFormat_RGB24) - return QVideoSurfaceFormat::Format_RGB24; if (subtype == MFVideoFormat_RGB565) return QVideoSurfaceFormat::Format_RGB565; if (subtype == MFVideoFormat_RGB555) diff --git a/src/multimedia/platform/windows/evr/evrhelpers.cpp b/src/multimedia/platform/windows/evr/evrhelpers.cpp index 4c81228b0..071dc08a6 100644 --- a/src/multimedia/platform/windows/evr/evrhelpers.cpp +++ b/src/multimedia/platform/windows/evr/evrhelpers.cpp @@ -120,8 +120,6 @@ bool qt_evr_isSampleTimePassed(IMFClock *clock, IMFSample *sample) QVideoSurfaceFormat::PixelFormat qt_evr_pixelFormatFromD3DFormat(DWORD format) { switch (format) { - case D3DFMT_R8G8B8: - return QVideoSurfaceFormat::Format_RGB24; case D3DFMT_A8R8G8B8: return QVideoSurfaceFormat::Format_ARGB32; case D3DFMT_X8R8G8B8: @@ -153,8 +151,6 @@ QVideoSurfaceFormat::PixelFormat qt_evr_pixelFormatFromD3DFormat(DWORD format) D3DFORMAT qt_evr_D3DFormatFromPixelFormat(QVideoSurfaceFormat::PixelFormat format) { switch (format) { - case QVideoSurfaceFormat::Format_RGB24: - return D3DFMT_R8G8B8; case QVideoSurfaceFormat::Format_ARGB32: return D3DFMT_A8R8G8B8; case QVideoSurfaceFormat::Format_RGB32: diff --git a/src/multimedia/platform/windows/player/mftvideo.cpp b/src/multimedia/platform/windows/player/mftvideo.cpp index d271ccf7d..f0d36cb8f 100644 --- a/src/multimedia/platform/windows/player/mftvideo.cpp +++ b/src/multimedia/platform/windows/player/mftvideo.cpp @@ -609,8 +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_RGB24) - return QVideoSurfaceFormat::Format_RGB24; else if (subtype == MFVideoFormat_RGB565) return QVideoSurfaceFormat::Format_RGB565; else if (subtype == MFVideoFormat_RGB555) diff --git a/src/multimedia/platform/windows/player/mfvideorenderercontrol.cpp b/src/multimedia/platform/windows/player/mfvideorenderercontrol.cpp index 51b655f1b..68317b4c0 100644 --- a/src/multimedia/platform/windows/player/mfvideorenderercontrol.cpp +++ b/src/multimedia/platform/windows/player/mfvideorenderercontrol.cpp @@ -811,9 +811,6 @@ namespace case QVideoSurfaceFormat::Format_RGB32: mediaType->SetGUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32); break; - case QVideoSurfaceFormat::Format_BGR24: // MFVideoFormat_RGB24 has a BGR layout - mediaType->SetGUID(MF_MT_SUBTYPE, MFVideoFormat_RGB24); - break; case QVideoSurfaceFormat::Format_RGB565: mediaType->SetGUID(MF_MT_SUBTYPE, MFVideoFormat_RGB565); break; @@ -1048,10 +1045,6 @@ namespace case QVideoSurfaceFormat::Format_RGB32: case QVideoSurfaceFormat::Format_AYUV444: return format.frameWidth() * 4; - // 24 bpp packed formats. - case QVideoSurfaceFormat::Format_RGB24: - case QVideoSurfaceFormat::Format_BGR24: - return PAD_TO_DWORD(format.frameWidth() * 3); // 16 bpp packed formats. case QVideoSurfaceFormat::Format_RGB565: case QVideoSurfaceFormat::Format_RGB555: diff --git a/src/multimedia/video/qvideoframe.cpp b/src/multimedia/video/qvideoframe.cpp index a4a985a5f..720a7948b 100644 --- a/src/multimedia/video/qvideoframe.cpp +++ b/src/multimedia/video/qvideoframe.cpp @@ -60,22 +60,17 @@ static bool pixelFormatHasAlpha[QVideoSurfaceFormat::NPixelFormats] = true, //Format_ARGB32, true, //Format_ARGB32_Premultiplied, false, //Format_RGB32, - false, //Format_RGB24, false, //Format_RGB565, false, //Format_RGB555, - true, //Format_ARGB8565_Premultiplied, true, //Format_BGRA32, true, //Format_BGRA32_Premultiplied, true, //Format_ABGR32, false, //Format_BGR32, - false, //Format_BGR24, false, //Format_BGR565, false, //Format_BGR555, - true, //Format_BGRA5658_Premultiplied, true, //Format_AYUV444, true, //Format_AYUV444_Premultiplied, - false, //Format_YUV444, false, //Format_YUV420P, false, //Format_YUV422P, false, //Format_YV12, @@ -179,10 +174,6 @@ private: The frame stored using a 32-bit RGB format (0xffRRGGBB). This is equivalent to QImage::Format_RGB32 - \value Format_RGB24 - The frame is stored using a 24-bit RGB format (8-8-8). This is equivalent to - QImage::Format_RGB888 - \value Format_RGB565 The frame is stored using a 16-bit RGB format (5-6-5). This is equivalent to QImage::Format_RGB16. @@ -191,9 +182,6 @@ private: The frame is stored using a 16-bit RGB format (5-5-5). This is equivalent to QImage::Format_RGB555. - \value Format_ARGB8565_Premultiplied - The frame is stored using a 24-bit premultiplied ARGB format (8-5-6-5). - \value Format_BGRA32 The frame is stored using a 32-bit BGRA format (0xBBGGRRAA). @@ -206,27 +194,18 @@ private: \value Format_BGR32 The frame is stored using a 32-bit BGR format (0xBBGGRRff). - \value Format_BGR24 - The frame is stored using a 24-bit BGR format (0xBBGGRR). - \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_BGRA5658_Premultiplied - The frame is stored using a 24-bit premultiplied BGRA format (5-6-5-8). - \value Format_AYUV444 The frame is stored using a packed 32-bit AYUV format (0xAAYYUUVV). \value Format_AYUV444_Premultiplied The frame is stored using a packed premultiplied 32-bit AYUV format (0xAAYYUUVV). - \value Format_YUV444 - The frame is stored using a 24-bit packed YUV format (8-8-8). - \value Format_YUV420P The frame is stored using an 8-bit per component planar YUV format with the U and V planes horizontally and vertically sub-sampled, i.e. the height and width of the U and V planes are @@ -589,21 +568,16 @@ bool QVideoFrame::map(QVideoFrame::MapMode mode) case QVideoSurfaceFormat::Format_ARGB32: case QVideoSurfaceFormat::Format_ARGB32_Premultiplied: case QVideoSurfaceFormat::Format_RGB32: - case QVideoSurfaceFormat::Format_RGB24: case QVideoSurfaceFormat::Format_RGB565: case QVideoSurfaceFormat::Format_RGB555: - case QVideoSurfaceFormat::Format_ARGB8565_Premultiplied: case QVideoSurfaceFormat::Format_BGRA32: case QVideoSurfaceFormat::Format_BGRA32_Premultiplied: case QVideoSurfaceFormat::Format_ABGR32: case QVideoSurfaceFormat::Format_BGR32: - case QVideoSurfaceFormat::Format_BGR24: case QVideoSurfaceFormat::Format_BGR565: case QVideoSurfaceFormat::Format_BGR555: - case QVideoSurfaceFormat::Format_BGRA5658_Premultiplied: case QVideoSurfaceFormat::Format_AYUV444: case QVideoSurfaceFormat::Format_AYUV444_Premultiplied: - case QVideoSurfaceFormat::Format_YUV444: case QVideoSurfaceFormat::Format_UYVY: case QVideoSurfaceFormat::Format_YUYV: case QVideoSurfaceFormat::Format_Y8: diff --git a/src/multimedia/video/qvideoframeconversionhelper.cpp b/src/multimedia/video/qvideoframeconversionhelper.cpp index 7612c88c3..bd1c21f24 100644 --- a/src/multimedia/video/qvideoframeconversionhelper.cpp +++ b/src/multimedia/video/qvideoframeconversionhelper.cpp @@ -213,30 +213,6 @@ static void QT_FASTCALL qt_convert_AYUV444_Premultiplied_to_ARGB32(const QVideoF } } -static void QT_FASTCALL qt_convert_YUV444_to_ARGB32(const QVideoFrame &frame, uchar *output) -{ - FETCH_INFO_PACKED(frame) - MERGE_LOOPS(width, height, stride, 3) - - quint32 *rgb = reinterpret_cast<quint32*>(output); - - for (int i = 0; i < height; ++i) { - const uchar *lineSrc = src; - - for (int j = 0; j < width; ++j) { - int y = *lineSrc++; - int u = *lineSrc++; - int v = *lineSrc++; - - EXPAND_UV(u, v); - - *rgb++ = qYUVToARGB32(y, rv, guv, bu); - } - - src += stride; - } -} - static void QT_FASTCALL qt_convert_UYVY_to_ARGB32(const QVideoFrame &frame, uchar *output) { FETCH_INFO_PACKED(frame) @@ -444,38 +420,6 @@ static void QT_FASTCALL qt_convert_ABGR32_to_ARGB32(const QVideoFrame &frame, uc } } -static void QT_FASTCALL qt_convert_BGR24_to_ARGB32(const QVideoFrame &frame, uchar *output) -{ - FETCH_INFO_PACKED(frame) - MERGE_LOOPS(width, height, stride, 3) - - quint32 *argb = reinterpret_cast<quint32*>(output); - - for (int y = 0; y < height; ++y) { - const uchar *bgr = src; - - int x = 0; - for (; x < width - 3; x += 4) { - *argb++ = qConvertBGR24ToARGB32(bgr); - bgr += 3; - *argb++ = qConvertBGR24ToARGB32(bgr); - bgr += 3; - *argb++ = qConvertBGR24ToARGB32(bgr); - bgr += 3; - *argb++ = qConvertBGR24ToARGB32(bgr); - bgr += 3; - } - - // leftovers - for (; x < width; ++x) { - *argb++ = qConvertBGR24ToARGB32(bgr); - bgr += 3; - } - - src += stride; - } -} - static void QT_FASTCALL qt_convert_BGR565_to_ARGB32(const QVideoFrame &frame, uchar *output) { FETCH_INFO_PACKED(frame) @@ -528,39 +472,6 @@ static void QT_FASTCALL qt_convert_BGR555_to_ARGB32(const QVideoFrame &frame, uc } } -static void QT_FASTCALL qt_convert_BGRA5658_to_ARGB32(const QVideoFrame &frame, uchar *output) -{ - FETCH_INFO_PACKED(frame) - MERGE_LOOPS(width, height, stride, 3) - - quint32 *argb = reinterpret_cast<quint32*>(output); - - for (int y = 0; y < height; ++y) { - const uchar *bgr = src; - - int x = 0; - for (; x < width - 3; x += 4) { - *argb++ = qConvertBGRA5658ToARGB32(bgr); - bgr += 3; - *argb++ = qConvertBGRA5658ToARGB32(bgr); - bgr += 3; - *argb++ = qConvertBGRA5658ToARGB32(bgr); - bgr += 3; - *argb++ = qConvertBGRA5658ToARGB32(bgr); - bgr += 3; - } - - // leftovers - for (; x < width; ++x) { - *argb++ = qConvertBGRA5658ToARGB32(bgr); - bgr += 3; - } - - src += stride; - } -} - - static inline void planarYUV420_16bit_to_ARGB32(const uchar *y, int yStride, const uchar *u, int uStride, const uchar *v, int vStride, @@ -629,21 +540,16 @@ static VideoFrameConvertFunc qConvertFuncs[QVideoSurfaceFormat::NPixelFormats] = /* Format_ARGB32 */ nullptr, // Not needed /* Format_ARGB32_Premultiplied */ nullptr, // Not needed /* Format_RGB32 */ nullptr, // Not needed - /* Format_RGB24 */ nullptr, // Not needed /* Format_RGB565 */ nullptr, // Not needed /* Format_RGB555 */ nullptr, // Not needed - /* Format_ARGB8565_Premultiplied */ 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_BGR24 */ qt_convert_BGR24_to_ARGB32, /* Format_BGR565 */ qt_convert_BGR565_to_ARGB32, /* Format_BGR555 */ qt_convert_BGR555_to_ARGB32, - /* Format_BGRA5658_Premultiplied */ qt_convert_BGRA5658_to_ARGB32, /* Format_AYUV444 */ qt_convert_AYUV444_to_ARGB32, /* Format_AYUV444_Premultiplied */ qt_convert_AYUV444_Premultiplied_to_ARGB32, - /* Format_YUV444 */ qt_convert_YUV444_to_ARGB32, /* Format_YUV420P */ qt_convert_YUV420P_to_ARGB32, /* Format_YUV422P */ qt_convert_YUV422P_to_ARGB32, /* Format_YV12 */ qt_convert_YV12_to_ARGB32, diff --git a/src/multimedia/video/qvideoframeconversionhelper_p.h b/src/multimedia/video/qvideoframeconversionhelper_p.h index 58edd48f2..1d633995c 100644 --- a/src/multimedia/video/qvideoframeconversionhelper_p.h +++ b/src/multimedia/video/qvideoframeconversionhelper_p.h @@ -80,13 +80,6 @@ inline quint32 qConvertBGR24ToARGB32(const uchar *bgr) return 0xFF000000 | bgr[0] | bgr[1] << 8 | bgr[2] << 16; } -inline quint32 qConvertBGRA5658ToARGB32(const uchar *bgr) -{ - return (bgr[0] & 0xf8) | (quint32(bgr[0] & 7) << 13) | - (quint32(bgr[1] & 0xe0) << 5) | (quint32(bgr[1] & 0x1f) << 3) | - bgr[2] << 24; -} - inline quint32 qConvertBGR565ToARGB32(quint16 bgr) { return 0xff000000 diff --git a/src/multimedia/video/qvideosurfaceformat.cpp b/src/multimedia/video/qvideosurfaceformat.cpp index 52fb3ea3b..8c562c2b8 100644 --- a/src/multimedia/video/qvideosurfaceformat.cpp +++ b/src/multimedia/video/qvideosurfaceformat.cpp @@ -432,12 +432,8 @@ QVideoSurfaceFormat::PixelFormat QVideoSurfaceFormat::pixelFormatFromImageFormat return QVideoSurfaceFormat::Format_ARGB32_Premultiplied; case QImage::Format_RGB16: return QVideoSurfaceFormat::Format_RGB565; - case QImage::Format_ARGB8565_Premultiplied: - return QVideoSurfaceFormat::Format_ARGB8565_Premultiplied; case QImage::Format_RGB555: return QVideoSurfaceFormat::Format_RGB555; - case QImage::Format_RGB888: - return QVideoSurfaceFormat::Format_RGB24; case QImage::Format_Grayscale8: return QVideoSurfaceFormat::Format_Y8; case QImage::Format_Grayscale16: @@ -463,14 +459,10 @@ QImage::Format QVideoSurfaceFormat::imageFormatFromPixelFormat(QVideoSurfaceForm return QImage::Format_ARGB32_Premultiplied; case QVideoSurfaceFormat::Format_RGB32: return QImage::Format_RGB32; - case QVideoSurfaceFormat::Format_RGB24: - return QImage::Format_RGB888; case QVideoSurfaceFormat::Format_RGB565: return QImage::Format_RGB16; case QVideoSurfaceFormat::Format_RGB555: return QImage::Format_RGB555; - case QVideoSurfaceFormat::Format_ARGB8565_Premultiplied: - return QImage::Format_ARGB8565_Premultiplied; case QVideoSurfaceFormat::Format_Y8: return QImage::Format_Grayscale8; case QVideoSurfaceFormat::Format_Y16: @@ -479,13 +471,10 @@ QImage::Format QVideoSurfaceFormat::imageFormatFromPixelFormat(QVideoSurfaceForm case QVideoSurfaceFormat::Format_BGRA32: case QVideoSurfaceFormat::Format_BGRA32_Premultiplied: case QVideoSurfaceFormat::Format_BGR32: - case QVideoSurfaceFormat::Format_BGR24: case QVideoSurfaceFormat::Format_BGR565: case QVideoSurfaceFormat::Format_BGR555: - case QVideoSurfaceFormat::Format_BGRA5658_Premultiplied: case QVideoSurfaceFormat::Format_AYUV444: case QVideoSurfaceFormat::Format_AYUV444_Premultiplied: - case QVideoSurfaceFormat::Format_YUV444: case QVideoSurfaceFormat::Format_YUV420P: case QVideoSurfaceFormat::Format_YUV422P: case QVideoSurfaceFormat::Format_YV12: @@ -582,14 +571,10 @@ QDebug operator<<(QDebug dbg, QVideoSurfaceFormat::PixelFormat pf) return dbg << "Format_ARGB32_Premultiplied"; case QVideoSurfaceFormat::Format_RGB32: return dbg << "Format_RGB32"; - case QVideoSurfaceFormat::Format_RGB24: - return dbg << "Format_RGB24"; case QVideoSurfaceFormat::Format_RGB565: return dbg << "Format_RGB565"; case QVideoSurfaceFormat::Format_RGB555: return dbg << "Format_RGB555"; - case QVideoSurfaceFormat::Format_ARGB8565_Premultiplied: - return dbg << "Format_ARGB8565_Premultiplied"; case QVideoSurfaceFormat::Format_BGRA32: return dbg << "Format_BGRA32"; case QVideoSurfaceFormat::Format_BGRA32_Premultiplied: @@ -598,20 +583,14 @@ QDebug operator<<(QDebug dbg, QVideoSurfaceFormat::PixelFormat pf) return dbg << "Format_ABGR32"; case QVideoSurfaceFormat::Format_BGR32: return dbg << "Format_BGR32"; - case QVideoSurfaceFormat::Format_BGR24: - return dbg << "Format_BGR24"; case QVideoSurfaceFormat::Format_BGR565: return dbg << "Format_BGR565"; case QVideoSurfaceFormat::Format_BGR555: return dbg << "Format_BGR555"; - case QVideoSurfaceFormat::Format_BGRA5658_Premultiplied: - return dbg << "Format_BGRA5658_Premultiplied"; case QVideoSurfaceFormat::Format_AYUV444: return dbg << "Format_AYUV444"; case QVideoSurfaceFormat::Format_AYUV444_Premultiplied: return dbg << "Format_AYUV444_Premultiplied"; - case QVideoSurfaceFormat::Format_YUV444: - return dbg << "Format_YUV444"; case QVideoSurfaceFormat::Format_YUV420P: return dbg << "Format_YUV420P"; case QVideoSurfaceFormat::Format_YUV422P: diff --git a/src/multimedia/video/qvideosurfaceformat.h b/src/multimedia/video/qvideosurfaceformat.h index 41b5c8292..6e231125f 100644 --- a/src/multimedia/video/qvideosurfaceformat.h +++ b/src/multimedia/video/qvideosurfaceformat.h @@ -65,22 +65,17 @@ public: Format_ARGB32, Format_ARGB32_Premultiplied, Format_RGB32, - Format_RGB24, Format_RGB565, Format_RGB555, - Format_ARGB8565_Premultiplied, Format_BGRA32, Format_BGRA32_Premultiplied, Format_ABGR32, Format_BGR32, - Format_BGR24, Format_BGR565, Format_BGR555, - Format_BGRA5658_Premultiplied, Format_AYUV444, Format_AYUV444_Premultiplied, - Format_YUV444, Format_YUV420P, Format_YUV422P, Format_YV12, diff --git a/src/multimedia/video/qvideotexturehelper.cpp b/src/multimedia/video/qvideotexturehelper.cpp index 4465ae6f1..ff0f43db0 100644 --- a/src/multimedia/video/qvideotexturehelper.cpp +++ b/src/multimedia/video/qvideotexturehelper.cpp @@ -64,11 +64,6 @@ static const TextureDescription descriptions[QVideoSurfaceFormat::NPixelFormats] { QRhiTexture::BGRA8, QRhiTexture::UnknownFormat, QRhiTexture::UnknownFormat }, { { 1, 1 }, { 1, 1 }, { 1, 1 } } }, - // Format_RGB24 - { 1, - { QRhiTexture::UnknownFormat, QRhiTexture::UnknownFormat, QRhiTexture::UnknownFormat }, - { { 1, 1 }, { 1, 1 }, { 1, 1 } } - }, // Format_RGB565 { 1, { QRhiTexture::UnknownFormat, QRhiTexture::UnknownFormat, QRhiTexture::UnknownFormat }, @@ -79,11 +74,6 @@ static const TextureDescription descriptions[QVideoSurfaceFormat::NPixelFormats] { QRhiTexture::UnknownFormat, QRhiTexture::UnknownFormat, QRhiTexture::UnknownFormat }, { { 1, 1 }, { 1, 1 }, { 1, 1 } } }, - // Format_ARGB8565_Premultiplied - { 1, - { QRhiTexture::UnknownFormat, QRhiTexture::UnknownFormat, QRhiTexture::UnknownFormat }, - { { 1, 1 }, { 1, 1 }, { 1, 1 } } - }, // Format_BGRA32 { 1, { QRhiTexture::BGRA8, QRhiTexture::UnknownFormat, QRhiTexture::UnknownFormat }, @@ -104,11 +94,6 @@ static const TextureDescription descriptions[QVideoSurfaceFormat::NPixelFormats] { QRhiTexture::BGRA8, QRhiTexture::UnknownFormat, QRhiTexture::UnknownFormat }, { { 1, 1 }, { 1, 1 }, { 1, 1 } } }, - // Format_BGR24 - { 1, - { QRhiTexture::UnknownFormat, QRhiTexture::UnknownFormat, QRhiTexture::UnknownFormat }, - { { 1, 1 }, { 1, 1 }, { 1, 1 } } - }, // Format_BGR565 { 1, { QRhiTexture::UnknownFormat, QRhiTexture::UnknownFormat, QRhiTexture::UnknownFormat }, @@ -119,11 +104,6 @@ static const TextureDescription descriptions[QVideoSurfaceFormat::NPixelFormats] { QRhiTexture::UnknownFormat, QRhiTexture::UnknownFormat, QRhiTexture::UnknownFormat }, { { 1, 1 }, { 1, 1 }, { 1, 1 } } }, - // Format_BGRA5658_Premultiplied - { 1, - { QRhiTexture::UnknownFormat, QRhiTexture::UnknownFormat, QRhiTexture::UnknownFormat }, - { { 1, 1 }, { 1, 1 }, { 1, 1 } } - }, // Format_AYUV444 { 1, @@ -135,11 +115,6 @@ static const TextureDescription descriptions[QVideoSurfaceFormat::NPixelFormats] { QRhiTexture::BGRA8, QRhiTexture::UnknownFormat, QRhiTexture::UnknownFormat }, { { 1, 1 }, { 1, 1 }, { 1, 1 } } }, - // Format_YUV444 - { 1, - { QRhiTexture::BGRA8, QRhiTexture::UnknownFormat, QRhiTexture::UnknownFormat }, - { { 1, 1 }, { 1, 1 }, { 1, 1 } } - }, // Format_YUV420P { 3, { QRhiTexture::R8, QRhiTexture::R8, QRhiTexture::R8 }, @@ -246,20 +221,14 @@ QString vertexShaderFileName(QVideoSurfaceFormat::PixelFormat format) case QVideoSurfaceFormat::Format_Invalid: case QVideoSurfaceFormat::Format_Jpeg: - case QVideoSurfaceFormat::Format_RGB24: case QVideoSurfaceFormat::Format_RGB565: case QVideoSurfaceFormat::Format_RGB555: - case QVideoSurfaceFormat::Format_ARGB8565_Premultiplied: - case QVideoSurfaceFormat::Format_BGR24: case QVideoSurfaceFormat::Format_BGR565: case QVideoSurfaceFormat::Format_BGR555: - case QVideoSurfaceFormat::Format_BGRA5658_Premultiplied: case QVideoSurfaceFormat::Format_Y8: case QVideoSurfaceFormat::Format_Y16: - case QVideoSurfaceFormat::Format_YUV444: - case QVideoSurfaceFormat::Format_IMC1: case QVideoSurfaceFormat::Format_IMC2: case QVideoSurfaceFormat::Format_IMC3: @@ -297,20 +266,14 @@ QString fragmentShaderFileName(QVideoSurfaceFormat::PixelFormat format) case QVideoSurfaceFormat::Format_Invalid: case QVideoSurfaceFormat::Format_Jpeg: - case QVideoSurfaceFormat::Format_RGB24: case QVideoSurfaceFormat::Format_RGB565: case QVideoSurfaceFormat::Format_RGB555: - case QVideoSurfaceFormat::Format_ARGB8565_Premultiplied: - case QVideoSurfaceFormat::Format_BGR24: case QVideoSurfaceFormat::Format_BGR565: case QVideoSurfaceFormat::Format_BGR555: - case QVideoSurfaceFormat::Format_BGRA5658_Premultiplied: case QVideoSurfaceFormat::Format_Y8: case QVideoSurfaceFormat::Format_Y16: - case QVideoSurfaceFormat::Format_YUV444: - case QVideoSurfaceFormat::Format_IMC1: case QVideoSurfaceFormat::Format_IMC2: case QVideoSurfaceFormat::Format_IMC3: @@ -383,20 +346,14 @@ QByteArray uniformData(const QVideoSurfaceFormat &format, const QMatrix4x4 &tran case QVideoSurfaceFormat::Format_Invalid: case QVideoSurfaceFormat::Format_Jpeg: - case QVideoSurfaceFormat::Format_RGB24: case QVideoSurfaceFormat::Format_RGB565: case QVideoSurfaceFormat::Format_RGB555: - case QVideoSurfaceFormat::Format_ARGB8565_Premultiplied: - case QVideoSurfaceFormat::Format_BGR24: case QVideoSurfaceFormat::Format_BGR565: case QVideoSurfaceFormat::Format_BGR555: - case QVideoSurfaceFormat::Format_BGRA5658_Premultiplied: case QVideoSurfaceFormat::Format_Y8: case QVideoSurfaceFormat::Format_Y16: - case QVideoSurfaceFormat::Format_YUV444: - case QVideoSurfaceFormat::Format_IMC1: case QVideoSurfaceFormat::Format_IMC2: case QVideoSurfaceFormat::Format_IMC3: diff --git a/tests/auto/unit/multimedia/qvideoframe/tst_qvideoframe.cpp b/tests/auto/unit/multimedia/qvideoframe/tst_qvideoframe.cpp index 588162085..89c138b79 100644 --- a/tests/auto/unit/multimedia/qvideoframe/tst_qvideoframe.cpp +++ b/tests/auto/unit/multimedia/qvideoframe/tst_qvideoframe.cpp @@ -854,15 +854,9 @@ void tst_QVideoFrame::formatConversion_data() QTest::newRow("QImage::Format_RGB16 | QVideoSurfaceFormat::Format_RGB565") << QImage::Format_RGB16 << QVideoSurfaceFormat::Format_RGB565; - QTest::newRow("QImage::Format_ARGB8565_Premultiplied | QVideoSurfaceFormat::Format_ARGB8565_Premultiplied") - << QImage::Format_ARGB8565_Premultiplied - << QVideoSurfaceFormat::Format_ARGB8565_Premultiplied; QTest::newRow("QImage::Format_RGB555 | QVideoSurfaceFormat::Format_RGB555") << QImage::Format_RGB555 << QVideoSurfaceFormat::Format_RGB555; - QTest::newRow("QImage::Format_RGB888 | QVideoSurfaceFormat::Format_RGB24") - << QImage::Format_RGB888 - << QVideoSurfaceFormat::Format_RGB24; QTest::newRow("QImage::Format_MonoLSB") << QImage::Format_MonoLSB @@ -895,27 +889,18 @@ void tst_QVideoFrame::formatConversion_data() QTest::newRow("QVideoSurfaceFormat::Format_BGR32") << QImage::Format_Invalid << QVideoSurfaceFormat::Format_BGR32; - QTest::newRow("QVideoSurfaceFormat::Format_BGR24") - << QImage::Format_Invalid - << QVideoSurfaceFormat::Format_BGR24; 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_BGRA5658_Premultiplied") - << QImage::Format_Invalid - << QVideoSurfaceFormat::Format_BGRA5658_Premultiplied; QTest::newRow("QVideoSurfaceFormat::Format_AYUV444") << QImage::Format_Invalid << QVideoSurfaceFormat::Format_AYUV444; QTest::newRow("QVideoSurfaceFormat::Format_AYUV444_Premultiplied") << QImage::Format_Invalid << QVideoSurfaceFormat::Format_AYUV444_Premultiplied; - QTest::newRow("QVideoSurfaceFormat::Format_YUV444") - << QImage::Format_Invalid - << QVideoSurfaceFormat::Format_YUV444; QTest::newRow("QVideoSurfaceFormat::Format_YUV420P") << QImage::Format_Invalid << QVideoSurfaceFormat::Format_YUV420P; @@ -1092,13 +1077,6 @@ void tst_QVideoFrame::image_data() << 256 << QImage::Format_RGB32; - QTest::newRow("64x64 RGB24") - << QSize(64, 64) - << QVideoSurfaceFormat::Format_RGB24 - << 16384 - << 192 - << QImage::Format_RGB888; - QTest::newRow("64x64 RGB565") << QSize(64, 64) << QVideoSurfaceFormat::Format_RGB565 @@ -1134,13 +1112,6 @@ void tst_QVideoFrame::image_data() << 256 << QImage::Format_ARGB32; - QTest::newRow("64x64 BGR24") - << QSize(64, 64) - << QVideoSurfaceFormat::Format_BGR24 - << 16384 - << 256 - << QImage::Format_ARGB32; - QTest::newRow("64x64 BGR565") << QSize(64, 64) << QVideoSurfaceFormat::Format_BGR565 @@ -1161,13 +1132,6 @@ void tst_QVideoFrame::image_data() << 256 << QImage::Format_ARGB32; - QTest::newRow("64x64 YUV444") - << QSize(64, 64) - << QVideoSurfaceFormat::Format_YUV444 - << 16384 - << 256 - << QImage::Format_ARGB32; - QTest::newRow("64x64 YUV420P") << QSize(64, 64) << QVideoSurfaceFormat::Format_YUV420P diff --git a/tests/auto/unit/multimedia/qvideosurfaceformat/tst_qvideosurfaceformat.cpp b/tests/auto/unit/multimedia/qvideosurfaceformat/tst_qvideosurfaceformat.cpp index 99799d476..d44e0736b 100644 --- a/tests/auto/unit/multimedia/qvideosurfaceformat/tst_qvideosurfaceformat.cpp +++ b/tests/auto/unit/multimedia/qvideosurfaceformat/tst_qvideosurfaceformat.cpp @@ -126,11 +126,6 @@ void tst_QVideoSurfaceFormat::construct_data() << QVideoSurfaceFormat::Format_RGB32 << true; - QTest::newRow("1024x768 YUV444 GL texture") - << QSize(32, 32) - << QVideoSurfaceFormat::Format_YUV444 - << true; - QTest::newRow("32x32 invalid no handle") << QSize(32, 32) << QVideoSurfaceFormat::Format_Invalid @@ -355,7 +350,7 @@ void tst_QVideoSurfaceFormat::compare() QVideoSurfaceFormat format2( QSize(16, 16), QVideoSurfaceFormat::Format_RGB32); QVideoSurfaceFormat format3( - QSize(32, 32), QVideoSurfaceFormat::Format_YUV444); + QSize(32, 32), QVideoSurfaceFormat::Format_AYUV444); QVideoSurfaceFormat format4( QSize(16, 16), QVideoSurfaceFormat::Format_RGB32); |