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

examples: avoid a clashing name with the recently added GstEGLImagePool

Browse source 
Fixes build with current master.
This commit is contained in:
Josep Torra 2014-03-05 17:25:09 +01:00
parent 85db124673
commit 6962aa5d4c
1 changed files with 44 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
examples/egl/testegl.c
View file

@ -207,15 +207,15 @@ typedef struct
gboolean add_metavideo; gboolean add_metavideo;
gboolean want_eglimage; gboolean want_eglimage;
GstEGLDisplay *display; GstEGLDisplay *display;
} GstEGLImageBufferPool; } GstCustomEGLImageBufferPool;
typedef GstVideoBufferPoolClass GstEGLImageBufferPoolClass; typedef GstVideoBufferPoolClass GstCustomEGLImageBufferPoolClass;
#define GST_EGL_IMAGE_BUFFER_POOL(p) ((GstEGLImageBufferPool*)(p)) #define GST_CUSTOM_EGL_IMAGE_BUFFER_POOL(p) ((GstCustomEGLImageBufferPool*)(p))
GType gst_egl_image_buffer_pool_get_type (void); GType gst_custom_egl_image_buffer_pool_get_type (void);
G_DEFINE_TYPE (GstEGLImageBufferPool, gst_egl_image_buffer_pool, G_DEFINE_TYPE (GstCustomEGLImageBufferPool, gst_custom_egl_image_buffer_pool,
GST_TYPE_VIDEO_BUFFER_POOL); GST_TYPE_VIDEO_BUFFER_POOL);
static void init_ogl (APP_STATE_T * state); static void init_ogl (APP_STATE_T * state);
@ -227,7 +227,7 @@ static void redraw_scene (APP_STATE_T * state);
static void update_model (APP_STATE_T * state); static void update_model (APP_STATE_T * state);
static void init_textures (APP_STATE_T * state); static void init_textures (APP_STATE_T * state);
static APP_STATE_T _state, *state = &_state; static APP_STATE_T _state, *state = &_state;
static GstBufferPool *gst_egl_image_buffer_pool_new (APP_STATE_T * state, static GstBufferPool *gst_custom_egl_image_buffer_pool_new (APP_STATE_T * state,
GstEGLDisplay * display); GstEGLDisplay * display);
static gboolean queue_object (APP_STATE_T * state, GstMiniObject * obj, static gboolean queue_object (APP_STATE_T * state, GstMiniObject * obj,
gboolean synchronous); gboolean synchronous);
@ -402,7 +402,7 @@ mem_error:
} }
static const gchar ** static const gchar **
gst_egl_image_buffer_pool_get_options (GstBufferPool * bpool) gst_custom_egl_image_buffer_pool_get_options (GstBufferPool * bpool)
{ {
static const gchar *options[] = { GST_BUFFER_POOL_OPTION_VIDEO_META, NULL static const gchar *options[] = { GST_BUFFER_POOL_OPTION_VIDEO_META, NULL
}; };
@ -411,10 +411,10 @@ gst_egl_image_buffer_pool_get_options (GstBufferPool * bpool)
} }
static gboolean static gboolean
gst_egl_image_buffer_pool_set_config (GstBufferPool * bpool, gst_custom_egl_image_buffer_pool_set_config (GstBufferPool * bpool,
GstStructure * config) GstStructure * config)
{ {
GstEGLImageBufferPool *pool = GST_EGL_IMAGE_BUFFER_POOL (bpool); GstCustomEGLImageBufferPool *pool = GST_CUSTOM_EGL_IMAGE_BUFFER_POOL (bpool);
GstCaps *caps; GstCaps *caps;
GstVideoInfo info; GstVideoInfo info;
@ -423,7 +423,8 @@ gst_egl_image_buffer_pool_set_config (GstBufferPool * bpool,
pool->allocator = NULL; pool->allocator = NULL;
if (!GST_BUFFER_POOL_CLASS if (!GST_BUFFER_POOL_CLASS
(gst_egl_image_buffer_pool_parent_class)->set_config (bpool, config)) (gst_custom_egl_image_buffer_pool_parent_class)->set_config (bpool,
config))
return FALSE; return FALSE;
if (!gst_buffer_pool_config_get_params (config, &caps, NULL, NULL, NULL) if (!gst_buffer_pool_config_get_params (config, &caps, NULL, NULL, NULL)
@ -452,16 +453,16 @@ gst_egl_image_buffer_pool_set_config (GstBufferPool * bpool,
} }
static GstFlowReturn static GstFlowReturn
gst_egl_image_buffer_pool_alloc_buffer (GstBufferPool * bpool, gst_custom_egl_image_buffer_pool_alloc_buffer (GstBufferPool * bpool,
GstBuffer ** buffer, GstBufferPoolAcquireParams * params) GstBuffer ** buffer, GstBufferPoolAcquireParams * params)
{ {
GstEGLImageBufferPool *pool = GST_EGL_IMAGE_BUFFER_POOL (bpool); GstCustomEGLImageBufferPool *pool = GST_CUSTOM_EGL_IMAGE_BUFFER_POOL (bpool);
*buffer = NULL; *buffer = NULL;
if (!pool->add_metavideo || !pool->want_eglimage) if (!pool->add_metavideo || !pool->want_eglimage)
return return
GST_BUFFER_POOL_CLASS GST_BUFFER_POOL_CLASS
(gst_egl_image_buffer_pool_parent_class)->alloc_buffer (bpool, (gst_custom_egl_image_buffer_pool_parent_class)->alloc_buffer (bpool,
buffer, params); buffer, params);
if (!pool->allocator) if (!pool->allocator)
@ -487,8 +488,8 @@ gst_egl_image_buffer_pool_alloc_buffer (GstBufferPool * bpool,
gst_query_unref (query); gst_query_unref (query);
return return
GST_BUFFER_POOL_CLASS GST_BUFFER_POOL_CLASS
(gst_egl_image_buffer_pool_parent_class)->alloc_buffer (bpool, (gst_custom_egl_image_buffer_pool_parent_class)->alloc_buffer
buffer, params); (bpool, buffer, params);
} }
v = gst_structure_get_value (s, "buffer"); v = gst_structure_get_value (s, "buffer");
@ -499,8 +500,8 @@ gst_egl_image_buffer_pool_alloc_buffer (GstBufferPool * bpool,
GST_WARNING ("Fallback memory allocation"); GST_WARNING ("Fallback memory allocation");
return return
GST_BUFFER_POOL_CLASS GST_BUFFER_POOL_CLASS
(gst_egl_image_buffer_pool_parent_class)->alloc_buffer (bpool, (gst_custom_egl_image_buffer_pool_parent_class)->alloc_buffer
buffer, params); (bpool, buffer, params);
} }
return GST_FLOW_OK; return GST_FLOW_OK;
@ -509,7 +510,7 @@ gst_egl_image_buffer_pool_alloc_buffer (GstBufferPool * bpool,
default: default:
return return
GST_BUFFER_POOL_CLASS GST_BUFFER_POOL_CLASS
(gst_egl_image_buffer_pool_parent_class)->alloc_buffer (bpool, (gst_custom_egl_image_buffer_pool_parent_class)->alloc_buffer (bpool,
buffer, params); buffer, params);
break; break;
} }
@ -518,20 +519,20 @@ gst_egl_image_buffer_pool_alloc_buffer (GstBufferPool * bpool,
} }
static GstFlowReturn static GstFlowReturn
gst_egl_image_buffer_pool_acquire_buffer (GstBufferPool * bpool, gst_custom_egl_image_buffer_pool_acquire_buffer (GstBufferPool * bpool,
GstBuffer ** buffer, GstBufferPoolAcquireParams * params) GstBuffer ** buffer, GstBufferPoolAcquireParams * params)
{ {
GstFlowReturn ret; GstFlowReturn ret;
GstEGLImageBufferPool *pool; GstCustomEGLImageBufferPool *pool;
ret = ret =
GST_BUFFER_POOL_CLASS GST_BUFFER_POOL_CLASS
(gst_egl_image_buffer_pool_parent_class)->acquire_buffer (bpool, (gst_custom_egl_image_buffer_pool_parent_class)->acquire_buffer (bpool,
buffer, params); buffer, params);
if (ret != GST_FLOW_OK || !*buffer) if (ret != GST_FLOW_OK || !*buffer)
return ret; return ret;
pool = GST_EGL_IMAGE_BUFFER_POOL (bpool); pool = GST_CUSTOM_EGL_IMAGE_BUFFER_POOL (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
@ -542,7 +543,7 @@ gst_egl_image_buffer_pool_acquire_buffer (GstBufferPool * bpool,
ret = ret =
GST_BUFFER_POOL_CLASS GST_BUFFER_POOL_CLASS
(gst_egl_image_buffer_pool_parent_class)->acquire_buffer (bpool, (gst_custom_egl_image_buffer_pool_parent_class)->acquire_buffer (bpool,
buffer, params); buffer, params);
gst_object_replace ((GstObject **) & oldbuf->pool, (GstObject *) pool); gst_object_replace ((GstObject **) & oldbuf->pool, (GstObject *) pool);
gst_buffer_unref (oldbuf); gst_buffer_unref (oldbuf);
@ -552,9 +553,9 @@ gst_egl_image_buffer_pool_acquire_buffer (GstBufferPool * bpool,
} }
static void static void
gst_egl_image_buffer_pool_finalize (GObject * object) gst_custom_egl_image_buffer_pool_finalize (GObject * object)
{ {
GstEGLImageBufferPool *pool = GST_EGL_IMAGE_BUFFER_POOL (object); GstCustomEGLImageBufferPool *pool = GST_CUSTOM_EGL_IMAGE_BUFFER_POOL (object);
if (pool->allocator) if (pool->allocator)
gst_object_unref (pool->allocator); gst_object_unref (pool->allocator);
@ -564,34 +565,39 @@ gst_egl_image_buffer_pool_finalize (GObject * object)
gst_egl_display_unref (pool->display); gst_egl_display_unref (pool->display);
pool->display = NULL; pool->display = NULL;
G_OBJECT_CLASS (gst_egl_image_buffer_pool_parent_class)->finalize (object); G_OBJECT_CLASS (gst_custom_egl_image_buffer_pool_parent_class)->finalize
(object);
} }
static void static void
gst_egl_image_buffer_pool_class_init (GstEGLImageBufferPoolClass * klass) gst_custom_egl_image_buffer_pool_class_init (GstCustomEGLImageBufferPoolClass *
klass)
{ {
GObjectClass *gobject_class = (GObjectClass *) klass; GObjectClass *gobject_class = (GObjectClass *) klass;
GstBufferPoolClass *gstbufferpool_class = (GstBufferPoolClass *) klass; GstBufferPoolClass *gstbufferpool_class = (GstBufferPoolClass *) klass;
gobject_class->finalize = gst_egl_image_buffer_pool_finalize; gobject_class->finalize = gst_custom_egl_image_buffer_pool_finalize;
gstbufferpool_class->get_options = gst_egl_image_buffer_pool_get_options; gstbufferpool_class->get_options =
gstbufferpool_class->set_config = gst_egl_image_buffer_pool_set_config; gst_custom_egl_image_buffer_pool_get_options;
gstbufferpool_class->alloc_buffer = gst_egl_image_buffer_pool_alloc_buffer; gstbufferpool_class->set_config = gst_custom_egl_image_buffer_pool_set_config;
gstbufferpool_class->alloc_buffer =
gst_custom_egl_image_buffer_pool_alloc_buffer;
gstbufferpool_class->acquire_buffer = gstbufferpool_class->acquire_buffer =
gst_egl_image_buffer_pool_acquire_buffer; gst_custom_egl_image_buffer_pool_acquire_buffer;
} }
static void static void
gst_egl_image_buffer_pool_init (GstEGLImageBufferPool * pool) gst_custom_egl_image_buffer_pool_init (GstCustomEGLImageBufferPool * pool)
{ {
} }
static GstBufferPool * static GstBufferPool *
gst_egl_image_buffer_pool_new (APP_STATE_T * state, GstEGLDisplay * display) gst_custom_egl_image_buffer_pool_new (APP_STATE_T * state,
GstEGLDisplay * display)
{ {
GstEGLImageBufferPool *pool; GstCustomEGLImageBufferPool *pool;
pool = g_object_new (gst_egl_image_buffer_pool_get_type (), NULL); pool = g_object_new (gst_custom_egl_image_buffer_pool_get_type (), NULL);
pool->display = gst_egl_display_ref (state->gst_display); pool->display = gst_egl_display_ref (state->gst_display);
pool->state = state; pool->state = state;
@ -1131,7 +1137,7 @@ handle_queued_objects (APP_STATE_T * state)
buffer = buffer =
gst_egl_allocate_eglimage (state, gst_egl_allocate_eglimage (state,
GST_EGL_IMAGE_BUFFER_POOL (state->pool)->allocator, format, GST_CUSTOM_EGL_IMAGE_BUFFER_POOL (state->pool)->allocator, format,
width, height); width, height);
g_value_init (&v, G_TYPE_POINTER); g_value_init (&v, G_TYPE_POINTER);
g_value_set_pointer (&v, buffer); g_value_set_pointer (&v, buffer);
@ -1301,7 +1307,7 @@ query_cb (GstPad * pad, GstPadProbeInfo * info, gpointer user_data)
GST_DEBUG ("create new pool"); GST_DEBUG ("create new pool");
state->pool = pool = state->pool = pool =
gst_egl_image_buffer_pool_new (state, state->display); gst_custom_egl_image_buffer_pool_new (state, state->display);
GST_DEBUG ("done create new pool %p", pool); GST_DEBUG ("done create new pool %p", pool);
/* the normal size of a frame */ /* the normal size of a frame */
size = info.size; size = info.size;