From: Park Kyoung Won Date: Sat, 7 Nov 2015 10:15:08 +0000 (+0900) Subject: build: add '-Werror' Cflag option X-Git-Tag: submit/tizen/20160104.083437~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f03e9d50ab9ca13366f475304c2e77c1e62f997a;p=platform%2Fadaptation%2Femulator%2Fgst-plugins-emulator.git build: add '-Werror' Cflag option remove interface-version-2 to fix build errors - There are 2 plugin interfaces which defines version 2 and 3. - Errors are occured from an interface version 2, but not necessary any more. Change-Id: I28e6c5c3d9db80dc9db6b698021a7b8b64339d14 Signed-off-by: Park Kyoung Won --- diff --git a/configure.ac b/configure.ac index 8c30c9b..e4b0e96 100644 --- a/configure.ac +++ b/configure.ac @@ -61,10 +61,11 @@ PKG_CHECK_MODULES(GST, [ dnl check if compiler understands -Wall (if yes, add -Wall to GST_CFLAGS) AC_MSG_CHECKING([to see if compiler understands -Wall]) +AC_MSG_CHECKING([to see if compiler understands -Werror]) save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -Wall" +CFLAGS="$CFLAGS -Wall -Werror" AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ ], [ ])], [ - GST_CFLAGS="$GST_CFLAGS -Wall" + GST_CFLAGS="$GST_CFLAGS -Wall -Werror" AC_MSG_RESULT([yes]) ], [ AC_MSG_RESULT([no]) diff --git a/src/Makefile.am b/src/Makefile.am index 5cd3c84..96005db 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,11 +20,11 @@ libgstemul_la_SOURCES = gstmaru.c \ gstmaruauddec.c \ gstmaruvidenc.c \ gstmaruaudenc.c \ - gstmaruinterface.c \ gstmaruinterface3.c \ gstmarudevice.c \ gstmarumem.c + # compiler and linker flags used to compile this plugin, set in configure.ac libgstemul_la_CFLAGS = $(GST_CFLAGS) -g libgstemul_la_LIBADD = $(GST_LIBS) -lgstaudio-1.0 -lgstpbutils-1.0 diff --git a/src/gstmaru.c b/src/gstmaru.c index b0f10c4..9ae2c45 100644 --- a/src/gstmaru.c +++ b/src/gstmaru.c @@ -73,10 +73,6 @@ gst_maru_codec_element_init () // get device version // if version 3 device_version = interface_version_3->get_device_version(fd); - if (device_version < 0) { - // if version 2 - device_version = interface_version_2->get_device_version(fd); - } if (device_version < 0) { perror ("[gst-maru] Incompatible device version"); GST_ERROR ("Incompatible device version"); @@ -85,9 +81,7 @@ gst_maru_codec_element_init () } // interface mapping - if (device_version < 3) { - interface = interface_version_2; - } else if (device_version >= 3 && device_version < 4) { + if (device_version >= 3 && device_version < 4) { interface = interface_version_3; } else { perror ("[gst-maru] Incompatible device version"); diff --git a/src/gstmaruauddec.c b/src/gstmaruauddec.c index dbf7b17..0aa0d00 100644 --- a/src/gstmaruauddec.c +++ b/src/gstmaruauddec.c @@ -487,7 +487,7 @@ GstFlowReturn gst_maruauddec_handle_frame(GstAudioDecoder *decoder, GstBuffer *i in_info = gst_ts_info_store (marudec, in_timestamp, in_duration, in_offset); GST_LOG_OBJECT (marudec, - "Received new data of size %u, offset: %" G_GUINT64_FORMAT ", ts:%" + "Received new data of size %zu, offset: %" G_GUINT64_FORMAT ", ts:%" GST_TIME_FORMAT ", dur: %" GST_TIME_FORMAT ", info %d", mapinfo.size, GST_BUFFER_OFFSET (inbuf), GST_TIME_ARGS (in_timestamp), GST_TIME_ARGS (in_duration), in_info->idx); diff --git a/src/gstmaruinterface.c b/src/gstmaruinterface.c deleted file mode 100644 index 880fc1a..0000000 --- a/src/gstmaruinterface.c +++ /dev/null @@ -1,462 +0,0 @@ -/* - * GStreamer codec plugin for Tizen Emulator. - * - * Copyright (C) 2013 Samsung Electronics Co., Ltd. All rights reserved. - * - * Contact: - * KiTae Kim - * SeokYeon Hwang - * YeongKyoon Lee - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * Contributors: - * - S-Core Co., Ltd - * - */ - -#include "gstmaru.h" -#include "gstmaruinterface.h" -#include "gstmaruutils.h" -#include "gstmarumem.h" -#include "gstmarudevice.h" - -extern int device_fd; -extern gpointer device_mem; - -typedef struct { - int32_t api_index; - uint32_t mem_offset; -} CodecHeader; - -typedef struct { - uint32_t buffer_index; - uint32_t buffer_size; -} CodecBufferId; - -typedef struct { - int32_t api_index; - int32_t ctx_index; - uint32_t mem_offset; -} CodecIOParams; - -enum CODEC_IO_CMD { - CODEC_CMD_GET_VERSION = 20, - CODEC_CMD_GET_ELEMENT, - CODEC_CMD_GET_CONTEXT_INDEX, - CODEC_CMD_GET_ELEMENT_DATA, - CODEC_CMD_PUT_DATA_INTO_BUFFER = 40, - CODEC_CMD_SECURE_BUFFER, - CODEC_CMD_TRY_SECURE_BUFFER, - CODEC_CMD_RELEASE_BUFFER, - CODEC_CMD_INVOKE_API_AND_RELEASE_BUFFER, -}; - - -#define CODEC_META_DATA_SIZE 256 -#define GET_OFFSET(buffer) ((uint32_t)buffer - (uint32_t)device_mem) -#define SMALLDATA 0 - - -static int -_codec_invoke_qemu(int32_t ctx_index, int32_t api_index, - uint32_t mem_offset, int fd, CodecBufferId *buffer_id) -{ - CodecIOParams ioparam = { 0, }; - int ret = -1; - - ioparam.api_index = api_index; - ioparam.ctx_index = ctx_index; - ioparam.mem_offset = mem_offset; - - if (ioctl(fd, CODEC_CMD_INVOKE_API_AND_RELEASE_BUFFER, &ioparam) < 0) { - return -1; - } - if (buffer_id) { - ret = ioctl(fd, CODEC_CMD_PUT_DATA_INTO_BUFFER, buffer_id); - } - - return ret; -} - -static int -secure_device_mem (int fd, guint ctx_id, guint buf_size, gpointer* buffer) -{ - int ret = 0; - CodecBufferId opaque; - - opaque.buffer_index = ctx_id; - opaque.buffer_size = buf_size; - - ret = ioctl (fd, CODEC_CMD_SECURE_BUFFER, &opaque); - /* ioctl: CODEC_CMD_SECURE_BUFFER - * - sets device memory offset into opaque.buffer_size - */ - *buffer = (gpointer)((uint32_t)device_mem + opaque.buffer_size); - GST_DEBUG ("device_mem %p, offset_size 0x%x", device_mem, opaque.buffer_size); - - return ret; -} - -static void -release_device_mem (int fd, gpointer start) -{ - int ret; - uint32_t offset = start - device_mem; - - GST_DEBUG ("release device_mem start: %p, offset: 0x%x", start, offset); - ret = ioctl (fd, CODEC_CMD_RELEASE_BUFFER, &offset); - if (ret < 0) { - GST_ERROR ("failed to release buffer"); - } -} - -static GstFlowReturn -codec_buffer_alloc_and_copy (GstPad *pad, guint64 offset, guint size, - GstCaps *caps, GstBuffer **buf) -{ - bool is_last_buffer = 0; - int mem_offset; - CodecBufferId opaque; - GstMaruDec *marudec; - CodecContext *ctx; - CodecDevice *dev; - GstMapInfo mapinfo; - - marudec = (GstMaruDec *)gst_pad_get_element_private(pad); - ctx = marudec->context; - dev = marudec->dev; - - ctx = marudec->context; - - opaque.buffer_index = ctx->index; - opaque.buffer_size = size; - - GST_DEBUG ("buffer_and_copy. ctx_id: %d", ctx->index); - - int ret = _codec_invoke_qemu(ctx->index, CODEC_PICTURE_COPY, 0, dev->fd, &opaque); - if (ret < 0) { - GST_DEBUG ("failed to get available buffer"); - return GST_FLOW_ERROR; - } - is_last_buffer = ret; - mem_offset = opaque.buffer_size; - - gpointer *buffer = NULL; - if (is_last_buffer) { - // FIXME: we must aligned buffer offset. - buffer = g_malloc (size); - - memcpy (buffer, device_mem + mem_offset, size); - release_device_mem(dev->fd, device_mem + mem_offset); - - GST_DEBUG ("secured last buffer!! Use heap buffer"); - } else { - // address of "device_mem" and "opaque" is aleady aligned. - buffer = (gpointer)(device_mem + mem_offset); - - GST_DEBUG ("device memory start: 0x%p, offset 0x%x", (void *)buffer, mem_offset); - } - - *buf = gst_buffer_new_and_alloc (size); - gst_buffer_map (*buf, &mapinfo, GST_MAP_READWRITE); - mapinfo.data = (guint8 *)buffer; - mapinfo.size = size; - GST_BUFFER_OFFSET (*buf) = offset; - gst_buffer_unmap (*buf, &mapinfo); - - return GST_FLOW_OK; -} - -static int -codec_init (CodecContext *ctx, CodecElement *codec, CodecDevice *dev) -{ - int opened = 0; - gpointer buffer = NULL; - CodecBufferId opaque; - int ret; - - if (ioctl(dev->fd, CODEC_CMD_GET_CONTEXT_INDEX, &ctx->index) < 0) { - GST_ERROR ("failed to get a context index"); - return -1; - } - GST_DEBUG ("get context index: %d", ctx->index); - - /* buffer size is 0. It means that this function is required to - * use small size. - */ - if (secure_device_mem(dev->fd, ctx->index, 0, &buffer) < 0) { - GST_ERROR ("failed to get a memory block"); - return -1; - } - - codec_init_data_to (ctx, codec, buffer); - - opaque.buffer_index = ctx->index; - opaque.buffer_size = SMALLDATA; - - ret = _codec_invoke_qemu (ctx->index, CODEC_INIT, GET_OFFSET(buffer), dev->fd, &opaque); - - if (ret < 0) { - return -1; - } - - opened = - codec_init_data_from (ctx, codec->media_type, device_mem + opaque.buffer_size); - - if (opened < 0) { - GST_ERROR ("failed to open Context for %s", codec->name); - } else { - ctx->codec = codec; - } - - release_device_mem(dev->fd, device_mem + opaque.buffer_size); - - return opened; -} - -static void -codec_deinit (CodecContext *ctx, CodecDevice *dev) -{ - GST_INFO ("close context %d", ctx->index); - _codec_invoke_qemu (ctx->index, CODEC_DEINIT, 0, dev->fd, NULL); -} - -static void -codec_flush_buffers (CodecContext *ctx, CodecDevice *dev) -{ - GST_DEBUG ("flush buffers of context: %d", ctx->index); - _codec_invoke_qemu (ctx->index, CODEC_FLUSH_BUFFERS, 0, dev->fd, NULL); -} - -static int -codec_decode_video (GstMaruDec *marudec, uint8_t *in_buf, int in_size, - gint idx, gint64 in_offset, GstBuffer **out_buf, int *have_data) -{ - CodecContext *ctx = marudec->context; - CodecDevice *dev = marudec->dev; - int len = 0, ret = 0; - gpointer buffer = NULL; - CodecBufferId opaque = { 0, }; - - ret = secure_device_mem(dev->fd, ctx->index, in_size, &buffer); - if (ret < 0) { - GST_ERROR ("failed to get available memory to write inbuf"); - return -1; - } - - codec_decode_video_data_to (in_size, idx, in_offset, in_buf, buffer); - - opaque.buffer_index = ctx->index; - - opaque.buffer_size = SMALLDATA; - ret = _codec_invoke_qemu(ctx->index, CODEC_DECODE_VIDEO, GET_OFFSET(buffer), dev->fd, &opaque); - - if (ret < 0) { - // FIXME: - return -1; - } - len = codec_decode_video_data_from (have_data, &ctx->video, device_mem + opaque.buffer_size); - - GST_DEBUG_OBJECT (marudec, "after decode: len %d, have_data %d", - len, *have_data); - - release_device_mem(dev->fd, device_mem + opaque.buffer_size); - - if (len < 0 || *have_data <= 0) { - GST_DEBUG_OBJECT (marudec, "return flow %d, out %p, len %d", - ret, *out_buf, len); - } - - return len; -} - -static int -codec_decode_audio (CodecContext *ctx, int16_t *samples, - int *have_data, uint8_t *in_buf, - int in_size, CodecDevice *dev) -{ - int len = 0, ret = 0; - gpointer buffer = NULL; - CodecBufferId opaque; - - ret = secure_device_mem(dev->fd, ctx->index, in_size, &buffer); - if (ret < 0) { - GST_ERROR ("failed to get available memory to write inbuf"); - return -1; - } - - GST_DEBUG ("decode_audio 1. in_buffer size %d", in_size); - codec_decode_audio_data_to (in_size, in_buf, buffer); - - opaque.buffer_index = ctx->index; - opaque.buffer_size = SMALLDATA; - - ret = _codec_invoke_qemu(ctx->index, CODEC_DECODE_AUDIO, GET_OFFSET(buffer), dev->fd, &opaque); - - if (ret < 0) { - return -1; - } - - GST_DEBUG ("decode_audio 2. ctx_id: %d, buffer = 0x%x", - ctx->index, (unsigned int) (device_mem + opaque.buffer_size)); - - len = codec_decode_audio_data_from (have_data, samples, - &ctx->audio, device_mem + opaque.buffer_size); - - GST_DEBUG ("decode_audio 3. ctx_id: %d len: %d", ctx->index, len); - - release_device_mem(dev->fd, device_mem + opaque.buffer_size); - - return len; -} - -static int -codec_encode_video (CodecContext *ctx, uint8_t *out_buf, - int out_size, uint8_t *in_buf, - int in_size, int64_t in_timestamp, - int *coded_frame, int *is_keyframe, - CodecDevice *dev) -{ - int len = 0, ret = 0; - gpointer buffer = NULL; - CodecBufferId opaque; - - ret = secure_device_mem(dev->fd, ctx->index, in_size, &buffer); - if (ret < 0) { - GST_ERROR ("failed to small size of buffer"); - return -1; - } - - codec_encode_video_data_to (in_size, in_timestamp, in_buf, buffer); - - opaque.buffer_index = ctx->index; - opaque.buffer_size = SMALLDATA; - - // FIXME: how can we know output data size ? - ret = _codec_invoke_qemu(ctx->index, CODEC_ENCODE_VIDEO, GET_OFFSET(buffer), dev->fd, &opaque); - - if (ret < 0) { - return -1; - } - - GST_DEBUG ("encode_video. mem_offset = 0x%x", opaque.buffer_size); - - len = codec_encode_video_data_from (out_buf, coded_frame, is_keyframe, device_mem + opaque.buffer_size); - - release_device_mem(dev->fd, device_mem + opaque.buffer_size); - - return len; -} - -int -static codec_encode_audio (CodecContext *ctx, uint8_t *out_buf, - int max_size, uint8_t *in_buf, - int in_size, int64_t timestamp, - CodecDevice *dev) -{ - int ret = 0; - gpointer buffer = NULL; - CodecBufferId opaque; - - ret = secure_device_mem(dev->fd, ctx->index, in_size, &buffer); - if (ret < 0) { - return -1; - } - - codec_encode_audio_data_to (in_size, max_size, in_buf, timestamp, buffer); - - opaque.buffer_index = ctx->index; - opaque.buffer_size = SMALLDATA; - - ret = _codec_invoke_qemu(ctx->index, CODEC_ENCODE_AUDIO, GET_OFFSET(buffer), dev->fd, &opaque); - - if (ret < 0) { - return -1; - } - - GST_DEBUG ("encode_audio. mem_offset = 0x%x", opaque.buffer_size); - - ret = codec_encode_audio_data_from (out_buf, device_mem + opaque.buffer_size); - - release_device_mem(dev->fd, device_mem + opaque.buffer_size); - - return ret; -} - -static int -get_device_version (int fd) -{ - uint32_t device_version; - int ret; - - ret = ioctl (fd, CODEC_CMD_GET_VERSION, &device_version); - if (ret < 0) { - return ret; - } - - return device_version; -} - -static GList * -prepare_elements (int fd) -{ - uint32_t size = 0; - int ret, elem_cnt, i; - GList *elements = NULL; - CodecElement *elem; - - ret = ioctl (fd, CODEC_CMD_GET_ELEMENT, &size); - if (ret < 0) { - return NULL; - } - - elem = g_malloc(size); - - ret = ioctl (fd, CODEC_CMD_GET_ELEMENT_DATA, elem); - if (ret < 0) { - g_free (elem); - return NULL; - } - - elem_cnt = size / sizeof(CodecElement); - for (i = 0; i < elem_cnt; i++) { - elements = g_list_append (elements, &elem[i]); - } - - return elements; -} - -static int -get_profile_status (int fd) -{ - GST_DEBUG ("In this version, profile feature is not supported."); - return 0; -} - -Interface *interface_version_2 = &(Interface) { - .init = codec_init, - .deinit = codec_deinit, - .decode_video = codec_decode_video, - .decode_audio = codec_decode_audio, - .encode_video = codec_encode_video, - .encode_audio = codec_encode_audio, - .flush_buffers = codec_flush_buffers, - .buffer_alloc_and_copy = codec_buffer_alloc_and_copy, - .get_device_version = get_device_version, - .prepare_elements = prepare_elements, - .get_profile_status = get_profile_status, -}; diff --git a/src/gstmaruinterface.h b/src/gstmaruinterface.h index 8fcdcce..eeeb812 100644 --- a/src/gstmaruinterface.h +++ b/src/gstmaruinterface.h @@ -166,7 +166,6 @@ typedef struct _GstMaruAudDec } GstMaruAudDec; - typedef struct { int (*init) (CodecContext *ctx, CodecElement *codec, CodecDevice *dev); @@ -205,7 +204,6 @@ typedef struct { extern Interface *interface; -extern Interface *interface_version_2; extern Interface *interface_version_3; #endif /* __GST_MARU_INTERFACE_H__ */ diff --git a/src/gstmaruinterface3.c b/src/gstmaruinterface3.c index 0eb6167..68e4fbb 100644 --- a/src/gstmaruinterface3.c +++ b/src/gstmaruinterface3.c @@ -28,6 +28,7 @@ * */ +#include #include "gstmaru.h" #include "gstmaruinterface.h" #include "gstmaruutils.h" @@ -51,7 +52,7 @@ enum IOCTL_CMD { typedef struct { uint32_t api_index; uint32_t ctx_index; - uint32_t mem_offset; + uintptr_t mem_offset; int32_t buffer_size; } __attribute__((packed)) IOCTL_Data; @@ -59,7 +60,7 @@ typedef struct { #define IOCTL_RW(CMD) (_IOWR(BRILLCODEC_KEY, CMD, IOCTL_Data)) #define CODEC_META_DATA_SIZE 256 -#define GET_OFFSET(buffer) ((uint32_t)buffer - (uint32_t)device_mem) +#define GET_OFFSET(buffer) ((uintptr_t)buffer - (uintptr_t)device_mem) #define SMALLDATA 0 #define OFFSET_PICTURE_BUFFER 0x100 @@ -73,7 +74,7 @@ static inline bool can_use_new_decode_api(void) { static int invoke_device_api(int fd, int32_t ctx_index, int32_t api_index, - uint32_t *mem_offset, int32_t buffer_size) + uintptr_t *mem_offset, int32_t buffer_size) { GST_DEBUG (" >> Enter"); IOCTL_Data ioctl_data = { 0, }; @@ -108,8 +109,8 @@ secure_device_mem (int fd, guint ctx_id, guint buf_size, gpointer* buffer) ret = ioctl (fd, IOCTL_RW(IOCTL_CMD_SECURE_BUFFER), &data); - *buffer = (gpointer)((uint32_t)device_mem + data.mem_offset); - GST_DEBUG ("device_mem %p, offset_size 0x%x", device_mem, data.mem_offset); + *buffer = (gpointer)(device_mem + data.mem_offset); + GST_DEBUG ("device_mem %p, offset_size 0x%"PRIXPTR, device_mem, data.mem_offset); GST_DEBUG (" >> Leave"); return ret; @@ -172,7 +173,7 @@ init (CodecContext *ctx, CodecElement *codec, CodecDevice *dev) int opened = 0; gpointer buffer = NULL; int ret; - uint32_t mem_offset; + uintptr_t mem_offset; GST_DEBUG (" >> Enter"); if ((ctx->index = get_context_index(dev->fd)) <= 0) { @@ -248,7 +249,7 @@ decode_video (GstMaruVidDec *marudec, uint8_t *inbuf, int inbuf_size, CodecDevice *dev = marudec->dev; int len = 0, ret = 0; gpointer buffer = NULL; - uint32_t mem_offset; + uintptr_t mem_offset; size_t size = sizeof(inbuf_size) + sizeof(idx) + sizeof(in_offset) + inbuf_size; ret = secure_device_mem(dev->fd, ctx->index, size, &buffer); @@ -311,7 +312,7 @@ alloc_and_copy (GstMaruVidDec *marudec, guint64 offset, guint size, { GST_DEBUG (" >> enter"); bool is_last_buffer = 0; - uint32_t mem_offset; + uintptr_t mem_offset; CodecContext *ctx; CodecDevice *dev; GstMapInfo mapinfo; @@ -361,7 +362,7 @@ alloc_and_copy (GstMaruVidDec *marudec, guint64 offset, guint size, } - GST_DEBUG ("device memory start: 0x%p, offset 0x%x", (void *) buffer, mem_offset); + GST_DEBUG ("device memory start: 0x%p, offset 0x%"PRIXPTR, (void *) buffer, mem_offset); } gst_buffer_unmap (*buf, &mapinfo); @@ -376,7 +377,7 @@ buffer_alloc_and_copy (GstPad *pad, guint64 offset, guint size, { GST_DEBUG (" >> enter"); bool is_last_buffer = 0; - uint32_t mem_offset; + uintptr_t mem_offset; GstMaruDec *marudec; CodecContext *ctx; CodecDevice *dev; @@ -429,7 +430,7 @@ buffer_alloc_and_copy (GstPad *pad, guint64 offset, guint size, } - GST_DEBUG ("device memory start: 0x%p, offset 0x%x", (void *) buffer, mem_offset); + GST_DEBUG ("device memory start: 0x%p, offset 0x%"PRIXPTR, (void *) buffer, mem_offset); } *buf = gst_buffer_new (); @@ -466,7 +467,7 @@ encode_video (CodecContext *ctx, uint8_t *outbuf, { int len = 0, ret = 0; gpointer buffer = NULL; - uint32_t mem_offset; + uintptr_t mem_offset; size_t size = sizeof(inbuf_size) + sizeof(in_timestamp) + inbuf_size; ret = secure_device_mem(dev->fd, ctx->index, size, &buffer); @@ -491,7 +492,7 @@ encode_video (CodecContext *ctx, uint8_t *outbuf, return -1; } - GST_DEBUG ("encode_video. mem_offset = 0x%x", mem_offset); + GST_DEBUG ("encode_video. mem_offset = 0x%"PRIXPTR, mem_offset); struct video_encode_output *encode_output = device_mem + mem_offset; len = encode_output->len; @@ -537,7 +538,7 @@ decode_audio (CodecContext *ctx, int16_t *samples, { int len = 0, ret = 0; gpointer buffer = NULL; - uint32_t mem_offset; + uintptr_t mem_offset; size_t size = sizeof(inbuf_size) + inbuf_size; ret = secure_device_mem(dev->fd, ctx->index, size, &buffer); @@ -561,8 +562,8 @@ decode_audio (CodecContext *ctx, int16_t *samples, return -1; } - GST_DEBUG ("decode_audio. ctx_id: %d, buffer = 0x%x", - ctx->index, (unsigned int) (device_mem + mem_offset)); + GST_DEBUG ("decode_audio. ctx_id: %d, buffer = 0x%p", + ctx->index, device_mem + mem_offset); struct audio_decode_output *decode_output = device_mem + mem_offset; len = decode_output->len; @@ -571,7 +572,7 @@ decode_audio (CodecContext *ctx, int16_t *samples, memcpy (samples, device_mem + mem_offset + OFFSET_PICTURE_BUFFER, len); - GST_DEBUG ("decode_audio. sample_fmt %d sample_rate %d, channels %d, ch_layout %lld, len %d", + GST_DEBUG ("decode_audio. sample_fmt %d sample_rate %d, channels %d, ch_layout %" PRIu64 ", len %d", ctx->audio.sample_fmt, ctx->audio.sample_rate, ctx->audio.channels, ctx->audio.channel_layout, len); @@ -588,7 +589,7 @@ encode_audio (CodecContext *ctx, uint8_t *outbuf, { int len = 0, ret = 0; gpointer buffer = NULL; - uint32_t mem_offset; + uintptr_t mem_offset; size_t size = sizeof(inbuf_size) + inbuf_size; ret = secure_device_mem(dev->fd, ctx->index, inbuf_size, &buffer); @@ -610,7 +611,7 @@ encode_audio (CodecContext *ctx, uint8_t *outbuf, return -1; } - GST_DEBUG ("encode_audio. mem_offset = 0x%x", mem_offset); + GST_DEBUG ("encode_audio. mem_offset = 0x%"PRIXPTR, mem_offset); struct audio_encode_output *encode_output = device_mem + mem_offset; len = encode_output->len; diff --git a/src/gstmarumem.c b/src/gstmarumem.c index f6b1cfe..85ec672 100644 --- a/src/gstmarumem.c +++ b/src/gstmarumem.c @@ -28,6 +28,7 @@ * */ +#include #include "gstmarumem.h" /* @@ -190,7 +191,7 @@ codec_decode_audio_data_from (int *have_data, int16_t *samples, memcpy (&audio->channel_layout, buffer + size, sizeof(audio->channel_layout)); size += sizeof(audio->channel_layout); - GST_DEBUG ("decode_audio. sample_fmt %d sample_rate %d, channels %d, ch_layout %lld", + GST_DEBUG ("decode_audio. sample_fmt %d sample_rate %d, channels %d, ch_layout %" PRIu64, audio->sample_fmt, audio->sample_rate, audio->channels, audio->channel_layout); memcpy (&resample_size, buffer + size, sizeof(resample_size)); diff --git a/src/gstmaruviddec.c b/src/gstmaruviddec.c index 8f4b951..f8579c0 100644 --- a/src/gstmaruviddec.c +++ b/src/gstmaruviddec.c @@ -923,7 +923,7 @@ gst_maruviddec_handle_frame (GstVideoDecoder * decoder, GstVideoCodecFrame * fra in_info = gst_ts_info_store (marudec, in_timestamp, in_duration, in_offset); GST_LOG_OBJECT (marudec, - "Received new data of size %u, offset: %" G_GUINT64_FORMAT ", ts:%" + "Received new data of size %zu, offset: %" G_GUINT64_FORMAT ", ts:%" GST_TIME_FORMAT ", dur: %" GST_TIME_FORMAT ", info %d", mapinfo.size, GST_BUFFER_OFFSET (frame->input_buffer), GST_TIME_ARGS (in_timestamp), GST_TIME_ARGS (in_duration), in_info->idx);