From: Jeongmo Yang Date: Wed, 5 Jun 2024 09:13:58 +0000 (+0900) Subject: Fix build error for gcc upgrade X-Git-Tag: accepted/tizen/unified/20240607.170516^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F53%2F312253%2F1;p=platform%2Fcore%2Fapi%2Fmediatool.git Fix build error for gcc upgrade [Version] 1.0.1 [Issue Type] Bug fix Change-Id: I7d12c05d3146120cdaa906f13fdd2f24694d42f2 Signed-off-by: Jeongmo Yang --- diff --git a/packaging/capi-media-tool.spec b/packaging/capi-media-tool.spec index e2c5d5b..1eae09c 100644 --- a/packaging/capi-media-tool.spec +++ b/packaging/capi-media-tool.spec @@ -1,7 +1,7 @@ Name: capi-media-tool Summary: A Core API media tool library in Tizen Native API -Version: 1.0.0 -Release: 1 +Version: 1.0.1 +Release: 0 Group: Multimedia/API License: Apache-2.0 Source0: %{name}-%{version}.tar.gz diff --git a/src/media_format_internal.c b/src/media_format_internal.c index 47437ec..62600b4 100644 --- a/src/media_format_internal.c +++ b/src/media_format_internal.c @@ -15,7 +15,7 @@ */ #include -#include +#include #include int media_format_get_refcount(media_format_h fmt, int *ref_count) diff --git a/src/media_packet.c b/src/media_packet.c index fecd018..3141531 100644 --- a/src/media_packet.c +++ b/src/media_packet.c @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include @@ -96,7 +96,7 @@ static void __pkt_deinit(media_packet_s *handle) return; } - media_format_unref(handle->format); + media_format_unref((media_format_h)handle->format); handle->format = NULL; g_mutex_clear(&handle->ref_lock); g_mutex_clear(&handle->dispose_cbs.lock); @@ -113,9 +113,9 @@ static int __pkt_create_alloc(media_format_h fmt, void *cb, void *cb_data, media int ret = MEDIA_PACKET_ERROR_NONE; if (is_from_new) - ret = media_packet_new(fmt, cb, cb_data, (media_packet_h)&handle); + ret = media_packet_new(fmt, cb, cb_data, (media_packet_h *)&handle); else - ret = media_packet_create(fmt, cb, cb_data, (media_packet_h)&handle); + ret = media_packet_create(fmt, cb, cb_data, (media_packet_h *)&handle); if (ret != MEDIA_PACKET_ERROR_NONE) { LOGE("failed[0x%x]", ret); @@ -327,9 +327,9 @@ int media_packet_create(media_format_h fmt, media_packet_finalize_cb fcb, void * MEDIA_PACKET_INSTANCE_CHECK(fmt); if (MEDIA_FORMAT_IS_VIDEO(fmt) && MEDIA_FORMAT_IS_RAW(fmt)) - return __pkt_init(MEDIA_BUFFER_TYPE_TBM_SURFACE, fmt, fcb, fcb_data, false, packet); + return __pkt_init(MEDIA_BUFFER_TYPE_TBM_SURFACE, fmt, fcb, fcb_data, false, (media_packet_s **)packet); else - return __pkt_init(MEDIA_BUFFER_TYPE_NORMAL, fmt, fcb, fcb_data, false, packet); + return __pkt_init(MEDIA_BUFFER_TYPE_NORMAL, fmt, fcb, fcb_data, false, (media_packet_s **)packet); } @@ -344,9 +344,9 @@ int media_packet_new(media_format_h fmt, media_packet_dispose_cb dcb, void *dcb_ MEDIA_PACKET_INSTANCE_CHECK(fmt); if (MEDIA_FORMAT_IS_VIDEO(fmt) && MEDIA_FORMAT_IS_RAW(fmt)) - return __pkt_init(MEDIA_BUFFER_TYPE_TBM_SURFACE, fmt, dcb, dcb_data, true, packet); + return __pkt_init(MEDIA_BUFFER_TYPE_TBM_SURFACE, fmt, dcb, dcb_data, true, (media_packet_s **)packet); else - return __pkt_init(MEDIA_BUFFER_TYPE_NORMAL, fmt, dcb, dcb_data, true, packet); + return __pkt_init(MEDIA_BUFFER_TYPE_NORMAL, fmt, dcb, dcb_data, true, (media_packet_s **)packet); } @@ -1209,7 +1209,7 @@ int media_packet_get_codec_data(media_packet_h packet, void **codec_data, unsign MEDIA_PACKET_INSTANCE_CHECK(handle); - switch (media_format_get_codec_data(handle->format, codec_data, codec_data_size)) { + switch (media_format_get_codec_data((media_format_h)handle->format, codec_data, codec_data_size)) { case MEDIA_FORMAT_ERROR_NONE: return MEDIA_PACKET_ERROR_NONE; case MEDIA_FORMAT_ERROR_INVALID_PARAMETER: diff --git a/src/media_packet_internal.c b/src/media_packet_internal.c index 8f0a8b2..f69ac26 100644 --- a/src/media_packet_internal.c +++ b/src/media_packet_internal.c @@ -19,8 +19,7 @@ #include #include -#include -#include +#include #include #include @@ -35,7 +34,7 @@ int media_packet_set_codec_data(media_packet_h packet, void *codec_data, unsigne LOGI("Set: codec data = %p, codec_data_size = %u\n", codec_data, codec_data_size); - switch (media_format_set_codec_data(handle->format, codec_data, codec_data_size)) { + switch (media_format_set_codec_data((media_format_h)handle->format, codec_data, codec_data_size)) { case MEDIA_FORMAT_ERROR_NONE: return MEDIA_PACKET_ERROR_NONE; case MEDIA_FORMAT_ERROR_INVALID_PARAMETER: diff --git a/test/media_packet_test.c b/test/media_packet_test.c index 62ad406..3b23eca 100644 --- a/test/media_packet_test.c +++ b/test/media_packet_test.c @@ -578,7 +578,7 @@ static void _media_packet_get_duration(void) static void _media_packet_get_buffer_data_ptr(void) { void *ptr; - media_packet_s *packet = g_media_packet[0]; + media_packet_s *packet = (media_packet_s *)g_media_packet[0]; if (media_packet_get_buffer_data_ptr(g_media_packet[0], &ptr) == MEDIA_PACKET_ERROR_NONE) { g_print("media_packet_get_buffer_data_ptr is sucess!!"); @@ -662,7 +662,7 @@ static void _media_packet_get_codec_data() unsigned char *get_codec_data; unsigned int get_codec_data_size; - if (media_packet_get_codec_data(g_media_packet[0], &get_codec_data, &get_codec_data_size) == MEDIA_PACKET_ERROR_NONE) { + if (media_packet_get_codec_data(g_media_packet[0], (void **)&get_codec_data, &get_codec_data_size) == MEDIA_PACKET_ERROR_NONE) { g_print("media_packet_get_codec_data is sucess ... !\n"); g_print("codec_data_size = %u\n", get_codec_data_size);