[PATCH 5/5] winegstreamer: Also return output with 2 channels for multichannel inputs from AAC decoder.

[Paul Gofman]

From: Paul Gofman

---
 dlls/mf/tests/transform.c        | 2 +-
 dlls/winegstreamer/aac_decoder.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c
index 8db539f79cc..69510a3a6b4 100644
--- a/dlls/mf/tests/transform.c
+++ b/dlls/mf/tests/transform.c
@@ -2651,7 +2651,7 @@ static void test_aac_decoder_channels(const struct attribute_desc *input_type_de
         }
         ok(hr == MF_E_NO_MORE_TYPES, "got %#lx.\n", hr);
         if (many_channels)
-            todo_wine ok(i == ARRAY_SIZE(expect_available_outputs) * 2, "got %lu media types.\n", i);
+            ok(i == ARRAY_SIZE(expect_available_outputs) * 2, "got %lu media types.\n", i);
         else
             ok(i == ARRAY_SIZE(expect_available_outputs), "got %lu media types.\n", i);
         winetest_pop_context();
diff --git a/dlls/winegstreamer/aac_decoder.c b/dlls/winegstreamer/aac_decoder.c
index 35689a49c38..ac0da12c4ed 100644
--- a/dlls/winegstreamer/aac_decoder.c
+++ b/dlls/winegstreamer/aac_decoder.c
@@ -311,6 +311,14 @@ static HRESULT WINAPI transform_GetOutputAvailableType(IMFTransform *iface, DWOR
     if (channel_count >= ARRAY_SIZE(default_channel_mask))
         return MF_E_INVALIDMEDIATYPE;

+    if (channel_count > 2 && index >= 2)
+    {
+        /* If there are more than two channels in the input type output type GetOutputAvailableType additionally lists
+         * types with 2 channels. */
+        index -= 2;
+        channel_count = 2;
+    }
+
     if (index >= ARRAY_SIZE(aac_decoder_output_types))
         return MF_E_NO_MORE_TYPES;
     index = ARRAY_SIZE(aac_decoder_output_types) - index - 1;