[PATCH v2 0/3] MR2815: winegstreamer: Fix IV50 video playback.

[Anton Baskanov (＠baskanov)]

--
  v2: ir50_32: Let video_decoder flip the video instead of doing it manually.
      winegstreamer: Don't force top-down orientation when changing output format in video_decoder.

https://gitlab.winehq.org/wine/wine/-/merge_requests/2815

[PATCH v2 1/3] winegstreamer: Add a second videoconvert before the videoflip.

[Anton Baskanov]

From: Anton Baskanov

videoflip can't handle 15/16-bit RGB. Fixes video playback in multiple games (e.g. Hard Truck 2, Firestarter).
---
 dlls/winegstreamer/wg_transform.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c
index 2f21e601e0b..94a9b136073 100644
--- a/dlls/winegstreamer/wg_transform.c
+++ b/dlls/winegstreamer/wg_transform.c
@@ -390,6 +390,9 @@ NTSTATUS wg_transform_create(void *args)

case WG_MAJOR_TYPE_VIDEO:
         case WG_MAJOR_TYPE_VIDEO_WMV:
+            if (!(element = create_element("videoconvert", "base"))
+                    || !append_element(transform->container, element, &first, &last))
+                goto out;
             if (!(transform->video_flip = create_element("videoflip", "base"))
                     || !append_element(transform->container, transform->video_flip, &first, &last))
                 goto out;

[PATCH v2 2/3] winegstreamer: Don't force top-down orientation when changing output format in video_decoder.

[Anton Baskanov]

From: Anton Baskanov

---
 dlls/winegstreamer/video_decoder.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dlls/winegstreamer/video_decoder.c b/dlls/winegstreamer/video_decoder.c
index 1fdabd46b96..04d175c7910 100644
--- a/dlls/winegstreamer/video_decoder.c
+++ b/dlls/winegstreamer/video_decoder.c
@@ -310,8 +310,6 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF
     {
         mf_media_type_to_wg_format(decoder->output_type, &output_format);

-        output_format.u.video.width = frame_size >> 32;
-        output_format.u.video.height = (UINT32)frame_size;
         output_format.u.video.fps_d = 0;
         output_format.u.video.fps_n = 0;

[PATCH v2 3/3] ir50_32: Let video_decoder flip the video instead of doing it manually.

[Anton Baskanov]

From: Anton Baskanov

Fixes upside-down videos in multiple games (e.g. Hard Truck 2, Firestarter).
---
 dlls/ir50_32/ir50.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/dlls/ir50_32/ir50.c b/dlls/ir50_32/ir50.c
index ccd7f245772..65c93f7fe5e 100644
--- a/dlls/ir50_32/ir50.c
+++ b/dlls/ir50_32/ir50.c
@@ -145,6 +145,7 @@ static LRESULT IV50_DecompressBegin( IMFTransform *decoder, LPBITMAPINFO in, LPB
     IMFMediaType *input_type, *output_type;
     const GUID *output_subtype;
     LRESULT r = ICERR_INTERNAL;
+    unsigned int stride;

TRACE("ICM_DECOMPRESS_BEGIN %p %p %p\n", decoder, in, out);

@@ -160,6 +161,10 @@ static LRESULT IV50_DecompressBegin( IMFTransform *decoder, LPBITMAPINFO in, LPB
     else
         return ICERR_BADFORMAT;

+    stride = (out->bmiHeader.biWidth + 3) & ~3;
+    if (out->bmiHeader.biHeight >= 0)
+        stride = -stride;
+
     if ( FAILED(MFCreateMediaType( &input_type )) )
         return ICERR_INTERNAL;

@@ -184,6 +189,8 @@ static LRESULT IV50_DecompressBegin( IMFTransform *decoder, LPBITMAPINFO in, LPB
                     output_type, &MF_MT_FRAME_SIZE,
                     make_uint64( out->bmiHeader.biWidth, abs(out->bmiHeader.biHeight) ) )) )
         goto done;
+    if ( FAILED(IMFMediaType_SetUINT32( output_type, &MF_MT_DEFAULT_STRIDE, stride)) )
+        goto done;

if ( FAILED(IMFTransform_SetInputType( decoder, 0, input_type, 0 )) ||
          FAILED(IMFTransform_SetOutputType( decoder, 0, output_type, 0 )) )
@@ -252,17 +259,13 @@ static LRESULT IV50_Decompress( IMFTransform *decoder, ICDECOMPRESS *icd, DWORD
     {
         LONG width = icd->lpbiOutput->biWidth * (icd->lpbiOutput->biBitCount / 8);
         LONG height = abs( icd->lpbiOutput->biHeight );
-        LONG data_stride = (width + 3) & ~3;
-        LONG out_stride = icd->lpbiOutput->biHeight >= 0 ? -data_stride : data_stride;
-        BYTE *output_start = (BYTE *)icd->lpOutput;
-
-        if (out_stride < 0)
-            output_start += (height - 1) * abs(out_stride);
+        LONG stride = (width + 3) & ~3;
+        BYTE *output = (BYTE *)icd->lpOutput;

if ( FAILED(IMFMediaBuffer_Lock( out_buf, &data, NULL, NULL )))
             goto done;

-        MFCopyImage( output_start, out_stride, data, data_stride, width, height );
+        MFCopyImage( output, stride, data, stride, width, height );

IMFMediaBuffer_Unlock( out_buf );
         r = ICERR_OK;

[Anton Baskanov (＠baskanov)]

On Tue May 16 16:41:10 2023 +0000, Anton Baskanov wrote:
> changed this line in [version 2 of the diff](/wine/wine/-/merge_requests/2815/diffs?diff_id=47199&start_sha=5f0b3cca9a1c35a82a5387ca811a30a0feaef8af#bd62eaa50df6790a4fd6a511972092cad3bb6fa1_86_86)

Good point. Changed ir50_32 to pass the correct stride instead of manual flipping.

[PATCH v2 0/3] MR2815: winegstreamer: Fix IV50 video playback. - approved

[Zebediah Figura (＠zfigura)]

This merge request was approved by Zebediah Figura.

[PATCH v2 0/3] MR2815: winegstreamer: Fix IV50 video playback. - approved

[Rémi Bernon (＠rbernon)]

This merge request was approved by Rémi Bernon.