diff options
| author | Ray Essick <essick@google.com> | 2020-05-30 00:57:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-05-30 00:57:00 +0000 |
| commit | 7cdf266cdab35e2a076f9fa1ed4e2de9c6a1c0a3 (patch) | |
| tree | 2dafc820d4701b6627054cced0bcee2342dcdedc | |
| parent | a29648291cf3b9be5b0de9503bf961bd56e81380 (diff) | |
| parent | 42ec6dac451929258c4bc6e826d8233da9e73b04 (diff) | |
| download | libmpeg2-7cdf266cdab35e2a076f9fa1ed4e2de9c6a1c0a3.tar.gz | |
Merge "decoder: Returned frame_decoded true after decoding both fields" into rvc-devandroid11-dev
| -rw-r--r-- | decoder/impeg2d_pic_proc.c | 6 |
1 files changed, 5 insertions, 1 deletions
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) { |