[PATCH 1/1] evr/mixer: Respect input media type MF_MT_MINIMUM_DISPLAY_APERTURE.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/evr/mixer.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c
index 222fc538fec..263230d8263 100644
--- a/dlls/evr/mixer.c
+++ b/dlls/evr/mixer.c
@@ -45,7 +45,7 @@ struct input_stream
     IMFMediaType *media_type;
     MFVideoNormalizedRect rect;
     unsigned int zorder;
-    SIZE frame_size;
+    MFVideoArea aperture;
     IMFSample *sample;
     unsigned int sample_requested : 1;
 };
@@ -851,6 +851,7 @@ static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DW
     DXVA2_VideoDesc video_desc;
     HRESULT hr = E_NOTIMPL;
     unsigned int count;
+    UINT32 size;
     GUID *guids;

TRACE("%p, %lu, %p, %#lx.\n", iface, id, media_type, flags);
@@ -884,8 +885,15 @@ static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DW
                             if (mixer->inputs[0].media_type)
                                 IMFMediaType_Release(mixer->inputs[0].media_type);
                             mixer->inputs[0].media_type = media_type;
-                            mixer->inputs[0].frame_size.cx = video_desc.SampleWidth;
-                            mixer->inputs[0].frame_size.cy = video_desc.SampleHeight;
+
+                            if (FAILED(IMFMediaType_GetBlob(media_type, &MF_MT_MINIMUM_DISPLAY_APERTURE,
+                                    (BYTE *)&mixer->inputs[0].aperture, sizeof(mixer->inputs[0].aperture), &size)))
+                            {
+                                memset(&mixer->inputs[0].aperture, 0, sizeof(mixer->inputs[0].aperture));
+                                mixer->inputs[0].aperture.Area.cx = video_desc.SampleWidth;
+                                mixer->inputs[0].aperture.Area.cy = video_desc.SampleHeight;
+                            }
+
                             IMFMediaType_AddRef(mixer->inputs[0].media_type);
                         }
                         CoTaskMemFree(guids);
@@ -1326,7 +1334,8 @@ static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt)

/* Full input frame corrected to full destination rectangle. */

-        video_mixer_scale_rect(&sample->SrcRect, stream->frame_size.cx, stream->frame_size.cy, &zoom_rect);
+        video_mixer_scale_rect(&sample->SrcRect, stream->aperture.Area.cx, stream->aperture.Area.cy, &zoom_rect);
+        OffsetRect(&sample->SrcRect, stream->aperture.OffsetX.value, stream->aperture.OffsetY.value);
         CopyRect(&sample->DstRect, &dst);
         video_mixer_correct_aspect_ratio(&sample->SrcRect, &sample->DstRect);