From e4aed3c63df7ff48fea61e6ffb18c16bb5be50fe Mon Sep 17 00:00:00 2001
From: Jihae Yi <jihae.yi@samsung.com>
Date: Tue, 15 Dec 2015 20:56:22 +0900
Subject: [PATCH] Rollback: remove media_packet_set_codec_data() on Public APIs

Change-Id: Ib7770846367ee2fffced2f9ba0a7de48e13c5da6
---
 include/media_packet.h          | 16 ----------------
 include/media_packet_internal.h | 17 +++++++++++++++++
 src/media_packet.c              | 25 -------------------------
 src/media_packet_internal.c     | 25 +++++++++++++++++++++++++
 4 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/include/media_packet.h b/include/media_packet.h
index 7788e63..399f427 100755
--- a/include/media_packet.h
+++ b/include/media_packet.h
@@ -931,22 +931,6 @@ int media_packet_get_video_plane_data_ptr(media_packet_h packet, int plane_idx,
  */
 int media_packet_get_codec_data(media_packet_h packet, void **codec_data, unsigned int *codec_data_size);
 
-/**
- * @brief Sets codec data and the codec data size of media packet.
- * @since_tizen 3.0
- *
- * @param[in] packet   The media packet handle
- * @param[in] codec_data    The codec data to set
- * @param[in] codec_data_size    The codec data size to set
- *
- * @return @c 0 on success,
- *         otherwise a negative error value
- * @retval #MEDIA_PACKET_ERROR_NONE              Successful
- * @retval #MEDIA_PACKET_ERROR_INVALID_PARAMETER Invalid parameter
- * @retval #MEDIA_PACKET_ERROR_INVALID_OPERATION Invalid operation
- */
-int media_packet_set_codec_data(media_packet_h packet, void *codec_data, unsigned int codec_data_size);
-
 /**
  * @brief Destroys the media packet handle.
  * @details  The registered finalize_callback() function will be invoked to destroy the media packet handle.
diff --git a/include/media_packet_internal.h b/include/media_packet_internal.h
index ab9a8b6..d0f7ad3 100755
--- a/include/media_packet_internal.h
+++ b/include/media_packet_internal.h
@@ -33,6 +33,23 @@ extern "C" {
  * @{
  */
 
+/**
+ * @internal
+ * @brief Sets codec data and the codec data size of media packet.
+ * @since_tizen 2.4
+ *
+ * @param[in] packet   The media packet handle
+ * @param[in] codec_data    The codec data to set
+ * @param[in] codec_data_size    The codec data size to set
+ *
+ * @return @c 0 on success,
+ *         otherwise a negative error value
+ * @retval #MEDIA_PACKET_ERROR_NONE              Successful
+ * @retval #MEDIA_PACKET_ERROR_INVALID_PARAMETER Invalid parameter
+ * @retval #MEDIA_PACKET_ERROR_INVALID_OPERATION Invalid operation
+ */
+int media_packet_set_codec_data(media_packet_h packet, void *codec_data, unsigned int codec_data_size);
+
 /**
  * @}
  */
diff --git a/src/media_packet.c b/src/media_packet.c
index b0eac7a..859a275 100755
--- a/src/media_packet.c
+++ b/src/media_packet.c
@@ -1261,31 +1261,6 @@ int media_packet_get_codec_data(media_packet_h packet, void **codec_data, unsign
 	return ret;
 }
 
-int media_packet_set_codec_data(media_packet_h packet, void *codec_data, unsigned int codec_data_size)
-{
-	media_packet_s *handle;
-	int ret = MEDIA_PACKET_ERROR_NONE;
-
-	MEDIA_PACKET_INSTANCE_CHECK(packet);
-
-	handle = (media_packet_s *) packet;
-
-	LOGI("Set: codec data = %p, codec_data_size = %u\n", codec_data, codec_data_size);
-
-	handle->codec_data = (void *)malloc(codec_data_size);
-	if (handle->codec_data != NULL) {
-		memset(handle->codec_data, 0, codec_data_size);
-	} else {
-		LOGE("[%s] MEDIA_PACKET_ERROR_OUT_OF_MEMORY(0x%08x)", __FUNCTION__, MEDIA_PACKET_ERROR_OUT_OF_MEMORY);
-		return MEDIA_PACKET_ERROR_OUT_OF_MEMORY;
-	}
-
-	memcpy(handle->codec_data, codec_data, codec_data_size);
-	handle->codec_data_size = codec_data_size;
-
-	return ret;
-}
-
 int media_packet_destroy(media_packet_h packet)
 {
 	media_packet_s *handle;
diff --git a/src/media_packet_internal.c b/src/media_packet_internal.c
index 81e223e..24e909d 100755
--- a/src/media_packet_internal.c
+++ b/src/media_packet_internal.c
@@ -24,3 +24,28 @@
 #include <media_packet_internal.h>
 #include <media_packet_private.h>
 #include <media_format_private.h>
+
+int media_packet_set_codec_data(media_packet_h packet, void *codec_data, unsigned int codec_data_size)
+{
+	media_packet_s *handle;
+	int ret = MEDIA_PACKET_ERROR_NONE;
+
+	MEDIA_PACKET_INSTANCE_CHECK(packet);
+
+	handle = (media_packet_s *) packet;
+
+	LOGI("Set: codec data = %p, codec_data_size = %u\n", codec_data, codec_data_size);
+
+	handle->codec_data = (void *)malloc(codec_data_size);
+	if (handle->codec_data != NULL) {
+		memset(handle->codec_data, 0, codec_data_size);
+	} else {
+		LOGE("[%s] MEDIA_PACKET_ERROR_OUT_OF_MEMORY(0x%08x)", __FUNCTION__, MEDIA_PACKET_ERROR_OUT_OF_MEMORY);
+		return MEDIA_PACKET_ERROR_OUT_OF_MEMORY;
+	}
+
+	memcpy(handle->codec_data, codec_data, codec_data_size);
+	handle->codec_data_size = codec_data_size;
+
+	return ret;
+}
-- 
2.34.1