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

[h264d] remove warning;

Browse Source 
[oasl]  remove warning in linux;
[m2v]   update CMakeLists in vs; remove warning;

git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@892 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
DingWei
2016-06-08 02:26:01 +00:00
parent 5ba125957b
commit 12ee09be3d
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mpp/codec/dec/h264/h264d_init.c
View File

@@ -472,7 +472,7 @@ static MPP_RET check_dpb_field_paired(H264_FrameStore_t *p_last, H264_StorePic_t
#endif
H264D_DBG(H264D_DBG_FIELD_PAIRED, "[check_field_paired] combine_flag=%d, last_used=%d, last_pic_struct=%d, curr_struct=%d",
dec_pic->combine_flag, (p_last ? p_last->is_used : -1), last_pic_structure, cur_structure);
return MPP_OK;
return ret = MPP_OK;
}
static MPP_RET check_dpb_discontinuous(H264_StorePic_t *p_last, H264_StorePic_t *dec_pic, H264_SLICE_t *currSlice)

5
mpp/codec/dec/m2v/CMakeLists.txt
View File

@@ -27,10 +27,9 @@ add_library(codec_m2vd STATIC
${M2VD_COMMON}
${M2VD_HDR}
${M2VD_SRC}
)
)
target_link_libraries(codec_m2vd
mpp
mpp_legacy
mpp_base
)
set_target_properties(codec_m2vd PROPERTIES FOLDER "mpp/codec")

4
mpp/codec/dec/m2v/m2vd_parser.c
View File

@@ -400,7 +400,7 @@ MPP_RET m2vd_parser_prepare(void *ctx, MppPacket pkt, HalDecTask *task)
task->valid = 0;
m2vd_parser_split_frame(buf,
mpp_packet_get_length(pkt),
(RK_U32)mpp_packet_get_length(pkt),
p->bitstream_sw_buf,
&out_size);
pos += out_size;
@@ -1252,7 +1252,7 @@ MPP_RET m2vd_parser_parse(void *ctx, HalDecTask *in_task)
p->flush_dpb_eos = 0;
p->frame_size = mpp_packet_get_length(in_task->input_packet);
p->frame_size = (RK_U32)mpp_packet_get_length(in_task->input_packet);
mpp_set_bitread_ctx(p->bitread_ctx, p->bitstream_sw_buf, p->frame_size);

2
mpp/hal/vpu/m2vd/CMakeLists.txt
View File

@@ -30,7 +30,7 @@ else()
target_link_libraries(hal_m2vd osal)
endif()
target_link_libraries(hal_m2vd
mpp
mpp_base
)
set_target_properties(hal_m2vd PROPERTIES FOLDER "mpp/hal")

7
osal/allocator/allocator_drm.c
View File

@@ -75,7 +75,8 @@ static int drm_alloc(int fd, size_t len, size_t align, unsigned int heap_mask,
if (ret < 0)
return ret;
*handle = dmcb.handle;
(void)heap_mask;
(void)flags;
return ret;
}
@@ -102,7 +103,7 @@ static int drm_handle_to_fd(int fd, RK_U32 handle, int *map_fd, RK_U32 flags)
mpp_err("map ioctl returned negative fd\n");
return -EINVAL;
}
(void)flags;
return ret;
}
@@ -140,7 +141,7 @@ static int drm_map(int fd, RK_U32 handle, size_t length, int prot,
mpp_err("mmap failed: %s\n", strerror(errno));
return -errno;
}
(void)offset;
return ret;
}