diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-30 23:04:34 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-30 23:04:34 +0000 |
| commit | 310a9a805273193def3840c58b26ddcfe6c8ab92 (patch) | |
| tree | 2dafc820d4701b6627054cced0bcee2342dcdedc | |
| parent | 0f17ae73dff0a28c274d684ff170137482645c37 (diff) | |
| parent | 7cdf266cdab35e2a076f9fa1ed4e2de9c6a1c0a3 (diff) | |
| download | platform_external_libmpeg2-android11-tests-release.tar.gz platform_external_libmpeg2-android11-tests-release.tar.bz2 platform_external_libmpeg2-android11-tests-release.zip | |
Snap for 6544675 from 7cdf266cdab35e2a076f9fa1ed4e2de9c6a1c0a3 to rvc-releaseandroid-vts-11.0_r1android-cts-11.0_r1android-11.0.0_r3android-11.0.0_r2android-11.0.0_r17android-11.0.0_r1android11-tests-releaseandroid11-release
Change-Id: I72054cb00c1acf1f3da6e3d9c2e508a64c079ea7
| -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) { |