mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
mfplat-streaming-support: Remove patch 0044.
This was based on a misreading of the documentation; see the following thread: https://gitlab.winehq.org/wine/wine/-/merge_requests/242#note_2170
This commit is contained in:
parent
73351fd593
commit
99fc74eb6c
@ -1,56 +0,0 @@
|
||||
From 542e27319af4903ddd557b7269ef52f2fee627d7 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
|
||||
Date: Wed, 15 Dec 2021 13:54:05 +0100
|
||||
Subject: [PATCH 44/88] winegstreamer: Let src_getrange_cb allocate the buffer
|
||||
in push_data.
|
||||
|
||||
GStreamer documentation also states that gst_pad_push caller loses its
|
||||
buffer reference, so whatever we were doing looks wrong here.
|
||||
---
|
||||
dlls/winegstreamer/wg_parser.c | 11 ++---------
|
||||
1 file changed, 2 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
|
||||
index 42c727fbd0b..0b67a6836c4 100644
|
||||
--- a/dlls/winegstreamer/wg_parser.c
|
||||
+++ b/dlls/winegstreamer/wg_parser.c
|
||||
@@ -1607,18 +1607,12 @@ static gboolean src_query_cb(GstPad *pad, GstObject *parent, GstQuery *query)
|
||||
static void *push_data(void *arg)
|
||||
{
|
||||
struct wg_parser *parser = arg;
|
||||
- GstBuffer *buffer;
|
||||
GstSegment *segment;
|
||||
+ GstBuffer *buffer;
|
||||
guint max_size;
|
||||
|
||||
GST_DEBUG("Starting push thread.");
|
||||
|
||||
- if (!(buffer = gst_buffer_new_allocate(NULL, 16384, NULL)))
|
||||
- {
|
||||
- GST_ERROR("Failed to allocate memory.");
|
||||
- return NULL;
|
||||
- }
|
||||
-
|
||||
max_size = parser->stop_offset ? parser->stop_offset : parser->file_size;
|
||||
|
||||
gst_pad_push_event(parser->my_src, gst_event_new_stream_start("wg_stream"));
|
||||
@@ -1636,6 +1630,7 @@ static void *push_data(void *arg)
|
||||
break;
|
||||
size = min(16384, max_size - parser->next_offset);
|
||||
|
||||
+ buffer = NULL;
|
||||
if ((ret = src_getrange_cb(parser->my_src, NULL, parser->next_offset, size, &buffer)) < 0)
|
||||
{
|
||||
GST_ERROR("Failed to read data, ret %s.", gst_flow_get_name(ret));
|
||||
@@ -1652,8 +1647,6 @@ static void *push_data(void *arg)
|
||||
}
|
||||
}
|
||||
|
||||
- gst_buffer_unref(buffer);
|
||||
-
|
||||
gst_pad_push_event(parser->my_src, gst_event_new_eos());
|
||||
|
||||
GST_DEBUG("Stopping push thread.");
|
||||
--
|
||||
2.34.1
|
||||
|
Loading…
Reference in New Issue
Block a user