shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-11 05:17:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

PD#153240: vvp9: restore checkin pts for vts

Browse Source 
Change-Id: I54b531e44d3433ee18e8b09ce94d0fde76ac391c
Signed-off-by: shihong.zheng <shihong.zheng@amlogic.com>
This commit is contained in:
shihong.zheng
2017-11-04 12:53:56 +08:00
committed by Dongjin Kim
parent 25bd691539
commit e7f2da8ed9
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/amlogic/media_modules/frame_provider/decoder/vp9/vvp9.c
View File

@@ -6036,8 +6036,9 @@ static int prepare_display_buf(struct VP9Decoder_s *pbi,
struct vframe_s *vf = NULL;
int stream_offset = pic_config->stream_offset;
unsigned short slice_type = pic_config->slice_type;
unsigned int pts_valid = 0, pts_us64_valid = 0;
u32 pts_valid = 0, pts_us64_valid = 0;
u32 pts_save;
u64 pts_us64_save;
if (debug & VP9_DEBUG_BUFMGR)
pr_info("%s index = %d\r\n", __func__, pic_config->index);
@@ -6084,6 +6085,8 @@ static int prepare_display_buf(struct VP9Decoder_s *pbi,
pts_us64_valid = 1;
}
pts_save = vf->pts;
pts_us64_save = vf->pts_us64;
if (pbi->pts_unstable) {
frame_duration_adapt(pbi, vf, pts_valid);
if (pbi->duration_from_pts_done) {
@@ -6144,6 +6147,16 @@ static int prepare_display_buf(struct VP9Decoder_s *pbi,
pbi->pts_mode, pbi->frame_dur, vf->pts, vf->pts_us64);
}
if (pbi->pts_mode == PTS_NONE_REF_USE_DURATION) {
vf->disp_pts = vf->pts;
vf->disp_pts_us64 = vf->pts_us64;
vf->pts = pts_save;
vf->pts_us64 = pts_us64_save;
} else {
vf->disp_pts = 0;
vf->disp_pts_us64 = 0;
}
vf->index = 0xff00 | pic_config->index;
if (pic_config->double_write_mode & 0x10) {
@@ -7206,14 +7219,13 @@ TODO:FOR VERSION
ret = vp9_local_init(pbi);
/*
//note: drop for vts test
if (!pbi->pts_unstable) {
pbi->pts_unstable =
(pbi->vvp9_amstream_dec_info.rate == 0)?1:0;
pr_info("set pts unstable\n");
}
*/
return ret;
}