diff options
Diffstat (limited to 'src/multimedia/platform/windows/player/mftvideo.cpp')
| -rw-r--r-- | src/multimedia/platform/windows/player/mftvideo.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/multimedia/platform/windows/player/mftvideo.cpp b/src/multimedia/platform/windows/player/mftvideo.cpp index 8d318a6f6..c97c479d6 100644 --- a/src/multimedia/platform/windows/player/mftvideo.cpp +++ b/src/multimedia/platform/windows/player/mftvideo.cpp @@ -603,30 +603,30 @@ HRESULT MFTransform::OnFlush() return S_OK; } -QVideoFrame::PixelFormat MFTransform::formatFromSubtype(const GUID& subtype) +QVideoSurfaceFormat::PixelFormat MFTransform::formatFromSubtype(const GUID& subtype) { if (subtype == MFVideoFormat_ARGB32) - return QVideoFrame::Format_ARGB32; + return QVideoSurfaceFormat::Format_ARGB32; else if (subtype == MFVideoFormat_RGB32) - return QVideoFrame::Format_RGB32; + return QVideoSurfaceFormat::Format_RGB32; else if (subtype == MFVideoFormat_RGB24) - return QVideoFrame::Format_RGB24; + return QVideoSurfaceFormat::Format_RGB24; else if (subtype == MFVideoFormat_RGB565) - return QVideoFrame::Format_RGB565; + return QVideoSurfaceFormat::Format_RGB565; else if (subtype == MFVideoFormat_RGB555) - return QVideoFrame::Format_RGB555; + return QVideoSurfaceFormat::Format_RGB555; else if (subtype == MFVideoFormat_AYUV) - return QVideoFrame::Format_AYUV444; + return QVideoSurfaceFormat::Format_AYUV444; else if (subtype == MFVideoFormat_I420) - return QVideoFrame::Format_YUV420P; + return QVideoSurfaceFormat::Format_YUV420P; else if (subtype == MFVideoFormat_UYVY) - return QVideoFrame::Format_UYVY; + return QVideoSurfaceFormat::Format_UYVY; else if (subtype == MFVideoFormat_YV12) - return QVideoFrame::Format_YV12; + return QVideoSurfaceFormat::Format_YV12; else if (subtype == MFVideoFormat_NV12) - return QVideoFrame::Format_NV12; + return QVideoSurfaceFormat::Format_NV12; - return QVideoFrame::Format_Invalid; + return QVideoSurfaceFormat::Format_Invalid; } QVideoSurfaceFormat MFTransform::videoFormatForMFMediaType(IMFMediaType *mediaType, int *bytesPerLine) @@ -651,7 +651,7 @@ QVideoSurfaceFormat MFTransform::videoFormatForMFMediaType(IMFMediaType *mediaTy if (FAILED(mediaType->GetGUID(MF_MT_SUBTYPE, &subtype))) return QVideoSurfaceFormat(); - QVideoFrame::PixelFormat pixelFormat = formatFromSubtype(subtype); + QVideoSurfaceFormat::PixelFormat pixelFormat = formatFromSubtype(subtype); QVideoSurfaceFormat format(size, pixelFormat); if (SUCCEEDED(MFGetAttributeRatio(mediaType, MF_MT_FRAME_RATE, &num, &den))) { |