From: Matthew Waters <ystreet00@gmail.com>
Date: Mon, 23 Jun 2014 11:43:10 +0000 (+1000)
Subject: gluploadmeta: reenable GLMemory upload path
X-Git-Tag: 1.19.3~511^2~1989^2~1389
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5fd0dc505e1fd6cc6d7327a3b2b11528a9fd414b;p=platform%2Fupstream%2Fgstreamer.git

gluploadmeta: reenable GLMemory upload path
---

diff --git a/gst-libs/gst/gl/gstgluploadmeta.c b/gst-libs/gst/gl/gstgluploadmeta.c
index fd71103..fe70d28 100644
--- a/gst-libs/gst/gl/gstgluploadmeta.c
+++ b/gst-libs/gst/gl/gstgluploadmeta.c
@@ -269,9 +269,9 @@ _perform_for_gl_texture_upload_meta (GstVideoGLTextureUploadMeta *
 {
   GstGLUploadMeta *upload;
   GstVideoFrame frame;
-//  GstMemory *mem;
+  GstMemory *mem;
   gboolean ret;
-//  guint i, n;
+  guint i, n;
 
   g_return_val_if_fail (meta != 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],
       texture_id[1], texture_id[2], texture_id[3]);
-#if 0
+
   /* GstGLMemory */
   n = gst_buffer_n_memory (upload->priv->buffer);
   mem = gst_buffer_peek_memory (upload->priv->buffer, 0);
@@ -321,7 +321,7 @@ _perform_for_gl_texture_upload_meta (GstVideoGLTextureUploadMeta *
     if (ret)
       goto out;
   }
-#endif
+
   if (!(ret = gst_video_frame_map (&frame, &upload->info, upload->priv->buffer,
           GST_MAP_READ))) {
     GST_ERROR ("failed to map video frame");