package/mpp
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2025-10-07 18:11:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[h264d] cancel mpp_log

Browse Source 
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@470 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
DingWei
2015-11-19 01:28:11 +00:00
parent 88e941aa2f
commit af20a68c91
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -825,7 +825,7 @@ static void write_picture(H264_StorePic_t *p, H264dVideoCtx_t *p_Vid)
p_mark = p->mem_mark; p_mark = p->mem_mark;
//mpp_log_f(" [Write_picture] In"); //mpp_log_f(" [Write_picture] In");
mpp_buf_slot_get_prop(p_Vid->p_Dec->frame_slots, p_mark->slot_idx, SLOT_FRAME_PTR, &frame); mpp_buf_slot_get_prop(p_Vid->p_Dec->frame_slots, p_mark->slot_idx, SLOT_FRAME_PTR, &frame);
mpp_log("[dispaly] layer_id %d pts %lld, g_framecnt=%d \n", p->layer_id, mpp_frame_get_pts(frame), p_Vid->g_framecnt); //mpp_log("[dispaly] layer_id %d pts %lld, g_framecnt=%d \n", p->layer_id, mpp_frame_get_pts(frame), p_Vid->g_framecnt);
mpp_frame_set_viewid(frame, p->layer_id); mpp_frame_set_viewid(frame, p->layer_id);
//if (p->layer_id == 0) { //if (p->layer_id == 0) {

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

@@ -650,7 +650,7 @@ MPP_RET parse_prepare(H264dInputCtx_t *p_Inp, H264dCurCtx_t *p_Cur)
p_Dec->p_Inp->task_valid = 1; p_Dec->p_Inp->task_valid = 1;
p_Dec->p_Inp->task_eos = 1; p_Dec->p_Inp->task_eos = 1;
LogInfo(p_Inp->p_Dec->logctx.parr[RUN_PARSE], "----- end of stream ----"); LogInfo(p_Inp->p_Dec->logctx.parr[RUN_PARSE], "----- end of stream ----");
mpp_log("----- eos: end of stream ----\n"); //mpp_log("----- eos: end of stream ----\n");
goto __RETURN; goto __RETURN;
} }
////!< check input ////!< check input
@@ -813,7 +813,7 @@ MPP_RET parse_prepare_extra_data(H264dInputCtx_t *p_Inp, H264dCurCtx_t *p_Cur)
FunctionIn(logctx->parr[RUN_PARSE]); FunctionIn(logctx->parr[RUN_PARSE]);
p_Inp->task_valid = 0; p_Inp->task_valid = 0;
if (p_Inp->pkt_eos) { if (p_Inp->pkt_eos) {
LogInfo(logctx->parr[RUN_PARSE], "----- end of stream ----"); LogInfo(logctx->parr[RUN_PARSE], "----- end of stream ----");
//mpp_log("----- eos: end of stream ----\n"); //mpp_log("----- eos: end of stream ----\n");
p_Inp->task_eos = 1; p_Inp->task_eos = 1;
p_Inp->task_valid = 0; p_Inp->task_valid = 0;

1
mpp/hal/rkdec/h264d/hal_h264d_vdpu_reg.c
View File

@@ -483,6 +483,7 @@ MPP_RET vdpu_h264d_init(void *hal, MppHalCfg *cfg)
vdpu_set_device_regs(p_drv); vdpu_set_device_regs(p_drv);
mpp_slots_set_prop(p_hal->frame_slots, SLOTS_HOR_ALIGN, vdpu_hor_align); mpp_slots_set_prop(p_hal->frame_slots, SLOTS_HOR_ALIGN, vdpu_hor_align);
mpp_slots_set_prop(p_hal->frame_slots, SLOTS_VER_ALIGN, vdpu_ver_align); mpp_slots_set_prop(p_hal->frame_slots, SLOTS_VER_ALIGN, vdpu_ver_align);
mpp_slots_set_prop(p_hal->frame_slots, SLOTS_LEN_ALIGN, NULL);
FunctionOut(p_hal->logctx.parr[RUN_HAL]); FunctionOut(p_hal->logctx.parr[RUN_HAL]);
(void)cfg; (void)cfg;