From: Praveen R Jadhav Date: Mon, 28 Aug 2017 04:08:51 +0000 (+0530) Subject: Pointers changed to guint8 type in order to calculate offset properly X-Git-Tag: submit/tizen/20170914.095319~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F09%2F146309%2F1;p=platform%2Fcore%2Fapi%2Fmediacodec.git Pointers changed to guint8 type in order to calculate offset properly Change-Id: I4344a8b3623c44a22282439d61c733ecf23ef307 --- diff --git a/src/media_codec_port_gst.c b/src/media_codec_port_gst.c index daa574f..c639c02 100644 --- a/src/media_codec_port_gst.c +++ b/src/media_codec_port_gst.c @@ -295,7 +295,7 @@ int __mc_fill_input_buffer_with_venc_packet(mc_gst_core_t *core, media_packet_h gint width; gint height; uint32_t plane_num; - void *planes[2]; + guint8 *planes[2]; mc_encoder_info_t *enc_info = (mc_encoder_info_t *)core->codec_info; @@ -308,7 +308,7 @@ int __mc_fill_input_buffer_with_venc_packet(mc_gst_core_t *core, media_packet_h return MC_ERROR; } - ret = media_packet_get_video_plane_data_ptr(packet, 0, &planes[0]); + ret = media_packet_get_video_plane_data_ptr(packet, 0, (void **)&planes[0]); if (ret != MEDIA_PACKET_ERROR_NONE) { LOGW("media_packet_get_video_plane_data_ptr failed"); return MC_ERROR; @@ -331,7 +331,7 @@ int __mc_fill_input_buffer_with_venc_packet(mc_gst_core_t *core, media_packet_h mcbuffer->buf_size += stride_width * stride_height; for (i = 1; i < plane_num; i++) { - media_packet_get_video_plane_data_ptr(packet, i, &planes[1]); + media_packet_get_video_plane_data_ptr(packet, i, (void **)&planes[1]); media_packet_get_video_stride_width(packet, i, &stride_width); media_packet_get_video_stride_height(packet, i, &stride_height); @@ -352,7 +352,7 @@ int __mc_fill_input_buffer_with_venc_packet(mc_gst_core_t *core, media_packet_h stride = 0; for (i = 1; i < plane_num; i++) { - media_packet_get_video_plane_data_ptr(packet, i, &planes[1]); + media_packet_get_video_plane_data_ptr(packet, i, (void **)&planes[1]); media_packet_get_video_stride_width(packet, i, &stride_width); media_packet_get_video_stride_height(packet, i, &stride_height); @@ -699,7 +699,7 @@ int __mc_set_caps_streamheader(mc_gst_core_t *core, GstMCBuffer *mcbuffer, guint guint hsize1, hsize2, hsize3; GstBuffer *tmp_header; GstMapInfo map; - void *buf_data = NULL; + guint8 *buf_data = NULL; guint8 *tmp_buf = NULL; ret = media_packet_get_buffer_size(mcbuffer->packet, &buf_size); @@ -708,7 +708,7 @@ int __mc_set_caps_streamheader(mc_gst_core_t *core, GstMCBuffer *mcbuffer, guint return ret; } - ret = media_packet_get_buffer_data_ptr(mcbuffer->packet, &buf_data); + ret = media_packet_get_buffer_data_ptr(mcbuffer->packet, (void **)&buf_data); if (ret != MEDIA_PACKET_ERROR_NONE) { LOGW("buffer data get failed"); return ret; diff --git a/test/media_codec_test.c b/test/media_codec_test.c index 005d4f3..64491d5 100644 --- a/test/media_codec_test.c +++ b/test/media_codec_test.c @@ -859,7 +859,7 @@ void _mediacodec_process_input(App *app) gboolean have_frame = FALSE; gint ret; static guint64 pts = 0L; - void *buf_data_ptr = NULL; + guint8 *buf_data_ptr = NULL; media_packet_h pkt = NULL; guint8 *tmp; gint read; @@ -892,13 +892,13 @@ void _mediacodec_process_input(App *app) } if (app->type != VIDEO_ENC) { - media_packet_get_buffer_data_ptr(pkt, &buf_data_ptr); + media_packet_get_buffer_data_ptr(pkt, (void **)&buf_data_ptr); media_packet_set_buffer_size(pkt, (uint64_t)read); memcpy(buf_data_ptr, tmp, read); g_print("tmp:%p, read:%d\n", tmp, read); } else { /* Y */ - media_packet_get_video_plane_data_ptr(pkt, 0, &buf_data_ptr); + media_packet_get_video_plane_data_ptr(pkt, 0, (void **)&buf_data_ptr); media_packet_get_video_stride_width(pkt, 0, &stride_width); offset = app->width*app->height; @@ -909,7 +909,7 @@ void _mediacodec_process_input(App *app) } if (app->hardware == TRUE) { - media_packet_get_video_plane_data_ptr(pkt, 1, &buf_data_ptr); + media_packet_get_video_plane_data_ptr(pkt, 1, (void **)&buf_data_ptr); media_packet_get_video_stride_width(pkt, 1, &stride_width); size = app->width * app->height / 2; @@ -920,7 +920,7 @@ void _mediacodec_process_input(App *app) } } else { /* U */ - media_packet_get_video_plane_data_ptr(pkt, 1, &buf_data_ptr); + media_packet_get_video_plane_data_ptr(pkt, 1, (void **)&buf_data_ptr); media_packet_get_video_stride_width(pkt, 1, &stride_width); size = (app->width>>1) * (app->height>>1); @@ -931,7 +931,7 @@ void _mediacodec_process_input(App *app) } /* V */ - media_packet_get_video_plane_data_ptr(pkt, 2, &buf_data_ptr); + media_packet_get_video_plane_data_ptr(pkt, 2, (void **)&buf_data_ptr); media_packet_get_video_stride_width(pkt, 2, &stride_width); offset += size; @@ -961,7 +961,7 @@ gboolean read_data(App *app) gboolean codec_config = FALSE; gint ret; static guint64 pts = 0L; - void *buf_data_ptr = NULL; + guint8 *buf_data_ptr = NULL; media_packet_h pkt = NULL; guint8 *tmp; gint i; @@ -1012,14 +1012,14 @@ gboolean read_data(App *app) if (app->type != VIDEO_ENC) { - media_packet_get_buffer_data_ptr(pkt, &buf_data_ptr); + media_packet_get_buffer_data_ptr(pkt, (void **)&buf_data_ptr); media_packet_set_buffer_size(pkt, (uint64_t)read); memcpy(buf_data_ptr, tmp, read); g_print("tmp:%p, read:%d\n", tmp, read); } else { /* Y */ - media_packet_get_video_plane_data_ptr(pkt, 0, &buf_data_ptr); + media_packet_get_video_plane_data_ptr(pkt, 0, (void **)&buf_data_ptr); media_packet_get_video_stride_width(pkt, 0, &stride_width); offset = app->width*app->height; @@ -1030,7 +1030,7 @@ gboolean read_data(App *app) } if (app->hardware == TRUE) { - media_packet_get_video_plane_data_ptr(pkt, 1, &buf_data_ptr); + media_packet_get_video_plane_data_ptr(pkt, 1, (void **)&buf_data_ptr); media_packet_get_video_stride_width(pkt, 1, &stride_width); size = app->width * app->height>>1; @@ -1042,7 +1042,7 @@ gboolean read_data(App *app) } else { /* U */ - media_packet_get_video_plane_data_ptr(pkt, 1, &buf_data_ptr); + media_packet_get_video_plane_data_ptr(pkt, 1, (void **)&buf_data_ptr); media_packet_get_video_stride_width(pkt, 1, &stride_width); size = (app->width>>1) * (app->height>>1); @@ -1053,7 +1053,7 @@ gboolean read_data(App *app) } /* V */ - media_packet_get_video_plane_data_ptr(pkt, 2, &buf_data_ptr); + media_packet_get_video_plane_data_ptr(pkt, 2, (void **)&buf_data_ptr); media_packet_get_video_stride_width(pkt, 2, &stride_width); offset += size; @@ -2386,7 +2386,7 @@ void mc_hex_dump(char *desc, void *addr, gint len) void decoder_output_dump(App *app, media_packet_h pkt) { - void *temp; + guint8 *temp; int i = 0; int stride_width, stride_height; gchar filename[100] = {0}; @@ -2396,7 +2396,7 @@ void decoder_output_dump(App *app, media_packet_h pkt) g_snprintf(filename, MAX_STRING_LEN, "/tmp/dec_output_dump_%d_%d.yuv", app->width, app->height); fp = fopen(filename, "ab"); - media_packet_get_video_plane_data_ptr(pkt, 0, &temp); + media_packet_get_video_plane_data_ptr(pkt, 0, (void **)&temp); media_packet_get_video_stride_width(pkt, 0, &stride_width); media_packet_get_video_stride_height(pkt, 0, &stride_height); g_print("stride : %d, %d\n", stride_width, stride_height); @@ -2407,21 +2407,21 @@ void decoder_output_dump(App *app, media_packet_h pkt) } if (app->hardware == TRUE) { - media_packet_get_video_plane_data_ptr(pkt, 1, &temp); + media_packet_get_video_plane_data_ptr(pkt, 1, (void **)&temp); media_packet_get_video_stride_width(pkt, 1, &stride_width); for (i = 0; i < app->height/2; i++) { ret = fwrite(temp, app->width, 1, fp); temp += stride_width; } } else { - media_packet_get_video_plane_data_ptr(pkt, 1, &temp); + media_packet_get_video_plane_data_ptr(pkt, 1, (void **)&temp); media_packet_get_video_stride_width(pkt, 1, &stride_width); for (i = 0; i < app->height/2; i++) { ret = fwrite(temp, app->width/2, 1, fp); temp += stride_width; } - media_packet_get_video_plane_data_ptr(pkt, 2, &temp); + media_packet_get_video_plane_data_ptr(pkt, 2, (void **)&temp); media_packet_get_video_stride_width(pkt, 2, &stride_width); for (i = 0; i < app->height/2; i++) { ret = fwrite(temp, app->width/2, 1, fp);