From e9e10b2b1f025c3aa53a8904ec0a65e88fcb2887 Mon Sep 17 00:00:00 2001
From: Yoann Lopes <yoann.lopes@digia.com>
Date: Wed, 14 May 2014 18:45:37 +0200
Subject: [PATCH] WMF: fix video frames' viewport.

It was not taken into account at all.

Change-Id: I4ce85aba214cb4d89dcd018b1616a2a38094b5a6
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
---
 src/plugins/wmf/player/mfvideorenderercontrol.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/plugins/wmf/player/mfvideorenderercontrol.cpp b/src/plugins/wmf/player/mfvideorenderercontrol.cpp
index 04068296..42047366 100644
--- a/src/plugins/wmf/player/mfvideorenderercontrol.cpp
+++ b/src/plugins/wmf/player/mfvideorenderercontrol.cpp
@@ -572,6 +572,18 @@ namespace
                         QVideoSurfaceFormat format(QSize(width, height), m_pixelFormats[index]);
                         m_surfaceFormat = format;
 
+                        MFVideoArea viewport;
+                        if (SUCCEEDED(pMediaType->GetBlob(MF_MT_GEOMETRIC_APERTURE,
+                                                          reinterpret_cast<UINT8*>(&viewport),
+                                                          sizeof(MFVideoArea),
+                                                          NULL))) {
+
+                            m_surfaceFormat.setViewport(QRect(viewport.OffsetX.value,
+                                                              viewport.OffsetY.value,
+                                                              viewport.Area.cx,
+                                                              viewport.Area.cy));
+                        }
+
                         if (FAILED(pMediaType->GetUINT32(MF_MT_DEFAULT_STRIDE, (UINT32*)&m_bytesPerLine))) {
                             m_bytesPerLine = getBytesPerLine(format);
                         }