mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 17:50:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

eglglessink: Upload textures in GstBaseSink::prepare() already

Browse source 
This gives more time for the texture to be uploaded as it happens
before syncing to the running time. When the running time is reached
only eglSwapBuffers() is necessary.
This commit is contained in:
Sebastian Dröge 2013-01-01 10:44:45 +01:00
parent 37de5a081c
commit 1fbea3e39d
2 changed files with 75 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

115
ext/eglgles/gsteglglessink.c
View file

@ -381,6 +381,8 @@ static void gst_eglglessink_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec); const GValue * value, GParamSpec * pspec);
static GstStateChangeReturn gst_eglglessink_change_state (GstElement * element, static GstStateChangeReturn gst_eglglessink_change_state (GstElement * element,
GstStateChange transition); GstStateChange transition);
static GstFlowReturn gst_eglglessink_prepare (GstBaseSink * bsink,
GstBuffer * buf);
static GstFlowReturn gst_eglglessink_show_frame (GstVideoSink * vsink, static GstFlowReturn gst_eglglessink_show_frame (GstVideoSink * vsink,
GstBuffer * buf); GstBuffer * buf);
static gboolean gst_eglglessink_setcaps (GstBaseSink * bsink, GstCaps * caps); static gboolean gst_eglglessink_setcaps (GstBaseSink * bsink, GstCaps * caps);
@ -414,8 +416,9 @@ static gboolean gst_eglglessink_setup_vbo (GstEglGlesSink * eglglessink,
gboolean reset); gboolean reset);
static gboolean static gboolean
gst_eglglessink_configure_caps (GstEglGlesSink * eglglessink, GstCaps * caps); gst_eglglessink_configure_caps (GstEglGlesSink * eglglessink, GstCaps * caps);
static GstFlowReturn gst_eglglessink_render_and_display (GstEglGlesSink * sink, static GstFlowReturn gst_eglglessink_upload (GstEglGlesSink * sink,
GstBuffer * buf); GstBuffer * buf);
static GstFlowReturn gst_eglglessink_render (GstEglGlesSink * sink);
static GstFlowReturn gst_eglglessink_queue_object (GstEglGlesSink * sink, static GstFlowReturn gst_eglglessink_queue_object (GstEglGlesSink * sink,
GstMiniObject * obj); GstMiniObject * obj);
static inline gboolean got_gl_error (const char *wtf); static inline gboolean got_gl_error (const char *wtf);
@ -677,11 +680,19 @@ render_thread_func (GstEglGlesSink * eglglessink)
g_assert_not_reached (); g_assert_not_reached ();
} }
last_flow = GST_FLOW_OK; last_flow = GST_FLOW_OK;
} else if (GST_IS_BUFFER (item->object) || !item->object) { } else if (GST_IS_BUFFER (item->object)) {
GstBuffer *buf = GST_BUFFER_CAST (item->object); GstBuffer *buf = GST_BUFFER_CAST (item->object);
if (eglglessink->configured_caps) { if (eglglessink->configured_caps) {
last_flow = gst_eglglessink_render_and_display (eglglessink, buf); last_flow = gst_eglglessink_upload (eglglessink, buf);
} else {
last_flow = GST_FLOW_OK;
GST_DEBUG_OBJECT (eglglessink,
"No caps configured yet, not drawing anything");
}
} else if (!item->object) {
if (eglglessink->configured_caps) {
last_flow = gst_eglglessink_render (eglglessink);
} else { } else {
last_flow = GST_FLOW_OK; last_flow = GST_FLOW_OK;
GST_DEBUG_OBJECT (eglglessink, GST_DEBUG_OBJECT (eglglessink,
@ -691,16 +702,11 @@ render_thread_func (GstEglGlesSink * eglglessink)
g_assert_not_reached (); g_assert_not_reached ();
} }
item->destroy (item);
if (item->object) { g_mutex_lock (&eglglessink->render_lock);
item->destroy (item); eglglessink->last_flow = last_flow;
g_mutex_lock (&eglglessink->render_lock); g_cond_broadcast (&eglglessink->render_cond);
eglglessink->last_flow = last_flow; g_mutex_unlock (&eglglessink->render_lock);
g_cond_broadcast (&eglglessink->render_cond);
g_mutex_unlock (&eglglessink->render_lock);
} else {
item->destroy (item);
}
if (last_flow != GST_FLOW_OK) if (last_flow != GST_FLOW_OK)
break; break;
@ -1730,8 +1736,7 @@ gst_eglglessink_queue_object (GstEglGlesSink * eglglessink, GstMiniObject * obj)
GST_DEBUG_OBJECT (eglglessink, "Queueing object %" GST_PTR_FORMAT, obj); GST_DEBUG_OBJECT (eglglessink, "Queueing object %" GST_PTR_FORMAT, obj);
if (obj) g_mutex_lock (&eglglessink->render_lock);
g_mutex_lock (&eglglessink->render_lock);
if (!gst_data_queue_push (eglglessink->queue, item)) { if (!gst_data_queue_push (eglglessink->queue, item)) {
item->destroy (item); item->destroy (item);
g_mutex_unlock (&eglglessink->render_lock); g_mutex_unlock (&eglglessink->render_lock);
@ -1739,14 +1744,12 @@ gst_eglglessink_queue_object (GstEglGlesSink * eglglessink, GstMiniObject * obj)
return GST_FLOW_FLUSHING; return GST_FLOW_FLUSHING;
} }
if (obj) { GST_DEBUG_OBJECT (eglglessink, "Waiting for object to be handled");
GST_DEBUG_OBJECT (eglglessink, "Waiting for object to be handled"); g_cond_wait (&eglglessink->render_cond, &eglglessink->render_lock);
g_cond_wait (&eglglessink->render_cond, &eglglessink->render_lock); GST_DEBUG_OBJECT (eglglessink, "Object handled: %s",
GST_DEBUG_OBJECT (eglglessink, "Object handled: %s", gst_flow_get_name (eglglessink->last_flow));
gst_flow_get_name (eglglessink->last_flow)); last_flow = eglglessink->last_flow;
last_flow = eglglessink->last_flow; g_mutex_unlock (&eglglessink->render_lock);
g_mutex_unlock (&eglglessink->render_lock);
}
return (obj ? last_flow : GST_FLOW_OK); return (obj ? last_flow : GST_FLOW_OK);
} }
@ -2245,12 +2248,9 @@ HANDLE_ERROR:
/* Rendering and display */ /* Rendering and display */
static GstFlowReturn static GstFlowReturn
gst_eglglessink_render_and_display (GstEglGlesSink * eglglessink, gst_eglglessink_upload (GstEglGlesSink * eglglessink, GstBuffer * buf)
GstBuffer * buf)
{ {
guint dar_n, dar_d;
GstVideoCropMeta *crop = NULL; GstVideoCropMeta *crop = NULL;
gint i;
if (!buf) { if (!buf) {
GST_DEBUG_OBJECT (eglglessink, "Rendering previous buffer again"); GST_DEBUG_OBJECT (eglglessink, "Rendering previous buffer again");
@ -2259,6 +2259,21 @@ gst_eglglessink_render_and_display (GstEglGlesSink * eglglessink,
crop = gst_buffer_get_video_crop_meta (buf); crop = gst_buffer_get_video_crop_meta (buf);
if (gst_eglglessink_crop_changed (eglglessink, crop)) {
if (crop) {
eglglessink->crop.x = crop->x;
eglglessink->crop.y = crop->y;
eglglessink->crop.w = crop->width;
eglglessink->crop.h = crop->height;
} else {
eglglessink->crop.x = 0;
eglglessink->crop.y = 0;
eglglessink->crop.w = eglglessink->configured_info.width;
eglglessink->crop.h = eglglessink->configured_info.height;
}
eglglessink->crop_changed = TRUE;
}
if (gst_buffer_n_memory (buf) == 1 && if (gst_buffer_n_memory (buf) == 1 &&
(gmem = gst_buffer_peek_memory (buf, 0)) && (gmem = gst_buffer_peek_memory (buf, 0)) &&
strcmp (gmem->allocator->mem_type, GST_EGL_IMAGE_MEMORY_NAME) == 0) { strcmp (gmem->allocator->mem_type, GST_EGL_IMAGE_MEMORY_NAME) == 0) {
@ -2287,6 +2302,21 @@ gst_eglglessink_render_and_display (GstEglGlesSink * eglglessink,
} }
} }
return GST_FLOW_OK;
HANDLE_ERROR:
{
GST_ERROR_OBJECT (eglglessink, "Failed to upload texture");
return GST_FLOW_ERROR;
}
}
static GstFlowReturn
gst_eglglessink_render (GstEglGlesSink * eglglessink)
{
guint dar_n, dar_d;
gint i;
/* If no one has set a display rectangle on us initialize /* If no one has set a display rectangle on us initialize
* a sane default. According to the docs on the xOverlay * a sane default. According to the docs on the xOverlay
* interface we are supposed to fill the overlay 100%. We * interface we are supposed to fill the overlay 100%. We
@ -2297,7 +2327,7 @@ gst_eglglessink_render_and_display (GstEglGlesSink * eglglessink,
if (gst_eglglessink_update_surface_dimensions (eglglessink) || if (gst_eglglessink_update_surface_dimensions (eglglessink) ||
eglglessink->render_region_changed || eglglessink->render_region_changed ||
!eglglessink->display_region.w || !eglglessink->display_region.h || !eglglessink->display_region.w || !eglglessink->display_region.h ||
gst_eglglessink_crop_changed (eglglessink, crop)) { eglglessink->crop_changed) {
GST_OBJECT_LOCK (eglglessink); GST_OBJECT_LOCK (eglglessink);
if (!eglglessink->render_region_user) { if (!eglglessink->render_region_user) {
@ -2307,18 +2337,7 @@ gst_eglglessink_render_and_display (GstEglGlesSink * eglglessink,
eglglessink->render_region.h = eglglessink->eglglesctx.surface_height; eglglessink->render_region.h = eglglessink->eglglesctx.surface_height;
} }
eglglessink->render_region_changed = FALSE; eglglessink->render_region_changed = FALSE;
eglglessink->crop_changed = FALSE;
if (crop) {
eglglessink->crop.x = crop->x;
eglglessink->crop.y = crop->y;
eglglessink->crop.w = crop->width;
eglglessink->crop.h = crop->height;
} else if (buf) {
eglglessink->crop.x = 0;
eglglessink->crop.y = 0;
eglglessink->crop.w = eglglessink->configured_info.width;
eglglessink->crop.h = eglglessink->configured_info.height;
}
if (!eglglessink->force_aspect_ratio) { if (!eglglessink->force_aspect_ratio) {
eglglessink->display_region.x = 0; eglglessink->display_region.x = 0;
@ -2462,6 +2481,19 @@ HANDLE_ERROR:
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
static GstFlowReturn
gst_eglglessink_prepare (GstBaseSink * bsink, GstBuffer * buf)
{
GstEglGlesSink *eglglessink;
g_return_val_if_fail (buf != NULL, GST_FLOW_ERROR);
eglglessink = GST_EGLGLESSINK (bsink);
GST_DEBUG_OBJECT (eglglessink, "Got buffer: %p", buf);
return gst_eglglessink_queue_object (eglglessink, GST_MINI_OBJECT_CAST (buf));
}
static GstFlowReturn static GstFlowReturn
gst_eglglessink_show_frame (GstVideoSink * vsink, GstBuffer * buf) gst_eglglessink_show_frame (GstVideoSink * vsink, GstBuffer * buf)
{ {
@ -2472,7 +2504,7 @@ gst_eglglessink_show_frame (GstVideoSink * vsink, GstBuffer * buf)
eglglessink = GST_EGLGLESSINK (vsink); eglglessink = GST_EGLGLESSINK (vsink);
GST_DEBUG_OBJECT (eglglessink, "Got buffer: %p", buf); GST_DEBUG_OBJECT (eglglessink, "Got buffer: %p", buf);
return gst_eglglessink_queue_object (eglglessink, GST_MINI_OBJECT_CAST (buf)); return gst_eglglessink_queue_object (eglglessink, NULL);
} }
static GstCaps * static GstCaps *
@ -2910,6 +2942,7 @@ gst_eglglessink_class_init (GstEglGlesSinkClass * klass)
gstbasesink_class->get_caps = GST_DEBUG_FUNCPTR (gst_eglglessink_getcaps); gstbasesink_class->get_caps = GST_DEBUG_FUNCPTR (gst_eglglessink_getcaps);
gstbasesink_class->propose_allocation = gstbasesink_class->propose_allocation =
GST_DEBUG_FUNCPTR (gst_eglglessink_propose_allocation); GST_DEBUG_FUNCPTR (gst_eglglessink_propose_allocation);
gstbasesink_class->prepare = GST_DEBUG_FUNCPTR (gst_eglglessink_prepare);
gstvideosink_class->show_frame = gstvideosink_class->show_frame =
GST_DEBUG_FUNCPTR (gst_eglglessink_show_frame); GST_DEBUG_FUNCPTR (gst_eglglessink_show_frame);

1
ext/eglgles/gsteglglessink.h
View file

@ -205,6 +205,7 @@ struct _GstEglGlesSink
GstVideoRectangle display_region; GstVideoRectangle display_region;
GstVideoRectangle crop; GstVideoRectangle crop;
gboolean crop_changed;
GstCaps *sinkcaps; GstCaps *sinkcaps;
GstCaps *current_caps, *configured_caps; GstCaps *current_caps, *configured_caps;
GstVideoInfo configured_info; GstVideoInfo configured_info;