From 9d650925192e0c4396470c5a95433f796843a64d Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Sat, 15 Apr 2023 18:33:17 -0500 Subject: [PATCH] Rebase against 4d610717bbc21d65e41a29f9fe9ab5f2963cf16d. --- ...treamer-Allow-videoconvert-to-parallelize.patch | 14 +++++++------- staging/upstream-commit | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/patches/mfplat-streaming-support/0008-winegstreamer-Allow-videoconvert-to-parallelize.patch b/patches/mfplat-streaming-support/0008-winegstreamer-Allow-videoconvert-to-parallelize.patch index 19362baa..d1de8dd1 100644 --- a/patches/mfplat-streaming-support/0008-winegstreamer-Allow-videoconvert-to-parallelize.patch +++ b/patches/mfplat-streaming-support/0008-winegstreamer-Allow-videoconvert-to-parallelize.patch @@ -1,4 +1,4 @@ -From eba9e414d60a33dfde7e7b978fcdddbaf9bfe5b6 Mon Sep 17 00:00:00 2001 +From c7b306e0f85a0cd5ef1f5c0849edc56483989d7c Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Wed, 21 Oct 2020 16:03:21 -0500 Subject: [PATCH] winegstreamer: Allow videoconvert to parallelize. @@ -11,19 +11,19 @@ Signed-off-by: Zebediah Figura 1 file changed, 3 insertions(+) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c -index 0573c99858b..5df08dc5fd7 100644 +index 2fa87ac611b..2b3cc2633e3 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c -@@ -760,6 +760,9 @@ static void pad_added_cb(GstElement *element, GstPad *pad, gpointer user) - if (!(vconv = create_element("videoconvert", "base"))) +@@ -812,6 +812,9 @@ static void pad_added_cb(GstElement *element, GstPad *pad, gpointer user) + || !append_element(parser->container, element, &first, &last)) goto out; + /* Let GStreamer choose a default number of threads. */ + gst_util_set_object_arg(G_OBJECT(vconv), "n-threads", "0"); + /* GStreamer outputs RGB video top-down, but DirectShow expects bottom-up. */ - if (!(flip = create_element("videoflip", "good"))) - goto out; + if (!(element = create_element("videoflip", "good")) + || !append_element(parser->container, element, &first, &last)) -- -2.37.2 +2.39.2 diff --git a/staging/upstream-commit b/staging/upstream-commit index a5b5b022..5ee979bd 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -f512b3c08ccfc9b9c235964002e644e2cbd657cf +4d610717bbc21d65e41a29f9fe9ab5f2963cf16d