Rollback: remove media_packet_set_codec_data() on Public APIs

Change-Id: Ib7770846367ee2fffced2f9ba0a7de48e13c5da6

diff --git a/include/media_packet.h b/include/media_packet.h
index 7788e63af42483daf21e51bc274bdcd96ff63886..399f4273147269e037e21b90c4a86949f78f6465 100755 (executable)
--- 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 ab9a8b6ed9b2262b00b4df444b7b01034a78c0c1..d0f7ad332eff28adc9845dde62302056a883fb48 100755 (executable)
--- 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 b0eac7a2e6c2bdde578ecff0f5f243974c632327..859a2757adc8f1b4e45d01b41b5667f1d633b5fd 100755 (executable)
--- 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 81e223e011ed3c880f7e63df0e02cb425e5dc903..24e909daa59277dfe662d6dfc53f7d26fca0a77f 100755 (executable)
--- 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;
+}