diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-01-13 20:04:18 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-01-13 20:04:18 +0000 |
| commit | 716afdf8cc1b72a3b0e99d1b49f5235c15b8b8e2 (patch) | |
| tree | 94e0f6076b83b3dac0281387417c1761ff20333b | |
| parent | 6552b5080103ff4faeeb013f2d46eb8e16cf9546 (diff) | |
| parent | 8c2ee3ea8bf5b8d520bdcb5a1952e87ddaa881c4 (diff) | |
| download | libavc-android10-mainline-media-release.tar.gz | |
Snap for 6131310 from 8c2ee3ea8bf5b8d520bdcb5a1952e87ddaa881c4 to qt-aml-media-releaseandroid-mainline-10.0.0_r10android10-mainline-media-release
Change-Id: Ie8ca2e13c5bc92b6ea461bbbac82e675993d70b7
| -rw-r--r-- | decoder/ih264d_utils.c | 12 |
1 files changed, 8 insertions, 4 deletions
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 @@ 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]; @@ -1302,8 +1304,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); @@ -1314,7 +1316,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]; |