summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHamsalekha S <hamsalekha.s@ittiam.com>2017-03-20 17:00:11 +0530
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-05-24 17:11:54 +0000
commit76f6a3ec7fddb444d5c3438db4ab0ad8aab9f0c6 (patch)
treea7dbd931982b92de4528a85fe03031882a402366
parentd4b34e3c5a5bc818e69d50297e561056dc4c42c1 (diff)
downloadandroid_external_libavc-76f6a3ec7fddb444d5c3438db4ab0ad8aab9f0c6.tar.gz
android_external_libavc-76f6a3ec7fddb444d5c3438db4ab0ad8aab9f0c6.tar.bz2
android_external_libavc-76f6a3ec7fddb444d5c3438db4ab0ad8aab9f0c6.zip
Decoder: Fix in reference list initialization.
In the case of error, initialize the new reference list1 with the first picture in default list0 instead of default list1, as first picture in list1 could still be invalid. Bug: 36035074 Change-Id: I7ab493ee7a157cbefcd4da8389ff1ff899c16b7f (cherry picked from commit 93954f5e9a5d727e402921ac6fa100e6dcc1d4e8)
-rw-r--r--decoder/ih264d_process_bslice.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/decoder/ih264d_process_bslice.c b/decoder/ih264d_process_bslice.c
index 4c5ee05..7784110 100644
--- a/decoder/ih264d_process_bslice.c
+++ b/decoder/ih264d_process_bslice.c
@@ -1494,7 +1494,7 @@ void ih264d_init_ref_idx_lx_b(dec_struct_t *ps_dec)
UWORD8 u1_i;
pic_buffer_t *ps_ref_pic;
- ps_ref_pic = ps_dpb_mgr->ps_init_dpb[1][0] + MAX_REF_BUFS;
+ ps_ref_pic = ps_dpb_mgr->ps_init_dpb[0][0] + MAX_REF_BUFS;
if(NULL == ps_ref_pic->pu1_buf1)
{
@@ -1521,7 +1521,7 @@ void ih264d_init_ref_idx_lx_b(dec_struct_t *ps_dec)
UWORD8 u1_i;
pic_buffer_t *ps_ref_pic;
- ps_ref_pic = ps_dpb_mgr->ps_init_dpb[1][0];
+ ps_ref_pic = ps_dpb_mgr->ps_init_dpb[0][0];
if(NULL == ps_ref_pic->pu1_buf1)
{