Rémi Bernon : winegstreamer: Always set aperture attributes on video decoder output types.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0567f993081708dc1fe2f8b421fdcca82b2c9e25
URL:    https://gitlab.winehq.org/wine/wine/-/commit/0567f993081708dc1fe2f8b421fdcca...

Author: Rémi Bernon 
Date:   Fri Apr 26 11:53:45 2024 +0200

winegstreamer: Always set aperture attributes on video decoder output types.

---

dlls/winegstreamer/video_decoder.c | 38 ++++++++++++++++----------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/dlls/winegstreamer/video_decoder.c b/dlls/winegstreamer/video_decoder.c
index 676f3336b91..9184a86b7f4 100644
--- a/dlls/winegstreamer/video_decoder.c
+++ b/dlls/winegstreamer/video_decoder.c
@@ -122,9 +122,9 @@ static HRESULT create_output_media_type(struct video_decoder *decoder, const GUI
         IMFMediaType *output_type, IMFMediaType **media_type)
 {
     IMFMediaType *default_type = decoder->output_type, *stream_type = output_type ? output_type : decoder->stream_type;
+    MFVideoArea default_aperture = {{0}}, aperture;
     IMFVideoMediaType *video_type;
     UINT32 value, width, height;
-    MFVideoArea aperture;
     UINT64 ratio;
     HRESULT hr;

@@ -138,6 +138,9 @@ static HRESULT create_output_media_type(struct video_decoder *decoder, const GUI
     width = ratio >> 32;
     height = ratio;

+    default_aperture.Area.cx = width;
+    default_aperture.Area.cy = height;
+
     if (FAILED(IMFMediaType_GetUINT64(stream_type, &MF_MT_FRAME_RATE, &ratio)))
         ratio = (UINT64)30000 << 32 | 1001;
     if (FAILED(hr = IMFVideoMediaType_SetUINT64(video_type, &MF_MT_FRAME_RATE, ratio)))
@@ -178,29 +181,20 @@ static HRESULT create_output_media_type(struct video_decoder *decoder, const GUI
     if (FAILED(hr = IMFVideoMediaType_SetUINT32(video_type, &MF_MT_FIXED_SIZE_SAMPLES, value)))
         goto done;

-    if (SUCCEEDED(IMFMediaType_GetBlob(stream_type, &MF_MT_MINIMUM_DISPLAY_APERTURE,
-            (BYTE *)&aperture, sizeof(aperture), &value)))
-    {
-        if (FAILED(hr = IMFVideoMediaType_SetBlob(video_type, &MF_MT_MINIMUM_DISPLAY_APERTURE,
-                (BYTE *)&aperture, sizeof(aperture))))
-            goto done;
-    }
+    if (FAILED(IMFMediaType_GetBlob(stream_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, (BYTE *)&aperture, sizeof(aperture), &value)))
+        aperture = default_aperture;
+    if (FAILED(hr = IMFVideoMediaType_SetBlob(video_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, (BYTE *)&aperture, sizeof(aperture))))
+        goto done;

-    if (SUCCEEDED(IMFMediaType_GetBlob(stream_type, &MF_MT_GEOMETRIC_APERTURE,
-            (BYTE *)&aperture, sizeof(aperture), &value)))
-    {
-        if (FAILED(hr = IMFVideoMediaType_SetBlob(video_type, &MF_MT_GEOMETRIC_APERTURE,
-                (BYTE *)&aperture, sizeof(aperture))))
-            goto done;
-    }
+    if (FAILED(IMFMediaType_GetBlob(stream_type, &MF_MT_GEOMETRIC_APERTURE, (BYTE *)&aperture, sizeof(aperture), &value)))
+        aperture = default_aperture;
+    if (FAILED(hr = IMFVideoMediaType_SetBlob(video_type, &MF_MT_GEOMETRIC_APERTURE, (BYTE *)&aperture, sizeof(aperture))))
+        goto done;

-    if (SUCCEEDED(IMFMediaType_GetBlob(stream_type, &MF_MT_PAN_SCAN_APERTURE,
-            (BYTE *)&aperture, sizeof(aperture), &value)))
-    {
-        if (FAILED(hr = IMFVideoMediaType_SetBlob(video_type, &MF_MT_PAN_SCAN_APERTURE,
-                (BYTE *)&aperture, sizeof(aperture))))
-            goto done;
-    }
+    if (FAILED(IMFMediaType_GetBlob(stream_type, &MF_MT_PAN_SCAN_APERTURE, (BYTE *)&aperture, sizeof(aperture), &value)))
+        aperture = default_aperture;
+    if (FAILED(hr = IMFVideoMediaType_SetBlob(video_type, &MF_MT_PAN_SCAN_APERTURE, (BYTE *)&aperture, sizeof(aperture))))
+        goto done;

done:
     if (SUCCEEDED(hr))