Added exception handling for null buffer

Change-Id: I019330e56e984179549fe8d5f843faf8970176e3

diff --git a/omx/gstomx.c b/omx/gstomx.c
old mode 100644 (file)
new mode 100755 (executable)
index 07822b3..8f1201d
--- a/omx/gstomx.c
+++ b/omx/gstomx.c
@@ -1442,6 +1442,13 @@ gst_omx_port_release_buffer (GstOMXPort * port, GstOMXBuffer * buf)
 
   g_mutex_lock (&comp->lock);
 
+#ifdef TIZEN_FEATURE_OMX
+  if (!buf->omx_buf) {
+    GST_ERROR_OBJECT (comp->parent, "Component %s has null buffer : %p "
+        , comp->name, buf);
+    goto done;
+  }
+#endif
   GST_DEBUG_OBJECT (comp->parent, "Releasing buffer %p (%p) to %s port %u",
       buf, buf->omx_buf->pBuffer, comp->name, port->index);
 
@@ -1467,7 +1474,11 @@ gst_omx_port_release_buffer (GstOMXPort * port, GstOMXBuffer * buf)
     goto done;
   }
 
+#ifdef TIZEN_FEATURE_OMX
+  if (port->flush_start || port->flushing || port->disabled_pending || !port->port_def.bEnabled) {
+#else
   if (port->flushing || port->disabled_pending || !port->port_def.bEnabled) {
+#endif
     GST_DEBUG_OBJECT (comp->parent,
         "%s port %u is flushing or disabled, not releasing " "buffer",
         comp->name, port->index);
@@ -1891,14 +1902,14 @@ gst_omx_port_tbm_allocate_dec_buffers (GstOMXPort * port, tbm_bufmgr bufmgr, gbo
       }
 
       for (j = 0; j < port->index + 1; j++) {
-        handle_bo = tbm_bo_get_handle(mm_vbuffer[i]->handle.bo[j], TBM_DEVICE_MM);
+        handle_bo = tbm_bo_get_handle (mm_vbuffer[i]->handle.bo[j], TBM_DEVICE_MM);
         if (handle_bo.ptr == NULL) {
           g_mutex_unlock (&port->comp->lock);
           goto error;
         }
         mm_vbuffer[i]->handle.dmabuf_fd[j] = handle_bo.u32;
 
-        handle_bo = tbm_bo_get_handle(mm_vbuffer[i]->handle.bo[j], TBM_DEVICE_CPU);
+        handle_bo = tbm_bo_get_handle (mm_vbuffer[i]->handle.bo[j], TBM_DEVICE_CPU);
         if (handle_bo.ptr == NULL) {
           g_mutex_unlock (&port->comp->lock);
           goto error;

diff --git a/omx/gstomxvideodec.c b/omx/gstomxvideodec.c
index ff435bd..0cbf372 100644 (file)
--- a/omx/gstomxvideodec.c
+++ b/omx/gstomxvideodec.c
@@ -634,8 +634,8 @@ gst_omx_video_dec_fill_buffer (GstOMXVideoDec * self,
 
       if (mm_vbuffer->type == MM_VIDEO_BUFFER_TYPE_TBM_BO) {
         GST_LOG_OBJECT (self, "dec output buf: bo[0] :%p, bo[1] : %p, fd[0]:%d  fd[1]:%d fd[2]:%d  w[0]:%d h[0]:%d  buf_share_method:%d",
-                mm_vbuffer->handle.bo[0], mm_vbuffer->handle.bo[1], mm_vbuffer->handle.dmabuf_fd[0], mm_vbuffer->handle.dmabuf_fd[1], mm_vbuffer->handle.dmabuf_fd[2],
-                mm_vbuffer->width[0], mm_vbuffer->height[0], mm_vbuffer->type);
+            mm_vbuffer->handle.bo[0], mm_vbuffer->handle.bo[1], mm_vbuffer->handle.dmabuf_fd[0], mm_vbuffer->handle.dmabuf_fd[1], mm_vbuffer->handle.dmabuf_fd[2],
+            mm_vbuffer->width[0], mm_vbuffer->height[0], mm_vbuffer->type);
       } else if (mm_vbuffer->type == MM_VIDEO_BUFFER_TYPE_PHYSICAL_ADDRESS) {
         GST_LOG_OBJECT (self, "dec output uses hw addr");
       } else {
@@ -645,16 +645,16 @@ gst_omx_video_dec_fill_buffer (GstOMXVideoDec * self,
      decoder_output_dump(self, mm_vbuffer);
 #endif
       if (gst_buffer_n_memory (outbuf) < 2) {
-          data = g_malloc0 (sizeof (MMVideoBuffer));
-          mem = gst_memory_new_wrapped(0, data, sizeof (MMVideoBuffer), 0, sizeof (MMVideoBuffer), data, g_free);
-          gst_buffer_append_memory (outbuf, mem);
+        data = g_malloc0 (sizeof (MMVideoBuffer));
+        mem = gst_memory_new_wrapped (0, data, sizeof (MMVideoBuffer), 0, sizeof (MMVideoBuffer), data, g_free);
+        gst_buffer_append_memory (outbuf, mem);
       } else {
-          GstMapInfo info = GST_MAP_INFO_INIT;
+        GstMapInfo info = GST_MAP_INFO_INIT;
 
-          mem = gst_buffer_peek_memory (outbuf, 1);
-          gst_memory_map (mem, &info, GST_MAP_WRITE);
-          data = info.data;
-          gst_memory_unmap (mem, &info);
+        mem = gst_buffer_peek_memory (outbuf, 1);
+        gst_memory_map (mem, &info, GST_MAP_WRITE);
+        data = info.data;
+        gst_memory_unmap (mem, &info);
       }
       memcpy (data, mm_vbuffer, sizeof (MMVideoBuffer));
 

diff --git a/packaging/gst-omx.spec b/packaging/gst-omx.spec
index ac70e5c..e62c5ae 100644 (file)
--- a/packaging/gst-omx.spec
+++ b/packaging/gst-omx.spec
@@ -1,7 +1,7 @@
 Name:           gst-omx
 Summary:        GStreamer plug-in that allows communication with OpenMAX IL components
 Version:        1.2.4
-Release:        8
+Release:        9
 License:        LGPL-2.1+
 Group:          Multimedia/Framework
 Source0:        %{name}-%{version}.tar.gz