Rémi Bernon : winegstreamer: Move release_memory_sample helper around.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ca03b68cf47beec4a97004322b6e87d83bf1dc14
URL:    https://gitlab.winehq.org/wine/wine/-/commit/ca03b68cf47beec4a97004322b6e87d...

Author: Rémi Bernon 
Date:   Sat Jun 17 10:49:55 2023 +0200

winegstreamer: Move release_memory_sample helper around.

---

dlls/winegstreamer/wg_allocator.c | 48 +++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/dlls/winegstreamer/wg_allocator.c b/dlls/winegstreamer/wg_allocator.c
index fd940d5961e..1edd27a0fd4 100644
--- a/dlls/winegstreamer/wg_allocator.c
+++ b/dlls/winegstreamer/wg_allocator.c
@@ -65,6 +65,30 @@ typedef struct

G_DEFINE_TYPE(WgAllocator, wg_allocator, GST_TYPE_ALLOCATOR);

+static void release_memory_sample(WgAllocator *allocator, WgMemory *memory, bool discard_data)
+{
+    struct wg_sample *sample;
+
+    if (!(sample = memory->sample))
+        return;
+
+    while (sample->refcount > 1)
+    {
+        GST_WARNING("Waiting for sample %p to be unmapped", sample);
+        pthread_cond_wait(&allocator->release_cond, &allocator->mutex);
+    }
+    InterlockedDecrement(&sample->refcount);
+
+    if (memory->written && !discard_data)
+    {
+        GST_WARNING("Copying %#zx bytes from sample %p, back to memory %p", memory->written, sample, memory);
+        memcpy(memory->unix_map_info.data, memory->sample->data, memory->written);
+    }
+
+    memory->sample = NULL;
+    GST_INFO("Released sample %p from memory %p", sample, memory);
+}
+
 static gpointer wg_allocator_map(GstMemory *gst_memory, GstMapInfo *info, gsize maxsize)
 {
     WgAllocator *allocator = (WgAllocator *)gst_memory->allocator;
@@ -217,30 +241,6 @@ GstAllocator *wg_allocator_create(void)
     return GST_ALLOCATOR(allocator);
 }

-static void release_memory_sample(WgAllocator *allocator, WgMemory *memory, bool discard_data)
-{
-    struct wg_sample *sample;
-
-    if (!(sample = memory->sample))
-        return;
-
-    while (sample->refcount > 1)
-    {
-        GST_WARNING("Waiting for sample %p to be unmapped", sample);
-        pthread_cond_wait(&allocator->release_cond, &allocator->mutex);
-    }
-    InterlockedDecrement(&sample->refcount);
-
-    if (memory->written && !discard_data)
-    {
-        GST_WARNING("Copying %#zx bytes from sample %p, back to memory %p", memory->written, sample, memory);
-        memcpy(memory->unix_map_info.data, memory->sample->data, memory->written);
-    }
-
-    memory->sample = NULL;
-    GST_INFO("Released sample %p from memory %p", sample, memory);
-}
-
 void wg_allocator_destroy(GstAllocator *gst_allocator)
 {
     WgAllocator *allocator = (WgAllocator *)gst_allocator;