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

Change-Id: Ia59cc5ad109277c015f14f84f91df875ba0a35fd
This commit is contained in:
Android Build Merger (Role) 2018-03-28 17:26:00 +00:00
commit bae32f4c46

View file

@ -374,9 +374,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)
{ {
@ -384,6 +381,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;
} }
} }