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

gluploadmeta: reenable GLMemory upload path

Browse source
This commit is contained in:
Matthew Waters 2014-06-23 21:43:10 +10:00 committed by Tim-Philipp Müller
parent c88abf6ac2
commit 5fd0dc505e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst-libs/gst/gl/gstgluploadmeta.c
View file

@ -269,9 +269,9 @@ _perform_for_gl_texture_upload_meta (GstVideoGLTextureUploadMeta *
{ {
GstGLUploadMeta *upload; GstGLUploadMeta *upload;
GstVideoFrame frame; GstVideoFrame frame;
// GstMemory *mem; GstMemory *mem;
gboolean ret; gboolean ret;
// guint i, n; guint i, n;
g_return_val_if_fail (meta != NULL, FALSE); g_return_val_if_fail (meta != NULL, FALSE);
g_return_val_if_fail (texture_id != NULL, FALSE); g_return_val_if_fail (texture_id != NULL, FALSE);
@ -304,7 +304,7 @@ _perform_for_gl_texture_upload_meta (GstVideoGLTextureUploadMeta *
GST_LOG ("Uploading for meta with textures %i,%i,%i,%i", texture_id[0], GST_LOG ("Uploading for meta with textures %i,%i,%i,%i", texture_id[0],
texture_id[1], texture_id[2], texture_id[3]); texture_id[1], texture_id[2], texture_id[3]);
#if 0
/* GstGLMemory */ /* GstGLMemory */
n = gst_buffer_n_memory (upload->priv->buffer); n = gst_buffer_n_memory (upload->priv->buffer);
mem = gst_buffer_peek_memory (upload->priv->buffer, 0); mem = gst_buffer_peek_memory (upload->priv->buffer, 0);
@ -321,7 +321,7 @@ _perform_for_gl_texture_upload_meta (GstVideoGLTextureUploadMeta *
if (ret) if (ret)
goto out; goto out;
} }
#endif
if (!(ret = gst_video_frame_map (&frame, &upload->info, upload->priv->buffer, if (!(ret = gst_video_frame_map (&frame, &upload->info, upload->priv->buffer,
GST_MAP_READ))) { GST_MAP_READ))) {
GST_ERROR ("failed to map video frame"); GST_ERROR ("failed to map video frame");