diff options
author | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-12-19 12:19:04 +0100 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-01-09 11:32:33 +0100 |
commit | 03593d86b8ba9718c36963d5302d868e574e5148 (patch) | |
tree | cdb2a5489b8282394d715f7ffc62eb8fef3c467e | |
parent | a15cf55bc4b0013dae43e406d9181f88f032add8 (diff) | |
download | qtmultimedia-03593d86b8ba9718c36963d5302d868e574e5148.tar.gz |
Support byte ordered QImage formats in pixelFormatFromImageFormat
For QVideoFrame purposes they are equivalent.
Change-Id: I776c60aa8ca848e58499bbd0c1fc25c457d46ef6
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
-rw-r--r-- | src/multimedia/video/qvideoframe.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/multimedia/video/qvideoframe.cpp b/src/multimedia/video/qvideoframe.cpp index d8088621d..8dd23d2f5 100644 --- a/src/multimedia/video/qvideoframe.cpp +++ b/src/multimedia/video/qvideoframe.cpp @@ -902,10 +902,13 @@ QVideoFrame::PixelFormat QVideoFrame::pixelFormatFromImageFormat(QImage::Format { switch (format) { case QImage::Format_RGB32: + case QImage::Format_RGBX8888: return Format_RGB32; case QImage::Format_ARGB32: + case QImage::Format_RGBA8888: return Format_ARGB32; case QImage::Format_ARGB32_Premultiplied: + case QImage::Format_RGBA8888_Premultiplied: return Format_ARGB32_Premultiplied; case QImage::Format_RGB16: return Format_RGB565; |