From: Sangchul Lee Date: Tue, 5 Jan 2021 06:42:17 +0000 (+0900) Subject: Remove unnecessary variables X-Git-Tag: submit/tizen/20210108.020109~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0bf1a218c84bd7e09466878d113297453341cb5e;p=platform%2Fcore%2Fapi%2Fmediatool.git Remove unnecessary variables It is revised to declare 'ret' variable only when necessary. [Version] 0.1.29 [Issue Type] Refactoring Change-Id: Ib3eb96c6a1ef9b73e7e3615d084eb12fb5f60988 Signed-off-by: Sangchul Lee --- diff --git a/packaging/capi-media-tool.spec b/packaging/capi-media-tool.spec index 2fa979f..5633c6f 100755 --- a/packaging/capi-media-tool.spec +++ b/packaging/capi-media-tool.spec @@ -1,6 +1,6 @@ Name: capi-media-tool Summary: A Core API media tool library in Tizen Native API -Version: 0.1.28 +Version: 0.1.29 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/media_format.c b/src/media_format.c index 28c7011..6666e83 100644 --- a/src/media_format.c +++ b/src/media_format.c @@ -93,7 +93,6 @@ static const media_format_channel_position_e default_channel_order[64] = { int media_format_create(media_format_h *fmt) { MEDIA_FORMAT_NULL_ARG_CHECK(fmt); - int ret = MEDIA_FORMAT_ERROR_NONE; media_format_s *fmt_handle; fmt_handle = (media_format_s *)malloc(sizeof(media_format_s)); @@ -108,7 +107,7 @@ int media_format_create(media_format_h *fmt) LOGI("The new format handle: %p \n", *fmt); - return ret; + return MEDIA_FORMAT_ERROR_NONE; } static void __media_format_destroy(media_format_s *fmt) @@ -121,7 +120,6 @@ static void __media_format_destroy(media_format_s *fmt) int media_format_get_type(media_format_h fmt, media_format_type_e *formattype) { - int ret = MEDIA_FORMAT_ERROR_NONE; MEDIA_FORMAT_INSTANCE_CHECK(fmt); media_format_s *fmt_handle; @@ -143,12 +141,11 @@ int media_format_get_type(media_format_h fmt, media_format_type_e *formattype) return MEDIA_FORMAT_ERROR_INVALID_OPERATION; } - return ret; + return MEDIA_FORMAT_ERROR_NONE; } int media_format_get_container_mime(media_format_h fmt, media_format_mimetype_e *mimetype) { - int ret = MEDIA_FORMAT_ERROR_NONE; MEDIA_FORMAT_INSTANCE_CHECK(fmt); media_format_s *fmt_handle; @@ -162,12 +159,11 @@ int media_format_get_container_mime(media_format_h fmt, media_format_mimetype_e if (mimetype) *mimetype = fmt_handle->mimetype; - return ret; + return MEDIA_FORMAT_ERROR_NONE; } int media_format_get_text_info(media_format_h fmt, media_format_mimetype_e *mimetype, media_format_text_type_e *type) { - int ret = MEDIA_FORMAT_ERROR_NONE; MEDIA_FORMAT_INSTANCE_CHECK(fmt); media_format_s *fmt_handle; @@ -183,12 +179,11 @@ int media_format_get_text_info(media_format_h fmt, media_format_mimetype_e *mime if (type) *type = fmt_handle->detail.text.type; - return ret; + return MEDIA_FORMAT_ERROR_NONE; } int media_format_get_video_info(media_format_h fmt, media_format_mimetype_e *mimetype, int *width, int *height, int *avg_bps, int *max_bps) { - int ret = MEDIA_FORMAT_ERROR_NONE; MEDIA_FORMAT_INSTANCE_CHECK(fmt); media_format_s *fmt_handle; @@ -210,12 +205,11 @@ int media_format_get_video_info(media_format_h fmt, media_format_mimetype_e *mim if (max_bps) *max_bps = fmt_handle->detail.video.max_bps; - return ret; + return MEDIA_FORMAT_ERROR_NONE; } int media_format_get_audio_info(media_format_h fmt, media_format_mimetype_e *mimetype, int *channel, int *samplerate, int *bit, int *avg_bps) { - int ret = MEDIA_FORMAT_ERROR_NONE; MEDIA_FORMAT_INSTANCE_CHECK(fmt); media_format_s *fmt_handle; @@ -236,12 +230,11 @@ int media_format_get_audio_info(media_format_h fmt, media_format_mimetype_e *mim if (avg_bps) *avg_bps = fmt_handle->detail.audio.avg_bps; - return ret; + return MEDIA_FORMAT_ERROR_NONE; } int media_format_get_audio_aac_type(media_format_h fmt, bool *is_adts) { - int ret = MEDIA_FORMAT_ERROR_NONE; MEDIA_FORMAT_INSTANCE_CHECK(fmt); media_format_s *fmt_handle; @@ -255,13 +248,11 @@ int media_format_get_audio_aac_type(media_format_h fmt, bool *is_adts) if (is_adts) *is_adts = fmt_handle->detail.audio.is_adts; - return ret; + return MEDIA_FORMAT_ERROR_NONE; } int media_format_get_audio_aac_header_type(media_format_h fmt, media_format_aac_header_type_e *aac_header_type) { - - int ret = MEDIA_FORMAT_ERROR_NONE; MEDIA_FORMAT_INSTANCE_CHECK(fmt); media_format_s *fmt_handle; @@ -275,12 +266,11 @@ int media_format_get_audio_aac_header_type(media_format_h fmt, media_format_aac_ if (aac_header_type) *aac_header_type = fmt_handle->detail.audio.aac_header_type; - return ret; + return MEDIA_FORMAT_ERROR_NONE; } int media_format_get_video_frame_rate(media_format_h fmt, int *frame_rate) { - int ret = MEDIA_FORMAT_ERROR_NONE; MEDIA_FORMAT_INSTANCE_CHECK(fmt); media_format_s *fmt_handle; @@ -294,12 +284,11 @@ int media_format_get_video_frame_rate(media_format_h fmt, int *frame_rate) if (frame_rate) *frame_rate = fmt_handle->detail.video.frame_rate; - return ret; + return MEDIA_FORMAT_ERROR_NONE; } int media_format_set_container_mime(media_format_h fmt, media_format_mimetype_e mimetype) { - int ret = MEDIA_FORMAT_ERROR_NONE; MEDIA_FORMAT_INSTANCE_CHECK(fmt); if (!MEDIA_FORMAT_IS_WRITABLE(fmt)) { @@ -315,12 +304,11 @@ int media_format_set_container_mime(media_format_h fmt, media_format_mimetype_e fmt_handle->mimetype = mimetype; - return ret; + return MEDIA_FORMAT_ERROR_NONE; } int media_format_set_text_mime(media_format_h fmt, media_format_mimetype_e mimetype) { - int ret = MEDIA_FORMAT_ERROR_NONE; MEDIA_FORMAT_INSTANCE_CHECK(fmt); if (!MEDIA_FORMAT_IS_WRITABLE(fmt)) { @@ -336,12 +324,11 @@ int media_format_set_text_mime(media_format_h fmt, media_format_mimetype_e mimet fmt_handle->mimetype = mimetype; - return ret; + return MEDIA_FORMAT_ERROR_NONE; } int media_format_set_text_type(media_format_h fmt, media_format_text_type_e type) { - int ret = MEDIA_FORMAT_ERROR_NONE; MEDIA_FORMAT_INSTANCE_CHECK(fmt); if (!MEDIA_FORMAT_IS_WRITABLE(fmt)) { @@ -357,12 +344,11 @@ int media_format_set_text_type(media_format_h fmt, media_format_text_type_e type fmt_handle->detail.text.type = type; - return ret; + return MEDIA_FORMAT_ERROR_NONE; } int media_format_set_video_mime(media_format_h fmt, media_format_mimetype_e mimetype) { - int ret = MEDIA_FORMAT_ERROR_NONE; MEDIA_FORMAT_INSTANCE_CHECK(fmt); if (!MEDIA_FORMAT_IS_WRITABLE(fmt)) { @@ -378,12 +364,11 @@ int media_format_set_video_mime(media_format_h fmt, media_format_mimetype_e mime fmt_handle->mimetype = mimetype; - return ret; + return MEDIA_FORMAT_ERROR_NONE; } int media_format_set_video_width(media_format_h fmt, int width) { - int ret = MEDIA_FORMAT_ERROR_NONE; MEDIA_FORMAT_INSTANCE_CHECK(fmt); if (!MEDIA_FORMAT_IS_WRITABLE(fmt)) { @@ -401,12 +386,11 @@ int media_format_set_video_width(media_format_h fmt, int width) fmt_handle->detail.video.width = width; - return ret; + return MEDIA_FORMAT_ERROR_NONE; } int media_format_set_video_height(media_format_h fmt, int height) { - int ret = MEDIA_FORMAT_ERROR_NONE; MEDIA_FORMAT_INSTANCE_CHECK(fmt); if (!MEDIA_FORMAT_IS_WRITABLE(fmt)) { @@ -424,12 +408,11 @@ int media_format_set_video_height(media_format_h fmt, int height) fmt_handle->detail.video.height = height; - return ret; + return MEDIA_FORMAT_ERROR_NONE; } int media_format_set_video_avg_bps(media_format_h fmt, int avg_bps) { - int ret = MEDIA_FORMAT_ERROR_NONE; MEDIA_FORMAT_INSTANCE_CHECK(fmt); if (!MEDIA_FORMAT_IS_WRITABLE(fmt)) { @@ -447,12 +430,11 @@ int media_format_set_video_avg_bps(media_format_h fmt, int avg_bps) fmt_handle->detail.video.avg_bps = avg_bps; - return ret; + return MEDIA_FORMAT_ERROR_NONE; } int media_format_set_video_max_bps(media_format_h fmt, int max_bps) { - int ret = MEDIA_FORMAT_ERROR_NONE; MEDIA_FORMAT_INSTANCE_CHECK(fmt); if (!MEDIA_FORMAT_IS_WRITABLE(fmt)) { @@ -470,12 +452,11 @@ int media_format_set_video_max_bps(media_format_h fmt, int max_bps) fmt_handle->detail.video.max_bps = max_bps; - return ret; + return MEDIA_FORMAT_ERROR_NONE; } int media_format_set_video_frame_rate(media_format_h fmt, int frame_rate) { - int ret = MEDIA_FORMAT_ERROR_NONE; MEDIA_FORMAT_INSTANCE_CHECK(fmt); if (!MEDIA_FORMAT_IS_WRITABLE(fmt)) { @@ -493,13 +474,11 @@ int media_format_set_video_frame_rate(media_format_h fmt, int frame_rate) fmt_handle->detail.video.frame_rate = frame_rate; - return ret; + return MEDIA_FORMAT_ERROR_NONE; } int media_format_set_audio_mime(media_format_h fmt, media_format_mimetype_e mimetype) { - - int ret = MEDIA_FORMAT_ERROR_NONE; MEDIA_FORMAT_INSTANCE_CHECK(fmt); if (!MEDIA_FORMAT_IS_WRITABLE(fmt)) { @@ -517,13 +496,11 @@ int media_format_set_audio_mime(media_format_h fmt, media_format_mimetype_e mime fmt_handle->mimetype = mimetype; - return ret; + return MEDIA_FORMAT_ERROR_NONE; } int media_format_set_audio_channel(media_format_h fmt, int channel) { - - int ret = MEDIA_FORMAT_ERROR_NONE; MEDIA_FORMAT_INSTANCE_CHECK(fmt); if (!MEDIA_FORMAT_IS_WRITABLE(fmt)) { @@ -541,13 +518,11 @@ int media_format_set_audio_channel(media_format_h fmt, int channel) fmt_handle->detail.audio.channel = channel; - return ret; + return MEDIA_FORMAT_ERROR_NONE; } int media_format_set_audio_samplerate(media_format_h fmt, int samplerate) { - - int ret = MEDIA_FORMAT_ERROR_NONE; MEDIA_FORMAT_INSTANCE_CHECK(fmt); if (!MEDIA_FORMAT_IS_WRITABLE(fmt)) { @@ -565,13 +540,11 @@ int media_format_set_audio_samplerate(media_format_h fmt, int samplerate) fmt_handle->detail.audio.samplerate = samplerate; - return ret; + return MEDIA_FORMAT_ERROR_NONE; } int media_format_set_audio_bit(media_format_h fmt, int bit) { - - int ret = MEDIA_FORMAT_ERROR_NONE; MEDIA_FORMAT_INSTANCE_CHECK(fmt); if (!MEDIA_FORMAT_IS_WRITABLE(fmt)) { @@ -589,13 +562,11 @@ int media_format_set_audio_bit(media_format_h fmt, int bit) fmt_handle->detail.audio.bit = bit; - return ret; + return MEDIA_FORMAT_ERROR_NONE; } int media_format_set_audio_avg_bps(media_format_h fmt, int avg_bps) { - - int ret = MEDIA_FORMAT_ERROR_NONE; MEDIA_FORMAT_INSTANCE_CHECK(fmt); if (!MEDIA_FORMAT_IS_WRITABLE(fmt)) { @@ -613,13 +584,11 @@ int media_format_set_audio_avg_bps(media_format_h fmt, int avg_bps) fmt_handle->detail.audio.avg_bps = avg_bps; - return ret; + return MEDIA_FORMAT_ERROR_NONE; } int media_format_set_audio_aac_type(media_format_h fmt, bool is_adts) { - - int ret = MEDIA_FORMAT_ERROR_NONE; MEDIA_FORMAT_INSTANCE_CHECK(fmt); if (!MEDIA_FORMAT_IS_WRITABLE(fmt)) { @@ -637,13 +606,11 @@ int media_format_set_audio_aac_type(media_format_h fmt, bool is_adts) fmt_handle->detail.audio.is_adts = is_adts; - return ret; + return MEDIA_FORMAT_ERROR_NONE; } int media_format_set_audio_aac_header_type(media_format_h fmt, media_format_aac_header_type_e aac_header_type) { - - int ret = MEDIA_FORMAT_ERROR_NONE; MEDIA_FORMAT_INSTANCE_CHECK(fmt); if (!MEDIA_FORMAT_IS_WRITABLE(fmt)) { @@ -661,12 +628,11 @@ int media_format_set_audio_aac_header_type(media_format_h fmt, media_format_aac_ fmt_handle->detail.audio.aac_header_type = aac_header_type; - return ret; + return MEDIA_FORMAT_ERROR_NONE; } int media_format_ref(media_format_h fmt) { - int ret = MEDIA_FORMAT_ERROR_NONE; MEDIA_FORMAT_INSTANCE_CHECK(fmt); media_format_s *fmt_handle; @@ -677,12 +643,11 @@ int media_format_ref(media_format_h fmt) g_atomic_int_inc(&fmt_handle->ref_count); - return ret; + return MEDIA_FORMAT_ERROR_NONE; } int media_format_unref(media_format_h fmt) { - int ret = MEDIA_FORMAT_ERROR_NONE; MEDIA_FORMAT_INSTANCE_CHECK(fmt); bool is_zero; @@ -701,16 +666,15 @@ int media_format_unref(media_format_h fmt) __media_format_destroy(fmt_handle); } - return ret; + return MEDIA_FORMAT_ERROR_NONE; } int media_format_is_writable(media_format_h fmt, bool * is_writable) { - int ret = MEDIA_FORMAT_ERROR_NONE; MEDIA_FORMAT_INSTANCE_CHECK(fmt); if (MEDIA_FORMAT_GET_REFCOUNT(fmt) <= 0) { LOGE("The format ref_count is less than 0..\n."); //LCOV_EXCL_LINE - ret = MEDIA_FORMAT_ERROR_INVALID_OPERATION; + return MEDIA_FORMAT_ERROR_INVALID_OPERATION; } media_format_s *fmt_handle; @@ -723,12 +687,11 @@ int media_format_is_writable(media_format_h fmt, bool * is_writable) *is_writable = false; } - return ret; + return MEDIA_FORMAT_ERROR_NONE; } int media_format_make_writable(media_format_h fmt, media_format_h *out_fmt) { - int ret = MEDIA_FORMAT_ERROR_NONE; MEDIA_FORMAT_INSTANCE_CHECK(fmt); media_format_s *fmt_handle; @@ -760,7 +723,7 @@ int media_format_make_writable(media_format_h fmt, media_format_h *out_fmt) } - return ret; + return MEDIA_FORMAT_ERROR_NONE; } int media_format_set_extra(media_format_h fmt, void *extra) diff --git a/src/media_packet.c b/src/media_packet.c index 78ad920..28f1e32 100644 --- a/src/media_packet.c +++ b/src/media_packet.c @@ -112,7 +112,6 @@ fail: int media_packet_create(media_format_h fmt, media_packet_finalize_cb fcb, void *fcb_data, media_packet_h *packet) { media_packet_s *handle = NULL; - int ret = MEDIA_PACKET_ERROR_NONE; MEDIA_PACKET_INSTANCE_CHECK(fmt); MEDIA_PACKET_NULL_ARG_CHECK(packet); @@ -162,7 +161,7 @@ int media_packet_create(media_format_h fmt, media_packet_finalize_cb fcb, void * /* take handle */ *packet = (media_packet_h)handle; LOGI("new handle : %p", *packet); - return ret; + return MEDIA_PACKET_ERROR_NONE; } @@ -171,8 +170,6 @@ int media_packet_copy(media_packet_h org_packet, media_packet_finalize_cb fcb, v media_packet_s *handle; media_packet_s *org_handle; - int ret = MEDIA_PACKET_ERROR_NONE; - MEDIA_PACKET_INSTANCE_CHECK(org_packet); MEDIA_PACKET_NULL_ARG_CHECK(new_packet); @@ -205,7 +202,7 @@ int media_packet_copy(media_packet_h org_packet, media_packet_finalize_cb fcb, v /* take handle */ *new_packet = (media_packet_h)handle; LOGI("new handle : %p", *new_packet); - return ret; + return MEDIA_PACKET_ERROR_NONE; } @@ -691,7 +688,6 @@ int media_packet_create_from_external_memory(media_format_h fmt, void *mem_ptr, int media_packet_get_buffer_data_ptr(media_packet_h packet, void **data) { media_packet_s *handle; - int ret = MEDIA_PACKET_ERROR_NONE; MEDIA_PACKET_INSTANCE_CHECK(packet); MEDIA_PACKET_NULL_ARG_CHECK(data); @@ -700,13 +696,12 @@ int media_packet_get_buffer_data_ptr(media_packet_h packet, void **data) *data = handle->data; - return ret; + return MEDIA_PACKET_ERROR_NONE; } int media_packet_get_tbm_surface(media_packet_h packet, tbm_surface_h *surface) { media_packet_s *handle; - int ret = MEDIA_PACKET_ERROR_NONE; MEDIA_PACKET_INSTANCE_CHECK(packet); MEDIA_PACKET_NULL_ARG_CHECK(surface); @@ -715,13 +710,12 @@ int media_packet_get_tbm_surface(media_packet_h packet, tbm_surface_h *surface) *surface = (tbm_surface_h)handle->surface_data; - return ret; + return MEDIA_PACKET_ERROR_NONE; } int media_packet_get_format(media_packet_h packet, media_format_h *fmt) { media_packet_s *handle; - int ret = MEDIA_PACKET_ERROR_NONE; MEDIA_PACKET_INSTANCE_CHECK(packet); MEDIA_PACKET_NULL_ARG_CHECK(fmt); @@ -733,13 +727,12 @@ int media_packet_get_format(media_packet_h packet, media_format_h *fmt) *fmt = (media_format_h)handle->format; - return ret; + return MEDIA_PACKET_ERROR_NONE; } int media_packet_set_format(media_packet_h packet, media_format_h fmt) { media_packet_s *handle; - int ret = MEDIA_PACKET_ERROR_NONE; MEDIA_PACKET_INSTANCE_CHECK(packet); MEDIA_PACKET_NULL_ARG_CHECK(fmt); @@ -761,13 +754,12 @@ int media_packet_set_format(media_packet_h packet, media_format_h fmt) /* ref new format */ media_format_ref(fmt); - return ret; + return MEDIA_PACKET_ERROR_NONE; } int media_packet_set_pts(media_packet_h packet, uint64_t pts) { media_packet_s *handle; - int ret = MEDIA_PACKET_ERROR_NONE; MEDIA_PACKET_INSTANCE_CHECK(packet); @@ -775,13 +767,12 @@ int media_packet_set_pts(media_packet_h packet, uint64_t pts) handle->pts = pts; - return ret; + return MEDIA_PACKET_ERROR_NONE; } int media_packet_set_dts(media_packet_h packet, uint64_t dts) { media_packet_s *handle; - int ret = MEDIA_PACKET_ERROR_NONE; MEDIA_PACKET_INSTANCE_CHECK(packet); @@ -789,13 +780,12 @@ int media_packet_set_dts(media_packet_h packet, uint64_t dts) handle->dts = dts; - return ret; + return MEDIA_PACKET_ERROR_NONE; } int media_packet_set_duration(media_packet_h packet, uint64_t duration) { media_packet_s *handle; - int ret = MEDIA_PACKET_ERROR_NONE; MEDIA_PACKET_INSTANCE_CHECK(packet); @@ -803,13 +793,12 @@ int media_packet_set_duration(media_packet_h packet, uint64_t duration) handle->duration = duration; - return ret; + return MEDIA_PACKET_ERROR_NONE; } int media_packet_set_buffer_size(media_packet_h packet, uint64_t size) { media_packet_s *handle; - int ret = MEDIA_PACKET_ERROR_NONE; MEDIA_PACKET_INSTANCE_CHECK(packet); @@ -817,13 +806,12 @@ int media_packet_set_buffer_size(media_packet_h packet, uint64_t size) handle->size = size; - return ret; + return MEDIA_PACKET_ERROR_NONE; } int media_packet_get_pts(media_packet_h packet, uint64_t *pts) { media_packet_s *handle; - int ret = MEDIA_PACKET_ERROR_NONE; MEDIA_PACKET_INSTANCE_CHECK(packet); MEDIA_PACKET_NULL_ARG_CHECK(pts); @@ -832,13 +820,12 @@ int media_packet_get_pts(media_packet_h packet, uint64_t *pts) *pts = handle->pts; - return ret; + return MEDIA_PACKET_ERROR_NONE; } int media_packet_get_dts(media_packet_h packet, uint64_t *dts) { media_packet_s *handle; - int ret = MEDIA_PACKET_ERROR_NONE; MEDIA_PACKET_INSTANCE_CHECK(packet); MEDIA_PACKET_NULL_ARG_CHECK(dts); @@ -847,13 +834,12 @@ int media_packet_get_dts(media_packet_h packet, uint64_t *dts) *dts = handle->dts; - return ret; + return MEDIA_PACKET_ERROR_NONE; } int media_packet_get_duration(media_packet_h packet, uint64_t *duration) { media_packet_s *handle; - int ret = MEDIA_PACKET_ERROR_NONE; MEDIA_PACKET_INSTANCE_CHECK(packet); MEDIA_PACKET_NULL_ARG_CHECK(duration); @@ -862,13 +848,12 @@ int media_packet_get_duration(media_packet_h packet, uint64_t *duration) *duration = handle->duration; - return ret; + return MEDIA_PACKET_ERROR_NONE; } int media_packet_get_buffer_size(media_packet_h packet, uint64_t *size) { media_packet_s *handle; - int ret = MEDIA_PACKET_ERROR_NONE; MEDIA_PACKET_INSTANCE_CHECK(packet); MEDIA_PACKET_NULL_ARG_CHECK(size); @@ -877,13 +862,12 @@ int media_packet_get_buffer_size(media_packet_h packet, uint64_t *size) *size = handle->size; - return ret; + return MEDIA_PACKET_ERROR_NONE; } int media_packet_set_extra(media_packet_h packet, void *extra) { media_packet_s *handle; - int ret = MEDIA_PACKET_ERROR_NONE; MEDIA_PACKET_INSTANCE_CHECK(packet); @@ -891,13 +875,12 @@ int media_packet_set_extra(media_packet_h packet, void *extra) handle->extradata = extra; - return ret; + return MEDIA_PACKET_ERROR_NONE; } int media_packet_get_extra(media_packet_h packet, void **extra) { media_packet_s *handle; - int ret = MEDIA_PACKET_ERROR_NONE; MEDIA_PACKET_INSTANCE_CHECK(packet); MEDIA_PACKET_NULL_ARG_CHECK(extra); @@ -906,13 +889,12 @@ int media_packet_get_extra(media_packet_h packet, void **extra) *extra = handle->extradata; - return ret; + return MEDIA_PACKET_ERROR_NONE; } int media_packet_is_video(media_packet_h packet, bool *is_video) { media_packet_s *handle; - int ret = MEDIA_PACKET_ERROR_NONE; MEDIA_PACKET_INSTANCE_CHECK(packet); MEDIA_PACKET_NULL_ARG_CHECK(is_video); @@ -924,13 +906,12 @@ int media_packet_is_video(media_packet_h packet, bool *is_video) else *is_video = false; - return ret; + return MEDIA_PACKET_ERROR_NONE; } int media_packet_is_audio(media_packet_h packet, bool *is_audio) { media_packet_s *handle; - int ret = MEDIA_PACKET_ERROR_NONE; MEDIA_PACKET_INSTANCE_CHECK(packet); MEDIA_PACKET_NULL_ARG_CHECK(is_audio); @@ -942,13 +923,12 @@ int media_packet_is_audio(media_packet_h packet, bool *is_audio) else *is_audio = false; - return ret; + return MEDIA_PACKET_ERROR_NONE; } int media_packet_is_text(media_packet_h packet, bool *is_text) { media_packet_s *handle; - int ret = MEDIA_PACKET_ERROR_NONE; MEDIA_PACKET_INSTANCE_CHECK(packet); MEDIA_PACKET_NULL_ARG_CHECK(is_text); @@ -960,13 +940,12 @@ int media_packet_is_text(media_packet_h packet, bool *is_text) else *is_text = false; - return ret; + return MEDIA_PACKET_ERROR_NONE; } int media_packet_is_encoded(media_packet_h packet, bool *is_encoded) { media_packet_s *handle; - int ret = MEDIA_PACKET_ERROR_NONE; MEDIA_PACKET_INSTANCE_CHECK(packet); MEDIA_PACKET_NULL_ARG_CHECK(is_encoded); @@ -978,13 +957,12 @@ int media_packet_is_encoded(media_packet_h packet, bool *is_encoded) else *is_encoded = false; - return ret; + return MEDIA_PACKET_ERROR_NONE; } int media_packet_is_raw(media_packet_h packet, bool *is_raw) { media_packet_s *handle; - int ret = MEDIA_PACKET_ERROR_NONE; MEDIA_PACKET_INSTANCE_CHECK(packet); MEDIA_PACKET_NULL_ARG_CHECK(is_raw); @@ -996,13 +974,12 @@ int media_packet_is_raw(media_packet_h packet, bool *is_raw) else *is_raw = false; - return ret; + return MEDIA_PACKET_ERROR_NONE; } int media_packet_get_flags(media_packet_h packet, media_buffer_flags_e *flags) { media_packet_s *handle; - int ret = MEDIA_PACKET_ERROR_NONE; MEDIA_PACKET_INSTANCE_CHECK(packet); MEDIA_PACKET_NULL_ARG_CHECK(flags); @@ -1011,13 +988,12 @@ int media_packet_get_flags(media_packet_h packet, media_buffer_flags_e *flags) *flags = handle->flags; - return ret; + return MEDIA_PACKET_ERROR_NONE; } int media_packet_set_flags(media_packet_h packet, media_buffer_flags_e flags) { media_packet_s *handle; - int ret = MEDIA_PACKET_ERROR_NONE; MEDIA_PACKET_INSTANCE_CHECK(packet); @@ -1025,13 +1001,12 @@ int media_packet_set_flags(media_packet_h packet, media_buffer_flags_e flags) handle->flags |= flags; - return ret; + return MEDIA_PACKET_ERROR_NONE; } int media_packet_unset_flags(media_packet_h packet, media_buffer_flags_e flags) { media_packet_s *handle; - int ret = MEDIA_PACKET_ERROR_NONE; MEDIA_PACKET_INSTANCE_CHECK(packet); @@ -1039,13 +1014,12 @@ int media_packet_unset_flags(media_packet_h packet, media_buffer_flags_e flags) handle->flags &= ~flags; - return ret; + return MEDIA_PACKET_ERROR_NONE; } int media_packet_is_codec_config(media_packet_h packet, bool *is_codec_config) { media_packet_s *handle; - int ret = MEDIA_PACKET_ERROR_NONE; MEDIA_PACKET_INSTANCE_CHECK(packet); MEDIA_PACKET_NULL_ARG_CHECK(is_codec_config); @@ -1057,13 +1031,12 @@ int media_packet_is_codec_config(media_packet_h packet, bool *is_codec_config) else *is_codec_config = false; - return ret; + return MEDIA_PACKET_ERROR_NONE; } int media_packet_is_end_of_stream(media_packet_h packet, bool *is_eos) { media_packet_s *handle; - int ret = MEDIA_PACKET_ERROR_NONE; MEDIA_PACKET_INSTANCE_CHECK(packet); MEDIA_PACKET_NULL_ARG_CHECK(is_eos); @@ -1075,13 +1048,12 @@ int media_packet_is_end_of_stream(media_packet_h packet, bool *is_eos) else *is_eos = false; - return ret; + return MEDIA_PACKET_ERROR_NONE; } int media_packet_is_sync_frame(media_packet_h packet, bool *is_sync) { media_packet_s *handle; - int ret = MEDIA_PACKET_ERROR_NONE; MEDIA_PACKET_INSTANCE_CHECK(packet); MEDIA_PACKET_NULL_ARG_CHECK(is_sync); @@ -1093,13 +1065,12 @@ int media_packet_is_sync_frame(media_packet_h packet, bool *is_sync) else *is_sync = false; - return ret; + return MEDIA_PACKET_ERROR_NONE; } int media_packet_has_tbm_surface_buffer(media_packet_h packet, bool *has_tbm_surface) { media_packet_s *handle; - int ret = MEDIA_PACKET_ERROR_NONE; MEDIA_PACKET_INSTANCE_CHECK(packet); MEDIA_PACKET_NULL_ARG_CHECK(has_tbm_surface); @@ -1112,7 +1083,7 @@ int media_packet_has_tbm_surface_buffer(media_packet_h packet, bool *has_tbm_sur } else { *has_tbm_surface = false; } - return ret; + return MEDIA_PACKET_ERROR_NONE; } int media_packet_get_number_of_video_planes(media_packet_h packet, uint32_t *num) @@ -1440,7 +1411,6 @@ static void __aligned_free_normal_buffer_type(void *buffer_ptr) int media_packet_set_rotate_method(media_packet_h packet, media_packet_rotate_method_e method) { media_packet_s *handle; - int ret = MEDIA_PACKET_ERROR_NONE; MEDIA_PACKET_INSTANCE_CHECK(packet); @@ -1448,13 +1418,12 @@ int media_packet_set_rotate_method(media_packet_h packet, media_packet_rotate_me handle->method = method; - return ret; + return MEDIA_PACKET_ERROR_NONE; } int media_packet_get_rotate_method(media_packet_h packet, media_packet_rotate_method_e *method) { media_packet_s *handle; - int ret = MEDIA_PACKET_ERROR_NONE; MEDIA_PACKET_INSTANCE_CHECK(packet); MEDIA_PACKET_NULL_ARG_CHECK(method); @@ -1463,5 +1432,5 @@ int media_packet_get_rotate_method(media_packet_h packet, media_packet_rotate_me *method = handle->method; - return ret; + return MEDIA_PACKET_ERROR_NONE; } diff --git a/src/media_packet_pool.c b/src/media_packet_pool.c index 00b3fb1..76514b9 100644 --- a/src/media_packet_pool.c +++ b/src/media_packet_pool.c @@ -28,7 +28,6 @@ static int __packet_finalize_cb(media_packet_h packet, int error_code, void *use int media_packet_pool_create(media_packet_pool_h *pool) { - int ret = MEDIA_PACKET_ERROR_NONE; media_packet_pool_s *pool_handle = NULL; MEDIA_PACKET_POOL_INSTANCE_CHECK(pool); @@ -38,8 +37,7 @@ int media_packet_pool_create(media_packet_pool_h *pool) memset(pool_handle, 0, sizeof(media_packet_pool_s)); else { LOGE("out of memory"); //LCOV_EXCL_LINE - ret = MEDIA_PACKET_ERROR_OUT_OF_MEMORY; - return ret; + return MEDIA_PACKET_ERROR_OUT_OF_MEMORY; } /* create Gqueue */ @@ -53,7 +51,7 @@ int media_packet_pool_create(media_packet_pool_h *pool) *pool = (media_packet_pool_h) pool_handle; LOGI("packet pool handle : %p", *pool); - return ret; + return MEDIA_PACKET_ERROR_NONE; } @@ -81,7 +79,6 @@ int media_packet_pool_set_media_format(media_packet_pool_h pool, media_format_h int media_packet_pool_set_size(media_packet_pool_h pool, int min_buffers, int max_buffers) { - int ret = MEDIA_PACKET_ERROR_NONE; media_packet_pool_s *pool_handle = NULL; MEDIA_PACKET_POOL_INSTANCE_CHECK(pool); @@ -93,7 +90,7 @@ int media_packet_pool_set_size(media_packet_pool_h pool, int min_buffers, int ma pool_handle->pool_size_min = min_buffers; pool_handle->pool_size_max = max_buffers; - return ret; + return MEDIA_PACKET_ERROR_NONE; } int media_packet_pool_get_size(media_packet_pool_h pool, int *min_size, int *max_size, int *curr_size) @@ -116,7 +113,6 @@ int media_packet_pool_get_size(media_packet_pool_h pool, int *min_size, int *max static int __packet_finalize_cb(media_packet_h packet, int error_code, void *user_data) { - int ret = MEDIA_PACKET_ERROR_NONE; media_packet_pool_h pool = NULL; media_packet_pool_s *pool_handle = NULL; @@ -127,14 +123,13 @@ static int __packet_finalize_cb(media_packet_h packet, int error_code, void *use if (media_packet_pool_release_packet(pool, packet) != MEDIA_PACKET_ERROR_NONE) LOGW("media packet couldn't be released. packet(%p) might be in queue", packet); return MEDIA_PACKET_REUSE; - } else { - return MEDIA_PACKET_FINALIZE; } + + return MEDIA_PACKET_FINALIZE; } int media_packet_pool_allocate(media_packet_pool_h pool) { - int ret = MEDIA_PACKET_ERROR_NONE; int i, num_pkts = 0; media_packet_pool_s *pool_handle = NULL; @@ -176,7 +171,7 @@ int media_packet_pool_allocate(media_packet_pool_h pool) g_atomic_int_set(&pool_handle->pool_allocated, 1); - return ret; + return MEDIA_PACKET_ERROR_NONE; } int media_packet_pool_acquire_packet(media_packet_pool_h pool, media_packet_h *pkt, long timeout) @@ -255,7 +250,6 @@ static bool __is_packet_in_queue(media_packet_pool_s *pool_handle, media_packet_ int media_packet_pool_release_packet(media_packet_pool_h pool, media_packet_h pkt) { - int ret = MEDIA_PACKET_ERROR_NONE; int num_pkts = 0; media_packet_pool_s *pool_handle = NULL; GList *find; @@ -296,7 +290,7 @@ int media_packet_pool_release_packet(media_packet_pool_h pool, media_packet_h pk g_mutex_unlock(&pool_handle->mutex); - return ret; + return MEDIA_PACKET_ERROR_NONE; } int media_packet_pool_deallocate(media_packet_pool_h pool) @@ -350,7 +344,6 @@ int media_packet_pool_deallocate(media_packet_pool_h pool) int media_packet_pool_destroy(media_packet_pool_h pool) { - int ret = MEDIA_PACKET_ERROR_NONE;; int num_pkts = 0; media_packet_pool_s *pool_handle = NULL; @@ -372,6 +365,6 @@ int media_packet_pool_destroy(media_packet_pool_h pool) free(pool_handle); pool_handle = NULL; - return ret; + return MEDIA_PACKET_ERROR_NONE; }