slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

WMF: fix RGB24 format matching.

Browse Source 
MFVideoFormat_RGB24 has a BGR layout and should therefore be matched to
QVideoFrame::Format_BGR24, not Format_RGB24.

Task-number: QTBUG-42323
Change-Id: I1749b575b1738168e3d3c0d055dee10f6d870c0c
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
This commit is contained in:
Yoann Lopes
2015-03-12 14:52:52 +01:00
parent 7420fb409a
commit 2d8fcc1560
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/wmf/player/mfvideorenderercontrol.cpp
View File

@@ -813,7 +813,7 @@ namespace
case QVideoFrame::Format_RGB32: case QVideoFrame::Format_RGB32:
mediaType->SetGUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32); mediaType->SetGUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32);
break; break;
case QVideoFrame::Format_RGB24: case QVideoFrame::Format_BGR24: // MFVideoFormat_RGB24 has a BGR layout
mediaType->SetGUID(MF_MT_SUBTYPE, MFVideoFormat_RGB24); mediaType->SetGUID(MF_MT_SUBTYPE, MFVideoFormat_RGB24);
break; break;
case QVideoFrame::Format_RGB565: case QVideoFrame::Format_RGB565:
@@ -1082,6 +1082,7 @@ namespace
return format.frameWidth() * 4; return format.frameWidth() * 4;
// 24 bpp packed formats. // 24 bpp packed formats.
case QVideoFrame::Format_RGB24: case QVideoFrame::Format_RGB24:
case QVideoFrame::Format_BGR24:
return PAD_TO_DWORD(format.frameWidth() * 3); return PAD_TO_DWORD(format.frameWidth() * 3);
// 16 bpp packed formats. // 16 bpp packed formats.
case QVideoFrame::Format_RGB565: case QVideoFrame::Format_RGB565: