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

glupload: allow NULL buffer for accept vfunc

Browse source
This commit is contained in:
Matthew Waters 2015-02-03 00:15:30 +11:00 committed by Tim-Philipp Müller
parent 45e6e77ff0
commit 29ca0e8a44
1 changed files with 41 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gst-libs/gst/gl/gstglupload.c
View file

@ -160,16 +160,19 @@ _gl_memory_upload_accept (gpointer impl, GstBuffer * buffer, GstCaps * in_caps,
if (!ret) if (!ret)
return FALSE; return FALSE;
if (buffer) {
if (gst_buffer_n_memory (buffer) != if (gst_buffer_n_memory (buffer) !=
GST_VIDEO_INFO_N_PLANES (&upload->upload->priv->in_info)) GST_VIDEO_INFO_N_PLANES (&upload->upload->priv->in_info))
return FALSE; return FALSE;
for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&upload->upload->priv->in_info); i++) { for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&upload->upload->priv->in_info);
i++) {
GstMemory *mem = gst_buffer_peek_memory (buffer, i); GstMemory *mem = gst_buffer_peek_memory (buffer, i);
if (!gst_is_gl_memory (mem)) if (!gst_is_gl_memory (mem))
return FALSE; return FALSE;
} }
}
return TRUE; return TRUE;
} }
@ -291,16 +294,19 @@ _egl_image_upload_accept (gpointer impl, GstBuffer * buffer, GstCaps * in_caps,
if (!ret) if (!ret)
return FALSE; return FALSE;
if (buffer) {
if (gst_buffer_n_memory (buffer) != if (gst_buffer_n_memory (buffer) !=
GST_VIDEO_INFO_N_PLANES (&image->upload->priv->in_info)) GST_VIDEO_INFO_N_PLANES (&image->upload->priv->in_info))
return FALSE; return FALSE;
for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&image->upload->priv->in_info); i++) { for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&image->upload->priv->in_info);
i++) {
GstMemory *mem = gst_buffer_peek_memory (buffer, i); GstMemory *mem = gst_buffer_peek_memory (buffer, i);
if (!gst_is_egl_image_memory (mem)) if (!gst_is_egl_image_memory (mem))
return FALSE; return FALSE;
} }
}
return TRUE; return TRUE;
} }
@ -435,9 +441,6 @@ _upload_meta_upload_accept (gpointer impl, GstBuffer * buffer,
gst_caps_features_free (gl_features); gst_caps_features_free (gl_features);
if ((meta = gst_buffer_get_video_gl_texture_upload_meta (buffer)) == NULL)
return FALSE;
gl_features = gl_features =
gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_GL_MEMORY); gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_GL_MEMORY);
features = gst_caps_get_features (out_caps, 0); features = gst_caps_get_features (out_caps, 0);
@ -449,6 +452,10 @@ _upload_meta_upload_accept (gpointer impl, GstBuffer * buffer,
if (!ret) if (!ret)
return ret; return ret;
if (buffer) {
if ((meta = gst_buffer_get_video_gl_texture_upload_meta (buffer)) == NULL)
return FALSE;
if (meta->texture_type[0] != GST_VIDEO_GL_TEXTURE_TYPE_RGBA) { if (meta->texture_type[0] != GST_VIDEO_GL_TEXTURE_TYPE_RGBA) {
GST_FIXME_OBJECT (upload, "only single rgba texture supported"); GST_FIXME_OBJECT (upload, "only single rgba texture supported");
return FALSE; return FALSE;
@ -459,6 +466,7 @@ _upload_meta_upload_accept (gpointer impl, GstBuffer * buffer,
GST_FIXME_OBJECT (upload, "only x-normal, y-normal textures supported"); GST_FIXME_OBJECT (upload, "only x-normal, y-normal textures supported");
return FALSE; return FALSE;
} }
}
return TRUE; return TRUE;
} }
@ -631,11 +639,13 @@ _raw_data_upload_accept (gpointer impl, GstBuffer * buffer, GstCaps * in_caps,
if (!ret) if (!ret)
return ret; return ret;
if (!gst_video_frame_map (&raw->in_frame, &raw->upload->priv->in_info, buffer, if (buffer) {
GST_MAP_READ)) if (!gst_video_frame_map (&raw->in_frame, &raw->upload->priv->in_info,
buffer, GST_MAP_READ))
return FALSE; return FALSE;
raw->upload->priv->in_info = raw->in_frame.info; raw->upload->priv->in_info = raw->in_frame.info;
}
return TRUE; return TRUE;
} }