mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-25 19:21:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

unixfd: Allow sending buffers with no memories

Browse source 
There is no reason to not allow it, and it is useful for simple unit
test.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6747>
This commit is contained in:
Xavier Claessens 2024-04-03 13:17:01 -04:00 committed by Backport Bot
parent b370afab76
commit 5593a3c698
1 changed files with 45 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
subprojects/gst-plugins-bad/gst/unixfd/gstunixfdsrc.c
View file

@ -89,31 +89,34 @@ typedef struct
guint n_memory; guint n_memory;
} BufferContext; } BufferContext;
static void
release_buffer (GstUnixFdSrc * self, guint64 id)
{
/* Notify that we are not using this buffer anymore */
ReleaseBufferPayload payload = { id };
GError *error = NULL;
if (!gst_unix_fd_send_command (self->socket, COMMAND_TYPE_RELEASE_BUFFER,
NULL, (guint8 *) & payload, sizeof (payload), &error)) {
GST_WARNING_OBJECT (self, "Failed to send release-buffer command: %s",
error->message);
g_clear_error (&error);
}
}
static void static void
memory_weak_ref_cb (GstUnixFdSrc * self, GstMemory * mem) memory_weak_ref_cb (GstUnixFdSrc * self, GstMemory * mem)
{ {
GST_OBJECT_LOCK (self); GST_OBJECT_LOCK (self);
BufferContext *ctx = g_hash_table_lookup (self->memories, mem); BufferContext *ctx = g_hash_table_lookup (self->memories, mem);
if (ctx == NULL) if (ctx != NULL) {
goto out; if (--ctx->n_memory == 0) {
release_buffer (self, ctx->id);
if (--ctx->n_memory == 0) { g_free (ctx);
/* Notify that we are not using this buffer anymore */
ReleaseBufferPayload payload = { ctx->id };
GError *error = NULL;
if (!gst_unix_fd_send_command (self->socket, COMMAND_TYPE_RELEASE_BUFFER,
NULL, (guint8 *) & payload, sizeof (payload), &error)) {
GST_WARNING_OBJECT (self, "Failed to send release-buffer command: %s",
error->message);
g_clear_error (&error);
} }
g_free (ctx); g_hash_table_remove (self->memories, mem);
} }
g_hash_table_remove (self->memories, mem);
out:
GST_OBJECT_UNLOCK (self); GST_OBJECT_UNLOCK (self);
} }
@ -335,33 +338,26 @@ again:
goto on_error; goto on_error;
} }
if (fds == NULL) { gint fds_arr_len = 0;
GST_ERROR_OBJECT (self, gint *fds_arr =
"Received new buffer command without file descriptors"); (fds != NULL) ? g_unix_fd_list_steal_fds (fds, &fds_arr_len) : NULL;
return GST_FLOW_ERROR; if (fds_arr_len != new_buffer->n_memory) {
}
if (g_unix_fd_list_get_length (fds) != new_buffer->n_memory) {
GST_ERROR_OBJECT (self, GST_ERROR_OBJECT (self,
"Received new buffer command with %d file descriptors instead of " "Received new buffer command with %d file descriptors instead of "
"%d", g_unix_fd_list_get_length (fds), new_buffer->n_memory); "%d", fds_arr_len, new_buffer->n_memory);
ret = GST_FLOW_ERROR; ret = GST_FLOW_ERROR;
g_free (fds_arr);
goto on_error; goto on_error;
} }
if (new_buffer->type >= MEMORY_TYPE_LAST) { if (new_buffer->type >= MEMORY_TYPE_LAST) {
GST_ERROR_OBJECT (self, "Unknown buffer type %d", new_buffer->type); GST_ERROR_OBJECT (self, "Unknown buffer type %d", new_buffer->type);
ret = GST_FLOW_ERROR; ret = GST_FLOW_ERROR;
g_free (fds_arr);
goto on_error; goto on_error;
} }
GstAllocator *allocator = self->allocators[new_buffer->type]; GstAllocator *allocator = self->allocators[new_buffer->type];
gint *fds_arr = g_unix_fd_list_steal_fds (fds, NULL);
BufferContext *ctx = g_new0 (BufferContext, 1);
ctx->id = new_buffer->id;
ctx->n_memory = new_buffer->n_memory;
*outbuf = gst_buffer_new (); *outbuf = gst_buffer_new ();
GstClockTime base_time = GstClockTime base_time =
@ -394,18 +390,27 @@ again:
} }
GST_OBJECT_LOCK (self); GST_OBJECT_LOCK (self);
for (int i = 0; i < new_buffer->n_memory; i++) { if (new_buffer->n_memory > 0) {
GstMemory *mem = gst_fd_allocator_alloc (allocator, fds_arr[i], BufferContext *ctx = g_new0 (BufferContext, 1);
new_buffer->memories[i].size, GST_FD_MEMORY_FLAG_NONE); ctx->id = new_buffer->id;
gst_memory_resize (mem, new_buffer->memories[i].offset, ctx->n_memory = new_buffer->n_memory;
new_buffer->memories[i].size); for (int i = 0; i < new_buffer->n_memory; i++) {
GST_MINI_OBJECT_FLAG_SET (mem, GST_MEMORY_FLAG_READONLY); GstMemory *mem = gst_fd_allocator_alloc (allocator, fds_arr[i],
new_buffer->memories[i].size, GST_FD_MEMORY_FLAG_NONE);
gst_memory_resize (mem, new_buffer->memories[i].offset,
new_buffer->memories[i].size);
GST_MINI_OBJECT_FLAG_SET (mem, GST_MEMORY_FLAG_READONLY);
g_hash_table_insert (self->memories, mem, ctx); g_hash_table_insert (self->memories, mem, ctx);
gst_mini_object_weak_ref (GST_MINI_OBJECT_CAST (mem), gst_mini_object_weak_ref (GST_MINI_OBJECT_CAST (mem),
(GstMiniObjectNotify) memory_weak_ref_cb, self); (GstMiniObjectNotify) memory_weak_ref_cb, self);
gst_buffer_append_memory (*outbuf, mem); gst_buffer_append_memory (*outbuf, mem);
}
} else {
/* This buffer has no memories, we can release it immediately otherwise
* it gets leaked. */
release_buffer (self, new_buffer->id);
} }
GST_OBJECT_UNLOCK (self); GST_OBJECT_UNLOCK (self);