[automerger] Decoder: Modify setting short term reference field flag am: 47cc04b40c am: 1991ec77e7 am: c18d0ab03a am: 8f05a87c39 am: ce46d15877 am: 8781a2aa9b am: 9cb460fb64 am: bae32f4c46 am: b8dd278100

am: 2dfd8c6d91

Change-Id: Icc4b494ef1b45fdb38f478395532d47de6b5e572
This commit is contained in:
Ritu Baldwa 2018-04-05 18:16:23 -07:00 committed by android-build-merger
commit e44fbd93cb

View file

@ -375,9 +375,6 @@ WORD32 ih264d_insert_st_node(dpb_manager_t *ps_dpb_mgr,
if((ps_dpb_info[i].ps_pic_buf == ps_pic_buf) if((ps_dpb_info[i].ps_pic_buf == ps_pic_buf)
&& ps_dpb_info[i].u1_used_as_ref) && ps_dpb_info[i].u1_used_as_ref)
{ {
/* Can occur only for field bottom pictures */
ps_dpb_info[i].s_bot_field.u1_reference_info = IS_SHORT_TERM;
/*signal an error in the case of frame pic*/ /*signal an error in the case of frame pic*/
if(ps_dpb_info[i].ps_pic_buf->u1_pic_type == FRM_PIC) if(ps_dpb_info[i].ps_pic_buf->u1_pic_type == FRM_PIC)
{ {
@ -385,6 +382,8 @@ WORD32 ih264d_insert_st_node(dpb_manager_t *ps_dpb_mgr,
} }
else else
{ {
/* Can occur only for field bottom pictures */
ps_dpb_info[i].s_bot_field.u1_reference_info = IS_SHORT_TERM;
return OK; return OK;
} }
} }