package/mpp
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2025-10-06 17:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[misc]: remove warning on Linux

Browse Source 
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@355 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
ChenHengming
2015-10-12 16:48:55 +00:00
parent a3738346ff
commit 5e4e1a55b1
7 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mpp/codec/dec/dummy/dummy_dec_api.c
View File

@@ -130,7 +130,7 @@ MPP_RET dummy_dec_control(void *dec, RK_S32 cmd_type, void *param)
MPP_RET dummy_dec_prepare(void *dec, MppPacket pkt, HalDecTask *task) MPP_RET dummy_dec_prepare(void *dec, MppPacket pkt, HalDecTask *task)
{ {
DummyDec *p; DummyDec *p;
RK_U32 output; RK_S32 output;
MppFrame frame; MppFrame frame;
RK_U32 frame_count; RK_U32 frame_count;
MppBufSlots slots; MppBufSlots slots;

2
mpp/codec/dec/h265/h265d_parser.h
View File

@@ -563,7 +563,7 @@ typedef struct HEVCFrame {
* A combination of HEVC_FRAME_FLAG_* * A combination of HEVC_FRAME_FLAG_*
*/ */
RK_U8 flags; RK_U8 flags;
RK_U32 slot_index; RK_S32 slot_index;
} HEVCFrame; } HEVCFrame;
typedef struct HEVCNAL { typedef struct HEVCNAL {

5
mpp/codec/dec/h265/test/h265d_parser_test.c
View File

@@ -368,7 +368,7 @@ RK_S32 hevc_parser_test(ParserDemoCmdContext_t *cmd)
memset(&curtask->refer, -1, sizeof(curtask->refer)); memset(&curtask->refer, -1, sizeof(curtask->refer));
curtask->input = -1; curtask->input = -1;
while (!feof(pInFile)) { while (!feof(pInFile)) {
RK_U32 index; RK_S32 index;
RK_U8 *tmpbuf = buf; RK_U8 *tmpbuf = buf;
RK_U8 *pos = NULL; RK_U8 *pos = NULL;
@@ -455,7 +455,6 @@ RK_S32 hevc_parser_test(ParserDemoCmdContext_t *cmd)
} }
do { do {
RK_U32 index;
ret = mpp_buf_slot_dequeue(slots, &index, QUEUE_DISPLAY); ret = mpp_buf_slot_dequeue(slots, &index, QUEUE_DISPLAY);
if (ret == MPP_OK) { if (ret == MPP_OK) {
mpp_buf_slot_get_prop(slots, index, SLOT_FRAME, &frame); mpp_buf_slot_get_prop(slots, index, SLOT_FRAME, &frame);
@@ -501,7 +500,7 @@ RK_S32 hevc_parser_test(ParserDemoCmdContext_t *cmd)
h265d_flush((void*)mpp_codex_ctx); h265d_flush((void*)mpp_codex_ctx);
do { do {
RK_U32 index; RK_S32 index;
ret = mpp_buf_slot_dequeue(slots, &index, QUEUE_DISPLAY); ret = mpp_buf_slot_dequeue(slots, &index, QUEUE_DISPLAY);
if (ret == MPP_OK) { if (ret == MPP_OK) {
mpp_log("get_display for index = %d", index); mpp_log("get_display for index = %d", index);

2
mpp/codec/inc/mpp_buf_slot.h
View File

@@ -122,7 +122,7 @@ extern "C" {
*/ */
MPP_RET mpp_buf_slot_init(MppBufSlots *slots); MPP_RET mpp_buf_slot_init(MppBufSlots *slots);
MPP_RET mpp_buf_slot_deinit(MppBufSlots slots); MPP_RET mpp_buf_slot_deinit(MppBufSlots slots);
MPP_RET mpp_buf_slot_setup(MppBufSlots slots, RK_U32 count, RK_U32 size, RK_U32 changed); MPP_RET mpp_buf_slot_setup(MppBufSlots slots, RK_S32 count, RK_U32 size, RK_U32 changed);
RK_U32 mpp_buf_slot_is_changed(MppBufSlots slots); RK_U32 mpp_buf_slot_is_changed(MppBufSlots slots);
MPP_RET mpp_buf_slot_ready(MppBufSlots slots); MPP_RET mpp_buf_slot_ready(MppBufSlots slots);
RK_U32 mpp_buf_slot_get_size(MppBufSlots slots); RK_U32 mpp_buf_slot_get_size(MppBufSlots slots);

6
mpp/codec/mpp_buf_slot.cpp
View File

@@ -187,7 +187,7 @@ struct MppBufSlotsImpl_t {
// if slot changed, all will be hold until all slot is unused // if slot changed, all will be hold until all slot is unused
RK_U32 info_changed; RK_U32 info_changed;
RK_U32 new_count; RK_S32 new_count;
RK_U32 new_size; RK_U32 new_size;
// list for display // list for display
@@ -437,7 +437,7 @@ MPP_RET mpp_buf_slot_deinit(MppBufSlots slots)
return MPP_OK; return MPP_OK;
} }
MPP_RET mpp_buf_slot_setup(MppBufSlots slots, RK_U32 count, RK_U32 size, RK_U32 changed) MPP_RET mpp_buf_slot_setup(MppBufSlots slots, RK_S32 count, RK_U32 size, RK_U32 changed)
{ {
if (NULL == slots) { if (NULL == slots) {
mpp_err_f("found NULL input\n"); mpp_err_f("found NULL input\n");
@@ -624,7 +624,7 @@ MPP_RET mpp_buf_slot_dequeue(MppBufSlots slots, RK_S32 *index, SlotQueueType typ
// make sure that this slot is just the next display slot // make sure that this slot is just the next display slot
list_del_init(&slot->list); list_del_init(&slot->list);
slot_assert(impl, (RK_U32)slot->index < impl->count); slot_assert(impl, slot->index < impl->count);
slot_ops_with_log(impl, slot, SLOT_DEQUEUE); slot_ops_with_log(impl, slot, SLOT_DEQUEUE);
impl->display_count++; impl->display_count++;
*index = slot->index; *index = slot->index;

3
mpp/legacy/vpu_api.cpp
View File

@@ -263,7 +263,6 @@ RK_S32 vpu_close_context(VpuCodecContext **ctx)
static RK_S32 commit_memory_handle(vpu_display_mem_pool *p, RK_S32 mem_hdl, RK_S32 size) static RK_S32 commit_memory_handle(vpu_display_mem_pool *p, RK_S32 mem_hdl, RK_S32 size)
{ {
MppBufferInfo info; MppBufferInfo info;
MPP_RET ret = MPP_OK;
vpu_display_mem_pool_impl *p_mempool = (vpu_display_mem_pool_impl *)p; vpu_display_mem_pool_impl *p_mempool = (vpu_display_mem_pool_impl *)p;
memset(&info, 0, sizeof(MppBufferInfo)); memset(&info, 0, sizeof(MppBufferInfo));
@@ -271,7 +270,7 @@ static RK_S32 commit_memory_handle(vpu_display_mem_pool *p, RK_S32 mem_hdl, RK_S
info.fd = mem_hdl; info.fd = mem_hdl;
info.size = size; info.size = size;
p_mempool->size = size; p_mempool->size = size;
ret = mpp_buffer_commit(p_mempool->group, &info); mpp_buffer_commit(p_mempool->group, &info);
return mem_hdl; return mem_hdl;
} }

3
test/mpi_test.c
View File

@@ -262,6 +262,9 @@ MPP_TEST_FAILED:
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
(void)argc;
(void)argv;
mpi_test(); mpi_test();
return 0; return 0;
} }