Rémi Bernon : winegstreamer: Pass desired input queue length to wg_transform_create.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 036166faf7671d2e2c4c11422a55170323503cff
URL:    https://gitlab.winehq.org/wine/wine/-/commit/036166faf7671d2e2c4c11422a55170...

Author: Rémi Bernon 
Date:   Wed May 24 10:07:56 2023 +0200

winegstreamer: Pass desired input queue length to wg_transform_create.

---

dlls/winegstreamer/h264_decoder.c |  6 ++++++
 dlls/winegstreamer/unixlib.h      |  1 +
 dlls/winegstreamer/wg_transform.c | 13 ++-----------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c
index 81b06445df9..8795d12169f 100644
--- a/dlls/winegstreamer/h264_decoder.c
+++ b/dlls/winegstreamer/h264_decoder.c
@@ -76,9 +76,15 @@ static struct h264_decoder *impl_from_IMFTransform(IMFTransform *iface)

static HRESULT try_create_wg_transform(struct h264_decoder *decoder)
 {
+    /* Call of Duty: Black Ops 3 doesn't care about the ProcessInput/ProcessOutput
+     * return values, it calls them in a specific order and expects the decoder
+     * transform to be able to queue its input buffers. We need to use a buffer list
+     * to match its expectations.
+     */
     struct wg_transform_attrs attrs =
     {
         .output_plane_align = 15,
+        .input_queue_length = 15,
     };
     struct wg_format input_format;
     struct wg_format output_format;
diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h
index 15b5dcff352..938319faea7 100644
--- a/dlls/winegstreamer/unixlib.h
+++ b/dlls/winegstreamer/unixlib.h
@@ -308,6 +308,7 @@ struct wg_parser_stream_seek_params
 struct wg_transform_attrs
 {
     UINT32 output_plane_align;
+    UINT32 input_queue_length;
 };

struct wg_transform_create_params
diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c
index a0be84d5178..f21914b4086 100644
--- a/dlls/winegstreamer/wg_transform.c
+++ b/dlls/winegstreamer/wg_transform.c
@@ -51,7 +51,6 @@ struct wg_transform
     GstSegment segment;
     GstQuery *drain_query;

-    guint input_max_length;
     GstAtomicQueue *input_queue;

bool input_is_flipped;
@@ -302,7 +301,6 @@ NTSTATUS wg_transform_create(void *args)
     if (!(transform->allocator = wg_allocator_create(transform_request_sample, transform)))
         goto out;
     transform->attrs = *params->attrs;
-    transform->input_max_length = 1;
     transform->output_format = output_format;

if (!(src_caps = wg_format_to_caps(&input_format)))
@@ -339,13 +337,6 @@ NTSTATUS wg_transform_create(void *args)
     switch (input_format.major_type)
     {
         case WG_MAJOR_TYPE_VIDEO_H264:
-            /* Call of Duty: Black Ops 3 doesn't care about the ProcessInput/ProcessOutput
-             * return values, it calls them in a specific order and expects the decoder
-             * transform to be able to queue its input buffers. We need to use a buffer list
-             * to match its expectations.
-             */
-            transform->input_max_length = 16;
-            /* fallthrough */
         case WG_MAJOR_TYPE_AUDIO_MPEG1:
         case WG_MAJOR_TYPE_AUDIO_MPEG4:
         case WG_MAJOR_TYPE_AUDIO_WMA:
@@ -561,7 +552,7 @@ NTSTATUS wg_transform_push_data(void *args)
     guint length;

length = gst_atomic_queue_length(transform->input_queue);
-    if (length >= transform->input_max_length)
+    if (length >= transform->attrs.input_queue_length + 1)
     {
         GST_INFO("Refusing %u bytes, %u buffers already queued", sample->size, length);
         params->result = MF_E_NOTACCEPTING;
@@ -866,7 +857,7 @@ NTSTATUS wg_transform_get_status(void *args)
     struct wg_transform_get_status_params *params = args;
     struct wg_transform *transform = params->transform;

-    params->accepts_input = gst_atomic_queue_length(transform->input_queue) < transform->input_max_length;
+    params->accepts_input = gst_atomic_queue_length(transform->input_queue) < transform->attrs.input_queue_length + 1;
     return STATUS_SUCCESS;
 }