Rémi Bernon : winegstreamer: Introduce a new wg_transform_create_quartz helper.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: cc395ce83f1e2dd64b0dff75a36ad421e02ed572
URL:    https://gitlab.winehq.org/wine/wine/-/commit/cc395ce83f1e2dd64b0dff75a36ad42...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Tue Mar  5 23:03:31 2024 +0100

winegstreamer: Introduce a new wg_transform_create_quartz helper.

---

 dlls/winegstreamer/gst_private.h      |  2 ++
 dlls/winegstreamer/main.c             | 15 +++++++++++++++
 dlls/winegstreamer/quartz_transform.c | 13 +++----------
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index 4bdef90e045..92805818ff4 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -83,6 +83,8 @@ void wg_parser_stream_seek(wg_parser_stream_t stream, double rate,
 
 wg_transform_t wg_transform_create(const struct wg_format *input_format,
         const struct wg_format *output_format, const struct wg_transform_attrs *attrs);
+HRESULT wg_transform_create_quartz(const AM_MEDIA_TYPE *input_format, const AM_MEDIA_TYPE *output_format,
+        const struct wg_transform_attrs *attrs, wg_transform_t *transform);
 void wg_transform_destroy(wg_transform_t transform);
 bool wg_transform_set_output_format(wg_transform_t transform, struct wg_format *format);
 bool wg_transform_get_status(wg_transform_t transform, bool *accepts_input);
diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c
index 4d38a2bf66c..8c5ad931e83 100644
--- a/dlls/winegstreamer/main.c
+++ b/dlls/winegstreamer/main.c
@@ -357,6 +357,21 @@ wg_transform_t wg_transform_create(const struct wg_format *input_format,
     return params.transform;
 }
 
+HRESULT wg_transform_create_quartz(const AM_MEDIA_TYPE *input_type, const AM_MEDIA_TYPE *output_type,
+        const struct wg_transform_attrs *attrs, wg_transform_t *transform)
+{
+    struct wg_format input_format, output_format;
+
+    if (!amt_to_wg_format(input_type, &input_format))
+        return E_FAIL;
+    if (!amt_to_wg_format(output_type, &output_format))
+        return E_FAIL;
+
+    if (!(*transform = wg_transform_create(&input_format, &output_format, attrs)))
+        return E_FAIL;
+    return S_OK;
+}
+
 void wg_transform_destroy(wg_transform_t transform)
 {
     TRACE("transform %#I64x.\n", transform);
diff --git a/dlls/winegstreamer/quartz_transform.c b/dlls/winegstreamer/quartz_transform.c
index ad0c3077733..b85b24f4278 100644
--- a/dlls/winegstreamer/quartz_transform.c
+++ b/dlls/winegstreamer/quartz_transform.c
@@ -98,26 +98,19 @@ static HRESULT transform_query_interface(struct strmbase_filter *iface, REFIID i
 static HRESULT transform_init_stream(struct strmbase_filter *iface)
 {
     struct transform *filter = impl_from_strmbase_filter(iface);
-    struct wg_format input_format, output_format;
     struct wg_transform_attrs attrs = {0};
     HRESULT hr;
 
     if (filter->source.pin.peer)
     {
-        if (!amt_to_wg_format(&filter->sink.pin.mt, &input_format))
-            return E_FAIL;
-
-        if (!amt_to_wg_format(&filter->source.pin.mt, &output_format))
-            return E_FAIL;
-
         if (FAILED(hr = wg_sample_queue_create(&filter->sample_queue)))
             return hr;
 
-        filter->transform = wg_transform_create(&input_format, &output_format, &attrs);
-        if (!filter->transform)
+        if (FAILED(hr = wg_transform_create_quartz(&filter->sink.pin.mt, &filter->source.pin.mt,
+                &attrs, &filter->transform)))
         {
             wg_sample_queue_destroy(filter->sample_queue);
-            return E_FAIL;
+            return hr;
         }
 
         hr = IMemAllocator_Commit(filter->source.pAllocator);