mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

examples: keep a ref on the buffer instead of the memory

Browse source 
Like in eglglessink

https://bugzilla.gnome.org/show_bug.cgi?id=726107
This commit is contained in:
Julien Isorce 2014-03-25 17:16:31 +00:00
parent 73d83f311c
commit 6995b4d5b3
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
examples/egl/testegl.c
View file

@ -173,7 +173,7 @@ typedef struct
GCond *cond; GCond *cond;
gboolean flushing; gboolean flushing;
GstMiniObject *popped_obj; GstMiniObject *popped_obj;
GstMemory *current_mem; GstBuffer *current_buffer;
GstBufferPool *pool; GstBufferPool *pool;
/* GLib mainloop */ /* GLib mainloop */
@ -537,8 +537,7 @@ gst_custom_egl_image_buffer_pool_acquire_buffer (GstBufferPool * bpool,
/* XXX: Don't return the memory we just rendered, glEGLImageTargetTexture2DOES() /* XXX: Don't return the memory we just rendered, glEGLImageTargetTexture2DOES()
* keeps the EGLImage unmappable until the next one is uploaded * keeps the EGLImage unmappable until the next one is uploaded
*/ */
if (*buffer if (*buffer && *buffer == pool->state->current_buffer) {
&& gst_buffer_peek_memory (*buffer, 0) == pool->state->current_mem) {
GstBuffer *oldbuf = *buffer; GstBuffer *oldbuf = *buffer;
ret = ret =
@ -961,12 +960,14 @@ render_scene (APP_STATE_T * state)
static void static void
update_image (APP_STATE_T * state, GstBuffer * buffer) update_image (APP_STATE_T * state, GstBuffer * buffer)
{ {
GstMemory *mem = gst_buffer_peek_memory (buffer, 0); GstMemory *mem = NULL;
if (state->current_mem) { if (state->current_buffer) {
gst_memory_unref (state->current_mem); gst_buffer_unref (state->current_buffer);
} }
state->current_mem = gst_memory_ref (mem); state->current_buffer = gst_buffer_ref (buffer);
mem = gst_buffer_peek_memory (buffer, 0);
TRACE_VC_MEMORY_ONCE_FOR_ID ("before glEGLImageTargetTexture2DOES", gid0); TRACE_VC_MEMORY_ONCE_FOR_ID ("before glEGLImageTargetTexture2DOES", gid0);
@ -1006,10 +1007,10 @@ terminate_intercom (APP_STATE_T * state)
static void static void
flush_internal (APP_STATE_T * state) flush_internal (APP_STATE_T * state)
{ {
if (state->current_mem) { if (state->current_buffer) {
gst_memory_unref (state->current_mem); gst_buffer_unref (state->current_buffer);
} }
state->current_mem = NULL; state->current_buffer = NULL;
} }
static void static void
@ -1695,6 +1696,7 @@ main (int argc, char **argv)
/* Clear application state */ /* Clear application state */
memset (state, 0, sizeof (*state)); memset (state, 0, sizeof (*state));
state->animate = TRUE; state->animate = TRUE;
state->current_buffer = NULL;
/* must initialise the threading system before using any other GLib funtion */ /* must initialise the threading system before using any other GLib funtion */
if (!g_thread_supported ()) if (!g_thread_supported ())