mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-12 09:15:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

eglglessink: Update for new GstContext API

Browse source
This commit is contained in:
Sebastian Dröge 2013-09-18 22:36:51 +02:00
parent 14f2c30686
commit ad0252fc04
3 changed files with 21 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ext/eglgles/gstegladaptation.c
View file

@ -202,7 +202,8 @@ static const char *frag_NV12_NV21_prog = {
void void
gst_egl_adaption_init (void) gst_egl_adaption_init (void)
{ {
GST_DEBUG_CATEGORY_INIT (egladaption_debug, "egladaption", 0, "EGL adaption layer"); GST_DEBUG_CATEGORY_INIT (egladaption_debug, "egladaption", 0,
"EGL adaption layer");
} }
static GstCaps * static GstCaps *

32
ext/eglgles/gstegladaptation_egl.c
View file

@ -133,24 +133,13 @@ gst_egl_adaptation_init_egl_display (GstEglAdaptationContext * ctx)
goto HANDLE_ERROR; goto HANDLE_ERROR;
} }
msg = gst_message_new_need_context (GST_OBJECT_CAST (ctx->element)); msg =
gst_message_add_context_type (msg, GST_EGL_DISPLAY_CONTEXT_TYPE); gst_message_new_need_context (GST_OBJECT_CAST (ctx->element),
GST_EGL_DISPLAY_CONTEXT_TYPE);
gst_element_post_message (GST_ELEMENT_CAST (ctx->element), msg); gst_element_post_message (GST_ELEMENT_CAST (ctx->element), msg);
GST_OBJECT_LOCK (ctx->element); GST_OBJECT_LOCK (ctx->element);
if (ctx->set_display) { if (!ctx->set_display) {
GstContext *context;
ctx->display = gst_egl_display_ref (ctx->set_display);
GST_OBJECT_UNLOCK (ctx->element);
context = gst_element_get_context (GST_ELEMENT_CAST (ctx->element));
if (!context)
context = gst_context_new ();
context = gst_context_make_writable (context);
gst_context_set_egl_display (context, ctx->display);
gst_element_set_context (GST_ELEMENT_CAST (ctx->element), context);
gst_context_unref (context);
} else {
GstContext *context; GstContext *context;
GST_OBJECT_UNLOCK (ctx->element); GST_OBJECT_UNLOCK (ctx->element);
@ -162,20 +151,9 @@ gst_egl_adaptation_init_egl_display (GstEglAdaptationContext * ctx)
} }
ctx->display = gst_egl_display_new (display, (GDestroyNotify) eglTerminate); ctx->display = gst_egl_display_new (display, (GDestroyNotify) eglTerminate);
context = gst_context_new (); context = gst_context_new_egl_display (ctx->display, FALSE);
gst_context_set_egl_display (context, ctx->display);
msg = gst_message_new_have_context (GST_OBJECT (ctx->element), context); msg = gst_message_new_have_context (GST_OBJECT (ctx->element), context);
gst_element_post_message (GST_ELEMENT_CAST (ctx->element), msg); gst_element_post_message (GST_ELEMENT_CAST (ctx->element), msg);
context = NULL;
context = gst_element_get_context (GST_ELEMENT_CAST (ctx->element));
if (!context)
context = gst_context_new ();
context = gst_context_make_writable (context);
gst_context_set_egl_display (context, ctx->display);
gst_element_set_context (GST_ELEMENT_CAST (ctx->element), context);
gst_context_unref (context);
} }
if (!eglInitialize (gst_egl_display_get (ctx->display), if (!eglInitialize (gst_egl_display_get (ctx->display),

78
ext/eglgles/gsteglglessink.c
View file

@ -188,7 +188,6 @@ static GstCaps *gst_eglglessink_getcaps (GstBaseSink * bsink, GstCaps * filter);
static gboolean gst_eglglessink_propose_allocation (GstBaseSink * bsink, static gboolean gst_eglglessink_propose_allocation (GstBaseSink * bsink,
GstQuery * query); GstQuery * query);
static gboolean gst_eglglessink_query (GstBaseSink * bsink, GstQuery * query); static gboolean gst_eglglessink_query (GstBaseSink * bsink, GstQuery * query);
static gboolean gst_eglglessink_event (GstBaseSink * bsink, GstEvent * event);
/* VideoOverlay interface cruft */ /* VideoOverlay interface cruft */
static void gst_eglglessink_videooverlay_init (GstVideoOverlayInterface * static void gst_eglglessink_videooverlay_init (GstVideoOverlayInterface *
@ -1886,41 +1885,6 @@ gst_eglglessink_getcaps (GstBaseSink * bsink, GstCaps * filter)
return ret; return ret;
} }
static gboolean
gst_eglglessink_event (GstBaseSink * bsink, GstEvent * event)
{
GstEglGlesSink *eglglessink;
eglglessink = GST_EGLGLESSINK (bsink);
switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_CONTEXT:{
GstContext *context;
GstEGLDisplay *display;
gst_event_parse_context (event, &context);
if (gst_context_get_egl_display (context, &display)) {
GST_OBJECT_LOCK (eglglessink);
if (eglglessink->egl_context->set_display)
gst_egl_display_unref (eglglessink->egl_context->set_display);
eglglessink->egl_context->set_display = display;
GST_OBJECT_UNLOCK (eglglessink);
}
gst_context_unref (context);
return GST_BASE_SINK_CLASS (gst_eglglessink_parent_class)->event (bsink,
event);
break;
}
default:
return GST_BASE_SINK_CLASS (gst_eglglessink_parent_class)->event (bsink,
event);
break;
}
}
static gboolean static gboolean
gst_eglglessink_query (GstBaseSink * bsink, GstQuery * query) gst_eglglessink_query (GstBaseSink * bsink, GstQuery * query)
{ {
@ -1930,33 +1894,24 @@ gst_eglglessink_query (GstBaseSink * bsink, GstQuery * query)
switch (GST_QUERY_TYPE (query)) { switch (GST_QUERY_TYPE (query)) {
case GST_QUERY_CONTEXT:{ case GST_QUERY_CONTEXT:{
guint i, n; const gchar *context_type;
GST_BASE_SINK_CLASS (gst_eglglessink_parent_class)->query (bsink, query); if (gst_query_parse_context_type (query, &context_type) &&
strcmp (context_type, GST_EGL_DISPLAY_CONTEXT_TYPE) &&
eglglessink->egl_context->display) {
GstContext *context;
n = gst_query_get_n_context_types (query); context =
for (i = 0; i < n; i++) { gst_context_new_egl_display (eglglessink->egl_context->display,
const gchar *context_type = NULL; FALSE);
gst_query_parse_nth_context_type (query, i, &context_type);
if (g_strcmp0 (context_type, GST_EGL_DISPLAY_CONTEXT_TYPE) == 0) {
GstContext *context, *old_context;
gst_query_parse_context (query, &old_context);
if (old_context)
context = gst_context_copy (old_context);
else
context = gst_context_new ();
gst_context_set_egl_display (context,
eglglessink->egl_context->display);
gst_query_set_context (query, context); gst_query_set_context (query, context);
gst_context_unref (context); gst_context_unref (context);
break;
}
}
return TRUE; return TRUE;
} else {
return GST_BASE_SINK_CLASS (gst_eglglessink_parent_class)->query (bsink,
query);
}
break; break;
} }
default: default:
@ -1981,14 +1936,6 @@ gst_eglglessink_set_context (GstElement * element, GstContext * context)
eglglessink->egl_context->set_display = display; eglglessink->egl_context->set_display = display;
GST_OBJECT_UNLOCK (eglglessink); GST_OBJECT_UNLOCK (eglglessink);
} }
GST_OBJECT_LOCK (eglglessink);
context = gst_context_copy (context);
gst_context_set_egl_display (context, eglglessink->egl_context->display);
GST_OBJECT_UNLOCK (eglglessink);
GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
gst_context_unref (context);
} }
static gboolean static gboolean
@ -2407,7 +2354,6 @@ gst_eglglessink_class_init (GstEglGlesSinkClass * klass)
GST_DEBUG_FUNCPTR (gst_eglglessink_propose_allocation); GST_DEBUG_FUNCPTR (gst_eglglessink_propose_allocation);
gstbasesink_class->prepare = GST_DEBUG_FUNCPTR (gst_eglglessink_prepare); gstbasesink_class->prepare = GST_DEBUG_FUNCPTR (gst_eglglessink_prepare);
gstbasesink_class->query = GST_DEBUG_FUNCPTR (gst_eglglessink_query); gstbasesink_class->query = GST_DEBUG_FUNCPTR (gst_eglglessink_query);
gstbasesink_class->event = GST_DEBUG_FUNCPTR (gst_eglglessink_event);
gstvideosink_class->show_frame = gstvideosink_class->show_frame =
GST_DEBUG_FUNCPTR (gst_eglglessink_show_frame); GST_DEBUG_FUNCPTR (gst_eglglessink_show_frame);