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

remove warning/error in windows vs

Browse Source 
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@501 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
DingWei
2015-12-03 14:26:52 +00:00
parent 2aa567d87b
commit 351ba32579
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -830,7 +830,7 @@ MPP_RET parse_prepare_extra_data(H264dInputCtx_t *p_Inp, H264dCurCtx_t *p_Cur)
nalu_len = parse_nal_size(p_Inp->nal_size, pdata); nalu_len = parse_nal_size(p_Inp->nal_size, pdata);
VAL_CHECK(ret, (nalu_len > 0)); VAL_CHECK(ret, (nalu_len > 0));
VAL_CHECK(ret, ((strm_offset + p_Inp->nal_size + nalu_len) <= p_Inp->in_length)); VAL_CHECK(ret, ((strm_offset + p_Inp->nal_size + nalu_len) <= p_Inp->in_length));
p_strm->nalu_len = nalu_len; p_strm->nalu_len = (RK_U32)nalu_len;
p_strm->nal_unit_type = NALU_TYPE_SLICE; p_strm->nal_unit_type = NALU_TYPE_SLICE;
pdata += p_Inp->nal_size; pdata += p_Inp->nal_size;
strm_offset += p_Inp->nal_size; strm_offset += p_Inp->nal_size;

5
mpp/codec/dec/h265/h265d_parser.c
View File

@@ -1968,11 +1968,12 @@ MPP_RET h265d_control(void *ctx, RK_S32 cmd, void *param)
MPP_RET h265d_callback(void *ctx, void *err_info) MPP_RET h265d_callback(void *ctx, void *err_info)
{ {
(void) err_info;
H265dContext_t *h265dctx = (H265dContext_t *)ctx; H265dContext_t *h265dctx = (H265dContext_t *)ctx;
HEVCContext *s = (HEVCContext *)h265dctx->priv_data; HEVCContext *s = (HEVCContext *)h265dctx->priv_data;
s->max_ra = INT_MAX; s->max_ra = INT_MAX;
(void) err_info;
return MPP_OK; return MPP_OK;
} }

4
mpp/codec/mpp_dec.cpp
View File

@@ -681,6 +681,7 @@ MPP_RET mpp_dec_init(MppDec **dec, MppCodingType coding)
MppBufSlots packet_slots = NULL; MppBufSlots packet_slots = NULL;
Parser parser = NULL; Parser parser = NULL;
MppHal hal = NULL; MppHal hal = NULL;
HalIOInterruptCB cb = {0};
MppDec *p = mpp_calloc(MppDec, 1); MppDec *p = mpp_calloc(MppDec, 1);
if (NULL == p) { if (NULL == p) {
@@ -716,7 +717,8 @@ MPP_RET mpp_dec_init(MppDec **dec, MppCodingType coding)
mpp_err_f("could not init parser\n"); mpp_err_f("could not init parser\n");
break; break;
} }
HalIOInterruptCB cb = {.callBack = hal_callback, .opaque = parser}; cb.callBack = hal_callback;
cb.opaque = parser;
// then init hal with task count from parser // then init hal with task count from parser
MppHalCfg hal_cfg = { MppHalCfg hal_cfg = {
MPP_CTX_DEC, MPP_CTX_DEC,

2
mpp/mpp.cpp
View File

@@ -190,7 +190,7 @@ MPP_RET Mpp::get_frame(MppFrame *frame)
mThreadCodec->signal(); mThreadCodec->signal();
if (mOutputBlock) if (mOutputBlock)
mFrames->wait(); mFrames->wait();
usleep(1000); msleep(1);
} }
if (mFrames->list_size()) { if (mFrames->list_size()) {