commit af9f316bab8eb73b11b9e658a0bae6bc259aa046
author android-build-team Robot <android-build-team-robot@google.com> Fri Jan 10 02:03:31 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Jan 10 02:03:31 2020 +0000
tree 94e0f6076b83b3dac0281387417c1761ff20333b
parent a71fa423baba429445a692bf07dacbf62536cc45
parent 8c2ee3ea8bf5b8d520bdcb5a1952e87ddaa881c4

Snap for 6123600 from 8c2ee3ea8bf5b8d520bdcb5a1952e87ddaa881c4 to qt-qpr2-release

Change-Id: I900584063d97956e12aa2a7f2676f87684e54c44

decoder/ih264d_utils.c

diff --git a/decoder/ih264d_utils.c b/decoder/ih264d_utils.c
index 48a98f6..28d8db0 100644
--- a/decoder/ih264d_utils.c
+++ b/decoder/ih264d_utils.c
@@ -1238,7 +1238,9 @@
                             && (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];
@@ -1302,8 +1304,8 @@
     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);
 
@@ -1314,7 +1316,9 @@
         {
             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];