package/mpp
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2025-10-13 21:03:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[m2vd]: use temporal_reference to fix original pts error

Browse Source 
1. on original & external pts error use POC/temporal_reference
   in GOP to predict new pts
2. set mpeg2 temporal_reference to MppFrame POC for dpb & cal
   pts debugging

Change-Id: I3bb1b2c6646ddf4f4100c1d87158d81e1e8777ba
This commit is contained in:
linyuhui
2016-10-31 08:56:59 +08:00
parent fad35922fc
commit 757ded4d9f
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1046,6 +1046,16 @@ MPP_RET m2vd_alloc_frame(M2VDParserContext *ctx)
ctx->GroupFrameCnt = ctx->max_temporal_reference - ctx->PreChangeTime_index + 1; ctx->GroupFrameCnt = ctx->max_temporal_reference - ctx->PreChangeTime_index + 1;
tmp_frame_period = pts - ctx->PreGetFrameTime; tmp_frame_period = pts - ctx->PreGetFrameTime;
if ((pts > ctx->PreGetFrameTime) && (ctx->pic_head.temporal_reference > ctx->PreChangeTime_index)) {
RK_S32 theshold_frame_period = tmp_frame_period * 2 ;
RK_S32 predict_frame_period = (ctx->pic_head.temporal_reference - ctx->PreChangeTime_index) * ctx->preframe_period / 256;
if (theshold_frame_period < predict_frame_period) {
pts = ctx->PreGetFrameTime + predict_frame_period;
tmp_frame_period = predict_frame_period;
}
}
if ((pts > ctx->PreGetFrameTime) && (ctx->GroupFrameCnt > 0)) { if ((pts > ctx->PreGetFrameTime) && (ctx->GroupFrameCnt > 0)) {
tmp_frame_period = (tmp_frame_period * 256) / ctx->GroupFrameCnt; tmp_frame_period = (tmp_frame_period * 256) / ctx->GroupFrameCnt;
if ((tmp_frame_period > 4200) && (tmp_frame_period < 11200) && (abs(ctx->frame_period - tmp_frame_period) > 128)) { if ((tmp_frame_period > 4200) && (tmp_frame_period < 11200) && (abs(ctx->frame_period - tmp_frame_period) > 128)) {
@@ -1055,6 +1065,7 @@ MPP_RET m2vd_alloc_frame(M2VDParserContext *ctx)
ctx->frame_period = tmp_frame_period; ctx->frame_period = tmp_frame_period;
} }
} }
ctx->Group_start_Time = pts - (ctx->pic_head.temporal_reference * ctx->frame_period / 256); ctx->Group_start_Time = pts - (ctx->pic_head.temporal_reference * ctx->frame_period / 256);
if (ctx->Group_start_Time < 0) if (ctx->Group_start_Time < 0)
ctx->Group_start_Time = 0; ctx->Group_start_Time = 0;
@@ -1350,6 +1361,11 @@ MPP_RET m2vd_parser_parse(void *ctx, HalDecTask *in_task)
mpp_buf_slot_set_flag(p->frame_slots, p->frame_ref1->slot_index, SLOT_HAL_INPUT); mpp_buf_slot_set_flag(p->frame_slots, p->frame_ref1->slot_index, SLOT_HAL_INPUT);
in_task->refer[1] = p->frame_ref1->slot_index; in_task->refer[1] = p->frame_ref1->slot_index;
} }
MppFrame frame = NULL;
mpp_buf_slot_get_prop(p->frame_slots, p->cur_slot_index, SLOT_FRAME_PTR, &frame);
mpp_frame_set_poc(frame, p->pic_head.temporal_reference);
in_task->valid = 1; in_task->valid = 1;
m2v_update_ref_frame(p); m2v_update_ref_frame(p);
} }