[tizencamerasrc] h264 stream memory copy code revert

Change-Id: Ie5bda14a37319106b5b06f5da140d4a3ce59531d

diff --git a/packaging/gst-plugins-tizen.spec b/packaging/gst-plugins-tizen.spec
index dd2914b..1b1233c 100644 (file)
--- a/packaging/gst-plugins-tizen.spec
+++ b/packaging/gst-plugins-tizen.spec
@@ -5,7 +5,7 @@
 Name:       gst-plugins-tizen
 Version:    1.0.0
 Summary:    GStreamer tizen plugins (common)
-Release:    85
+Release:    86
 Group:      Multimedia/Framework
 Url:        http://gstreamer.freedesktop.org/
 License:    LGPL-2.1+

diff --git a/tizencamerasrc/src/gsttizencamerasrc.c b/tizencamerasrc/src/gsttizencamerasrc.c
index 10c1de7..96b71db 100644 (file)
--- a/tizencamerasrc/src/gsttizencamerasrc.c
+++ b/tizencamerasrc/src/gsttizencamerasrc.c
@@ -277,31 +277,9 @@ static GstBuffer *gst_tizencamerasrc_buffer_new(GstTizenCameraSrc *camerasrc, ca
       (gpointer)new_buffer,
       (GDestroyNotify)gst_tizencamerasrc_buffer_finalize);
   } else {
-    gpointer pdata = NULL;
     GST_DEBUG_OBJECT(camerasrc, "TBM is NOT used - size %u", buffer->total_size);
-
-    if (camerasrc->pix_format == CAMERA_PIXEL_FORMAT_H264) {
-    /* memory copy for h264 stream */
-      int i = 0;
-      uint32_t total_size = 0;
-      new_buffer->copied_data = g_malloc(buffer->total_size);
-      for (i = 0 ; i < buffer->num_planes ; i++) {
-        memcpy(new_buffer->copied_data + total_size, buffer->planes[i].data, buffer->planes[i].size);
-        total_size += buffer->planes[i].size;
-      }
-      pdata = (gpointer)new_buffer->copied_data;
-
-      if (type == BUFFER_TYPE_PREVIEW) {
-        camera_hal_interface_release_preview_buffer(camerasrc->hal_intf_handle, buffer->index);
-      } else if (type == BUFFER_TYPE_VIDEO) {
-        camera_hal_interface_release_video_buffer(camerasrc->hal_intf_handle, buffer->index);
-      }
-    } else {
-      pdata = (gpointer)buffer->planes[0].data;
-    }
-
     memory = gst_memory_new_wrapped(0,
-      pdata,
+      (gpointer)buffer->planes[0].data,
       buffer->total_size,
       0,
       buffer->total_size,
@@ -350,8 +328,7 @@ static void gst_tizencamerasrc_buffer_finalize(GstTizenCameraBuffer *buffer)
   camerasrc = buffer->camerasrc;
 
   if (buffer->type == BUFFER_TYPE_PREVIEW) {
-    if (!buffer->copied_data)
-      camera_hal_interface_release_preview_buffer(camerasrc->hal_intf_handle, buffer->index);
+    camera_hal_interface_release_preview_buffer(camerasrc->hal_intf_handle, buffer->index);
 
     g_mutex_lock(&camerasrc->preview_buffer_lock);
     camerasrc->preview_live_buffers--;
@@ -359,8 +336,7 @@ static void gst_tizencamerasrc_buffer_finalize(GstTizenCameraBuffer *buffer)
     g_cond_broadcast(&camerasrc->preview_buffer_cond);
     g_mutex_unlock(&camerasrc->preview_buffer_lock);
   } else if (buffer->type == BUFFER_TYPE_VIDEO) {
-    if (!buffer->copied_data)
-      camera_hal_interface_release_video_buffer(camerasrc->hal_intf_handle, buffer->index);
+    camera_hal_interface_release_video_buffer(camerasrc->hal_intf_handle, buffer->index);
 
     g_mutex_lock(&camerasrc->video_buffer_lock);
     camerasrc->video_live_buffers--;
@@ -375,7 +351,6 @@ static void gst_tizencamerasrc_buffer_finalize(GstTizenCameraBuffer *buffer)
     tbm_surface_destroy(buffer->t_surface);
     buffer->t_surface = NULL;
   }
-  g_free(buffer->copied_data);
   gst_object_unref(camerasrc);
   g_free(buffer);
 

diff --git a/tizencamerasrc/src/include/gsttizencamerasrc.h b/tizencamerasrc/src/include/gsttizencamerasrc.h
index 7855467..62ec171 100644 (file)
--- a/tizencamerasrc/src/include/gsttizencamerasrc.h
+++ b/tizencamerasrc/src/include/gsttizencamerasrc.h
@@ -70,7 +70,6 @@ struct _GstTizenCameraBuffer {
   GstTizenCameraBufferType type;
   int index;
   tbm_surface_h t_surface;
-  gchar *copied_data;
 };
 
 struct _GstTizenCameraSrc