[mediacodec] code encapsulation and naming changes

1. remove duplicated header includes
2. move internal codes from header to c file
3. add parameter naming rule

[Version] 0.6.6
[Profile] Common
[Issue Type] Update

Change-Id: Ic8865953f1d5a1da3b9ae465c6d77cc16833d3d3

diff --git a/include/media_codec_port_gst.h b/include/media_codec_port_gst.h
index 18010d4..f3fe9a5 100644 (file)
--- a/include/media_codec_port_gst.h
+++ b/include/media_codec_port_gst.h
@@ -19,15 +19,12 @@
 #define __TIZEN_MEDIA_CODEC_PORT_GST_H__
 
 #include <unistd.h>
-#include <tizen.h>
 #include <media_codec.h>
 #include <media_codec_private.h>
 #include <media_codec_port.h>
 #include <media_codec_bitstream.h>
 
-#include <tbm_type.h>
 #include <tbm_surface.h>
-#include <tbm_bufmgr.h>
 #include <tbm_surface_internal.h>
 #include <gst/video/video-format.h>
 #include <gst/allocators/gsttizenmemory.h>
@@ -39,14 +36,6 @@ extern "C" {
 #define GST_INIT_STRUCTURE(param) \
        memset(&(param), 0, sizeof(param));
 
-#define MEDIACODEC_ELEMENT_SET_STATE(x_element, x_state)                                          \
-       do {                                                                                            \
-               LOGD("setting state [%s:%d] to [%s]\n", #x_state, x_state, GST_ELEMENT_NAME(x_element)); \
-               if (GST_STATE_CHANGE_FAILURE == gst_element_set_state(x_element, x_state)) {                    \
-                       LOGE("failed to set state %s to %s\n", #x_state, GST_ELEMENT_NAME(x_element));        \
-                       goto STATE_CHANGE_FAILED;                                                               \
-               }                                                                                           \
-       } while (0)
 
 #define SCMN_IMGB_MAX_PLANE 4
 #define TBM_API_CHANGE
@@ -168,30 +157,11 @@ struct _GstMCBuffer {
 };
 
 enum { fill_inbuf, fill_outbuf };
-
-int __mc_fill_input_buffer(mc_gst_core_t *core, media_packet_h packet, GstMCBuffer *mcbuffer);
-int __mc_fill_output_buffer(mc_gst_core_t *core, void *data, int size, GstMCBuffer *mcbuffer);
-
-int __mc_fill_input_buffer_with_packet(mc_gst_core_t *core, media_packet_h packet, GstMCBuffer *mcbuffer);
-int __mc_fill_input_buffer_with_adec_packet(mc_gst_core_t *core, media_packet_h packet, GstMCBuffer *mcbuffer);
-int __mc_fill_input_buffer_with_venc_packet(mc_gst_core_t *core, media_packet_h packet, GstMCBuffer *mcbuffer);
-
-int __mc_fill_packet_with_output_buffer(mc_gst_core_t *core, void *data, int size, GstMCBuffer *mcbuffer);
-int __mc_fill_aenc_packet_with_output_buffer(mc_gst_core_t *core, void *data, int size, GstMCBuffer *mcbuffer);
-int __mc_fill_venc_packet_with_output_buffer(mc_gst_core_t *core, void *data, int size, GstMCBuffer *mcbuffer);
-int __mc_fill_vdec_packet_with_output_buffer(mc_gst_core_t *core, void *data, int size, GstMCBuffer *mcbuffer);
-
-mc_gst_core_t *mc_gst_core_new();
-void mc_gst_core_free(mc_gst_core_t *core);
-
-mc_gst_port_t *mc_gst_port_new(mc_gst_core_t *core);
-void mc_gst_port_free(mc_gst_port_t *port);
-
 mc_ret_e mc_gst_prepare(mc_handle_t *mc_handle);
 mc_ret_e mc_gst_unprepare(mc_handle_t *mc_handle);
 
-mc_ret_e mc_gst_process_input(mc_handle_t *mc_handle, media_packet_h inbuf, uint64_t timeOutUs);
-mc_ret_e mc_gst_get_output(mc_handle_t *mc_handle, media_packet_h *outbuf, uint64_t timeOutUs);
+mc_ret_e mc_gst_process_input(mc_handle_t *mc_handle, media_packet_h inbuf, uint64_t timeout_us);
+mc_ret_e mc_gst_get_output(mc_handle_t *mc_handle, media_packet_h *outbuf, uint64_t timeout_us);
 
 mc_ret_e mc_gst_flush_buffers(mc_handle_t *mc_handle);
 

diff --git a/packaging/capi-media-codec.spec b/packaging/capi-media-codec.spec
index 3fff575..41b392e 100644 (file)
--- a/packaging/capi-media-codec.spec
+++ b/packaging/capi-media-codec.spec
@@ -4,7 +4,7 @@
 
 Name:       capi-media-codec
 Summary:    A Media Codec library in Tizen Native API
-Version:    0.6.5
+Version:    0.6.6
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/media_codec_port_gst.c b/src/media_codec_port_gst.c
index 5ebf95e..796cd6b 100644 (file)
--- a/src/media_codec_port_gst.c
+++ b/src/media_codec_port_gst.c
@@ -84,6 +84,23 @@ static int _mc_set_codec_data(mc_gst_core_t *core, GstMCBuffer *mcbuffer, bool c
 GstCaps *_mc_gst_vid_caps_new(mc_gst_core_t *core, mediacodec_codec_type_e codec_id, gint index);
 GstCaps *_mc_gst_aud_caps_new(mc_gst_core_t *core, mediacodec_codec_type_e codec_id, gint index);
 
+static int __mc_fill_input_buffer(mc_gst_core_t *core, media_packet_h packet, GstMCBuffer *mcbuffer);
+static int __mc_fill_output_buffer(mc_gst_core_t *core, void *data, int size, GstMCBuffer *mcbuffer);
+
+static int __mc_fill_input_buffer_with_packet(mc_gst_core_t *core, media_packet_h packet, GstMCBuffer *mcbuffer);
+static int __mc_fill_input_buffer_with_adec_packet(mc_gst_core_t *core, media_packet_h packet, GstMCBuffer *mcbuffer);
+static int __mc_fill_input_buffer_with_venc_packet(mc_gst_core_t *core, media_packet_h packet, GstMCBuffer *mcbuffer);
+
+static int __mc_fill_packet_with_output_buffer(mc_gst_core_t *core, void *data, int size, GstMCBuffer *mcbuffer);
+static int __mc_fill_aenc_packet_with_output_buffer(mc_gst_core_t *core, void *data, int size, GstMCBuffer *mcbuffer);
+static int __mc_fill_venc_packet_with_output_buffer(mc_gst_core_t *core, void *data, int size, GstMCBuffer *mcbuffer);
+static int __mc_fill_vdec_packet_with_output_buffer(mc_gst_core_t *core, void *data, int size, GstMCBuffer *mcbuffer);
+
+static mc_gst_core_t *mc_gst_core_new();
+static void mc_gst_core_free(mc_gst_core_t *core);
+
+static mc_gst_port_t *mc_gst_port_new(mc_gst_core_t *core);
+static void mc_gst_port_free(mc_gst_port_t *port);
 /* video vtable */
 int(*vdec_vtable[])() = {&__mc_fill_input_buffer_with_packet, &__mc_fill_packet_with_output_buffer};
 int(*venc_vtable[])() = {&__mc_fill_input_buffer_with_packet, &__mc_fill_packet_with_output_buffer};
@@ -155,6 +172,14 @@ int(*adec_flac_vtable[])() = {&__mc_fill_input_buffer_with_packet,
 int(*adec_wma_vtable[])() = {&__mc_fill_input_buffer_with_packet,                    /* WMA Decoder Vtable */
                                                        &__mc_fill_packet_with_output_buffer};
 
+#define MEDIACODEC_ELEMENT_SET_STATE(x_element, x_state)                                          \
+       do {                                                                                            \
+               LOGD("setting state [%s:%d] to [%s]\n", #x_state, x_state, GST_ELEMENT_NAME(x_element)); \
+               if (GST_STATE_CHANGE_FAILURE == gst_element_set_state(x_element, x_state)) {                    \
+                       LOGE("failed to set state %s to %s\n", #x_state, GST_ELEMENT_NAME(x_element));        \
+                       goto STATE_CHANGE_FAILED;                                                               \
+               }                                                                                           \
+       } while (0)
 
 /*
  * fill_inbuf virtual functions
@@ -195,7 +220,7 @@ int __mc_fill_inbuf_with_mm_video_buffer(mc_gst_core_t *core, media_packet_h pac
        return ret;
 }
 
-int __mc_fill_input_buffer_with_packet(mc_gst_core_t *core, media_packet_h packet, GstMCBuffer *mcbuffer)
+static int __mc_fill_input_buffer_with_packet(mc_gst_core_t *core, media_packet_h packet, GstMCBuffer *mcbuffer)
 {
        gint ret = MC_ERROR_NONE;
        void *buf_data = NULL;
@@ -223,7 +248,7 @@ int __mc_fill_input_buffer_with_packet(mc_gst_core_t *core, media_packet_h packe
        return ret;
 }
 
-int __mc_fill_input_buffer_with_adec_packet(mc_gst_core_t *core, media_packet_h packet, GstMCBuffer *mcbuffer)
+static int __mc_fill_input_buffer_with_adec_packet(mc_gst_core_t *core, media_packet_h packet, GstMCBuffer *mcbuffer)
 {
        gint ret = MC_ERROR_NONE;
        uint64_t buf_size = 0;
@@ -268,7 +293,7 @@ int __mc_fill_input_buffer_with_adec_packet(mc_gst_core_t *core, media_packet_h
        return ret;
 }
 
-int __mc_fill_input_buffer_with_venc_packet(mc_gst_core_t *core, media_packet_h packet, GstMCBuffer *mcbuffer)
+static int __mc_fill_input_buffer_with_venc_packet(mc_gst_core_t *core, media_packet_h packet, GstMCBuffer *mcbuffer)
 {
        gint ret = MC_ERROR_NONE;
        gint i;
@@ -372,12 +397,12 @@ int __mc_fill_input_buffer_with_venc_packet(mc_gst_core_t *core, media_packet_h
  * fill_outbuf virtual functions
  */
 
-int __mc_fill_output_buffer(mc_gst_core_t *core, void *data, int size, GstMCBuffer *mcbuffer)
+static int __mc_fill_output_buffer(mc_gst_core_t *core, void *data, int size, GstMCBuffer *mcbuffer)
 {
        return core->vtable[fill_outbuf](core, data, size, mcbuffer);
 }
 
-int __mc_fill_vdec_packet_with_output_buffer(mc_gst_core_t *core, void *data, int size, GstMCBuffer *mcbuffer)
+static int __mc_fill_vdec_packet_with_output_buffer(mc_gst_core_t *core, void *data, int size, GstMCBuffer *mcbuffer)
 {
        int i;
        int stride_width;
@@ -449,7 +474,7 @@ int __mc_fill_vdec_packet_with_output_buffer(mc_gst_core_t *core, void *data, in
        return MC_ERROR_NONE;
 }
 
-int __mc_fill_packet_with_output_buffer(mc_gst_core_t *core, void *data, int size, GstMCBuffer *mcbuffer)
+static int __mc_fill_packet_with_output_buffer(mc_gst_core_t *core, void *data, int size, GstMCBuffer *mcbuffer)
 {
        gint ret = MC_ERROR_NONE;
        gchar *ext_mem = NULL;
@@ -481,7 +506,7 @@ int __mc_fill_packet_with_output_buffer(mc_gst_core_t *core, void *data, int siz
        return MC_ERROR_NONE;
 }
 
-int __mc_fill_venc_packet_with_output_buffer(mc_gst_core_t *core, void *data, int size, GstMCBuffer *mcbuffer)
+static int __mc_fill_venc_packet_with_output_buffer(mc_gst_core_t *core, void *data, int size, GstMCBuffer *mcbuffer)
 {
        gint ret = MC_ERROR_NONE;
        bool codec_config = FALSE;
@@ -542,7 +567,7 @@ int __mc_fill_venc_packet_with_output_buffer(mc_gst_core_t *core, void *data, in
        return ret;
 }
 
-int __mc_fill_aenc_packet_with_output_buffer(mc_gst_core_t *core, void *data, int size, GstMCBuffer *mcbuffer)
+static int __mc_fill_aenc_packet_with_output_buffer(mc_gst_core_t *core, void *data, int size, GstMCBuffer *mcbuffer)
 {
        int ret = MC_ERROR_NONE;
        gint mem_size = 0;
@@ -882,7 +907,7 @@ int _mc_output_media_packet_new(mc_gst_core_t *core, bool video, bool encoder, m
 /*
  * mc_gst_core functions
  */
-mc_gst_core_t *mc_gst_core_new()
+static mc_gst_core_t *mc_gst_core_new()
 {
        mc_gst_core_t *core;
 
@@ -929,7 +954,7 @@ mc_gst_core_t *mc_gst_core_new()
        return core;
 }
 
-void mc_gst_core_free(mc_gst_core_t *core)
+static void mc_gst_core_free(mc_gst_core_t *core)
 {
        MEDIACODEC_FENTER();
 
@@ -979,7 +1004,7 @@ void mc_gst_core_free(mc_gst_core_t *core)
 /*
  * mc_gst_port functions
  */
-mc_gst_port_t *mc_gst_port_new(mc_gst_core_t *core)
+static mc_gst_port_t *mc_gst_port_new(mc_gst_core_t *core)
 {
        MEDIACODEC_FENTER();
 
@@ -1000,7 +1025,7 @@ mc_gst_port_t *mc_gst_port_new(mc_gst_core_t *core)
        return port;
 }
 
-void mc_gst_port_free(mc_gst_port_t *port)
+static void mc_gst_port_free(mc_gst_port_t *port)
 {
        MEDIACODEC_FENTER();
 
@@ -1795,7 +1820,7 @@ mc_ret_e mc_gst_unprepare(mc_handle_t *mc_handle)
        return ret;
 }
 
-mc_ret_e mc_gst_process_input(mc_handle_t *mc_handle, media_packet_h inbuf, uint64_t timeOutUs)
+mc_ret_e mc_gst_process_input(mc_handle_t *mc_handle, media_packet_h inbuf, uint64_t timeout_us)
 {
        MEDIACODEC_FENTER();
 
@@ -1839,7 +1864,7 @@ mc_ret_e mc_gst_process_input(mc_handle_t *mc_handle, media_packet_h inbuf, uint
        return ret;
 }
 
-mc_ret_e mc_gst_get_output(mc_handle_t *mc_handle, media_packet_h *outbuf, uint64_t timeOutUs)
+mc_ret_e mc_gst_get_output(mc_handle_t *mc_handle, media_packet_h *outbuf, uint64_t timeout_us)
 {
        gint ret = MC_ERROR_NONE;
        gint64 end_time = -1;
@@ -1848,7 +1873,7 @@ mc_ret_e mc_gst_get_output(mc_handle_t *mc_handle, media_packet_h *outbuf, uint6
        media_packet_h out_packet = NULL;
 
        MEDIACODEC_FENTER();
-       end_time = g_get_monotonic_time() + timeOutUs;
+       end_time = g_get_monotonic_time() + timeout_us;
 
        if (!mc_handle)
                return MC_PARAM_ERROR;