mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-10 11:29:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

eglglessink: Only use the GstVideoFrame if we have a buffer

Browse source
This commit is contained in:
Sebastian Dröge 2012-12-28 12:40:14 +01:00
parent 31a3ef2f82
commit 6b8188f9f6
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ext/eglgles/gsteglglessink.c
View file

@ -1788,7 +1788,6 @@ gst_eglglessink_render_and_display (GstEglGlesSink * eglglessink,
GstBuffer * buf) GstBuffer * buf)
{ {
GstVideoFrame vframe; GstVideoFrame vframe;
gint w, h;
guint dar_n, dar_d; guint dar_n, dar_d;
GstVideoCropMeta *crop = NULL; GstVideoCropMeta *crop = NULL;
@ -1802,16 +1801,19 @@ gst_eglglessink_render_and_display (GstEglGlesSink * eglglessink,
GST_ERROR_OBJECT (eglglessink, "Couldn't map frame"); GST_ERROR_OBJECT (eglglessink, "Couldn't map frame");
goto HANDLE_ERROR; goto HANDLE_ERROR;
} }
} else {
GST_DEBUG_OBJECT (eglglessink, "Rendering previous buffer again");
} }
w = GST_VIDEO_FRAME_WIDTH (&vframe);
h = GST_VIDEO_FRAME_HEIGHT (&vframe);
GST_DEBUG_OBJECT (eglglessink,
"Got good buffer %p. Sink geometry is %dx%d size %d", buf, w, h,
buf ? gst_buffer_get_size (buf) : -1);
if (buf) { if (buf) {
gint w, h;
w = GST_VIDEO_FRAME_WIDTH (&vframe);
h = GST_VIDEO_FRAME_HEIGHT (&vframe);
GST_DEBUG_OBJECT (eglglessink,
"Got buffer %p: %dx%d size %d", buf, w, h, gst_buffer_get_size (buf));
switch (eglglessink->selected_fmt->fmt) { switch (eglglessink->selected_fmt->fmt) {
case GST_EGLGLESSINK_IMAGE_RGB888:{ case GST_EGLGLESSINK_IMAGE_RGB888:{
gint stride; gint stride;
@ -2283,11 +2285,11 @@ gst_eglglessink_render_and_display (GstEglGlesSink * eglglessink,
eglglessink->crop.y = crop->y; eglglessink->crop.y = crop->y;
eglglessink->crop.w = crop->width; eglglessink->crop.w = crop->width;
eglglessink->crop.h = crop->height; eglglessink->crop.h = crop->height;
} else { } else if (buf) {
eglglessink->crop.x = 0; eglglessink->crop.x = 0;
eglglessink->crop.y = 0; eglglessink->crop.y = 0;
eglglessink->crop.w = w; eglglessink->crop.w = GST_VIDEO_FRAME_WIDTH (&vframe);
eglglessink->crop.h = h; eglglessink->crop.h = GST_VIDEO_FRAME_HEIGHT (&vframe);
} }
if (!eglglessink->force_aspect_ratio) { if (!eglglessink->force_aspect_ratio) {