change testsuit path and remove dead code

Change-Id: I315906cbfb2f77b2a4c7506b95a81455332630d6

diff --git a/doc/capi_media_tool_doc.h b/doc/capi_media_tool_doc.h
deleted file mode 100644 (file)
index e58ec44..0000000
--- a/doc/capi_media_tool_doc.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#ifndef __TIZEN_MEDIA_TOOL_DOC_H__
-#define __TIZEN_MEDIA_TOOL_DOC_H__
-
-
-/**
- * @file capi_media_tool_doc.h
- * @brief This file contains high level documentation of the CAPI MEDIA TOOL API.
- */
-
-/**
- * @defgroup CAPI_MEDIA_TOOL_MODULE Media Tool
- * @brief  The @ref CAPI_MEDIA_TOOL_MODULE  APIs provides functions for AV packet buffer for interworking between mutimedia framework module .
- * @ingroup CAPI_MEDIA_FRAMEWORK
- *
- * @section CAPI_MEDIA_TOOL_MODULE_HEADER Required Header
- *   \#include <media_packet.h>
- *
- * @section CAPI_MEDIA_TOOL_MODULE_OVERVIEW Overview
- *
- * MEDIA TOOL API allows :
- *- Create media_packet handle and Allocate buffer to heap or tbm_surface
- *- Set and Get metadata of media packet
- *
- * The media packet handle is created by caller.
- * After creating media_packet_h handle, the caller can set & get other meta datas.
- *
- */
-
-/**
- * @defgroup CAPI_MEDIA_TOOL_MEDIA_FORMAT_MODULE Media Format
- * @brief The @ref CAPI_MEDIA_TOOL_MEDIA_FORMAT_MODULE APIs provides functions for specify video or audio information.
- * @ingroup CAPI_MEDIA_TOOL_MODULE
- *
- * @section CAPI_MEDIA_TOOL_MEDIA_FORMAT_MODULE_HEADER Required Header
- *   \#include <media_format.h>
- */
-
-#endif // __TIZEN_MEDIA_TOOL_DOC_H__

diff --git a/doc/media_tool_doc.h b/doc/media_tool_doc.h
new file mode 100755 (executable)
index 0000000..993869e
--- /dev/null
+++ b/doc/media_tool_doc.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#ifndef __TIZEN_MEDIA_TOOL_DOC_H__
+#define __TIZEN_MEDIA_TOOL_DOC_H__
+
+
+/**
+ * @file media_tool_doc.h
+ * @brief This file contains high level documentation of the CAPI MEDIA TOOL API.
+ */
+
+/**
+ * @defgroup CAPI_MEDIA_TOOL_MODULE Media Tool
+ * @brief  The @ref CAPI_MEDIA_TOOL_MODULE  APIs provides functions for AV packet buffer for interworking between mutimedia framework module .
+ * @ingroup CAPI_MEDIA_FRAMEWORK
+ *
+ * @section CAPI_MEDIA_TOOL_MODULE_HEADER Required Header
+ *   \#include <media_packet.h>
+ *
+ * @section CAPI_MEDIA_TOOL_MODULE_OVERVIEW Overview
+ *
+ * MEDIA TOOL API allows :
+ *- Create media_packet handle and Allocate buffer to heap or tbm_surface
+ *- Set and Get metadata of media packet
+ *
+ * The media packet handle is created by caller.
+ * After creating media_packet_h handle, the caller can set & get other meta datas.
+ *
+ */
+
+/**
+ * @defgroup CAPI_MEDIA_TOOL_MEDIA_FORMAT_MODULE Media Format
+ * @brief The @ref CAPI_MEDIA_TOOL_MEDIA_FORMAT_MODULE APIs provides functions for specify video or audio information.
+ * @ingroup CAPI_MEDIA_TOOL_MODULE
+ *
+ * @section CAPI_MEDIA_TOOL_MEDIA_FORMAT_MODULE_HEADER Required Header
+ *   \#include <media_format.h>
+ */
+
+#endif // __TIZEN_MEDIA_TOOL_DOC_H__

diff --git a/packaging/capi-media-tool.spec b/packaging/capi-media-tool.spec
index dd3df5ba5755da90688068a2c0180d828c988c2b..e4ba801d5449ba123ae19e9cb94561821df17495 100755 (executable)
--- a/packaging/capi-media-tool.spec
+++ b/packaging/capi-media-tool.spec
@@ -49,8 +49,8 @@ make %{?jobs:-j%jobs}
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_datadir}/license
-mkdir -p %{buildroot}/opt/usr/devel
-cp test/media_packet_test %{buildroot}/opt/usr/devel
+mkdir -p %{buildroot}/usr/bin
+cp test/media_packet_test %{buildroot}/usr/bin
 cp LICENSE.APLv2 %{buildroot}%{_datadir}/license/%{name}
 %make_install
 
@@ -66,8 +66,7 @@ cp LICENSE.APLv2 %{buildroot}%{_datadir}/license/%{name}
 %manifest capi-media-tool.manifest
 %{_libdir}/libcapi-media-tool.so.*
 %{_datadir}/license/%{name}
-/opt/usr/devel/*
-#%{_bindir}/*
+%{_bindir}/*
 
 
 %files devel

diff --git a/src/media_packet.c b/src/media_packet.c
index 29bcf50d0d893dae783a44166e9ec74002150e08..a95adea59e8bd7ff04d9ed921dc0c86b80bd3580 100755 (executable)
--- a/src/media_packet.c
+++ b/src/media_packet.c
@@ -666,17 +666,7 @@ int media_packet_create_from_external_memory(media_format_h fmt, void *mem_ptr,
     /* take handle */
     *packet = (media_packet_h)handle;
     LOGI("[%s] new handle : %p", __FUNCTION__, *packet);
-    return ret;
-
-fail:
 
-    if (handle)
-    {
-        free(handle);
-        handle = NULL;
-    }
-
-    *packet = NULL;
     return ret;
 }
 
@@ -693,7 +683,6 @@ int media_packet_get_buffer_data_ptr(media_packet_h packet, void **data)
     *data = handle->data;
 
     return ret;
-
 }
 
 int media_packet_get_tbm_surface(media_packet_h packet, tbm_surface_h *surface)