diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-30 23:08:21 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-30 23:08:21 +0000 |
| commit | b09a1f7c7b58e2faa962032136d8afdb108ca16b (patch) | |
| tree | 2dafc820d4701b6627054cced0bcee2342dcdedc | |
| parent | 0818e75251375e6d30e3f9c8ce6a9c9ef6fce23c (diff) | |
| parent | ac044457bc39b3379a1b0f7f74e12b43d92d3b13 (diff) | |
| download | libmpeg2-android11-d1-s7-release.tar.gz | |
Snap for 6544619 from ac044457bc39b3379a1b0f7f74e12b43d92d3b13 to rvc-d1-releaseandroid-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-release
Change-Id: Ic79aeb9c425974de7eca188c9c7db3827b23b2e9
| -rw-r--r-- | PREUPLOAD.cfg | 2 | ||||
| -rw-r--r-- | decoder/impeg2d_pic_proc.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg index 86b6de3..ecf8b8e 100644 --- a/PREUPLOAD.cfg +++ b/PREUPLOAD.cfg @@ -1,2 +1,2 @@ [Hook Scripts] -mainline_hook = ${REPO_ROOT}/frameworks/av/tools/mainline_hook.sh +mainline_hook = ${REPO_ROOT}/frameworks/av/tools/mainline_hook_project.sh diff --git a/decoder/impeg2d_pic_proc.c b/decoder/impeg2d_pic_proc.c index 332ab0f..ac29f9b 100644 --- a/decoder/impeg2d_pic_proc.c +++ b/decoder/impeg2d_pic_proc.c @@ -375,13 +375,17 @@ IMPEG2D_ERROR_CODES_T impeg2d_pre_pic_dec_proc(dec_state_t *ps_dec) if(ps_dec->u4_deinterlace) impeg2_buf_mgr_set_status((buf_mgr_t *)ps_dec->pv_pic_buf_mg, ps_dec->i4_cur_buf_id, MPEG2_BUF_MGR_DEINT); - ps_pic_buf->u4_ts = ps_dec->u4_inp_ts; ps_pic_buf->e_pic_type = ps_dec->e_pic_type; ps_dec->ps_cur_pic = ps_pic_buf; ps_dec->s_cur_frm_buf.pu1_y = ps_pic_buf->pu1_y; ps_dec->s_cur_frm_buf.pu1_u = ps_pic_buf->pu1_u; ps_dec->s_cur_frm_buf.pu1_v = ps_pic_buf->pu1_v; } + else + { + /* Timestamp associated with second field is associated with the current picture */ + ps_dec->ps_cur_pic->u4_ts = ps_dec->u4_inp_ts; + } if(ps_dec->u2_picture_structure == TOP_FIELD) { |