wrapper/libavc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "decoder: Fix minimum poc calculation check while adding to display" into oc-dev am: 9d7a036d7b am: cebf26ab4d am: f64194a96f

Browse source 
Change-Id: I7bd7ba5f8adb66af75ef92257576bef227507f15
This commit is contained in:
Automerger Merge Worker 2020-01-09 04:21:17 +00:00
commit ed2b83d989
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
decoder/ih264d_utils.c
View file

@ -1205,7 +1205,9 @@ WORD32 ih264d_assign_display_seq(dec_struct_t *ps_dec)
&& (DO_NOT_DISP
!= ps_dpb_mgr->ai4_poc_buf_id_map[i][0]))
{
if(i4_poc_buf_id_map[i][1] < i4_min_poc)
/* Checking for <= is necessary to handle cases where there is one
valid buffer with poc set to 0x7FFFFFFF. */
if(i4_poc_buf_id_map[i][1] <= i4_min_poc)
{
i4_min_poc = i4_poc_buf_id_map[i][1];
i4_min_poc_buf_id = i4_poc_buf_id_map[i][0];
@ -1268,8 +1270,8 @@ void ih264d_release_display_bufs(dec_struct_t *ps_dec)
WORD32 (*i4_poc_buf_id_map)[3] = ps_dpb_mgr->ai4_poc_buf_id_map;
i4_min_poc = 0x7fffffff;
i4_min_poc_buf_id = -1;
i4_min_index = -1;
i4_min_poc_buf_id = 0;
i4_min_index = 0;
ih264d_delete_nonref_nondisplay_pics(ps_dpb_mgr);
@ -1280,7 +1282,9 @@ void ih264d_release_display_bufs(dec_struct_t *ps_dec)
{
if(i4_poc_buf_id_map[i][0] != -1)
{
if(i4_poc_buf_id_map[i][1] < i4_min_poc)
/* Checking for <= is necessary to handle cases where there is one
valid buffer with poc set to 0x7FFFFFFF. */
if(i4_poc_buf_id_map[i][1] <= i4_min_poc)
{
i4_min_poc = i4_poc_buf_id_map[i][1];
i4_min_poc_buf_id = i4_poc_buf_id_map[i][0];