summaryrefslogtreecommitdiffstats
path: root/decoder
diff options
context:
space:
mode:
authorNaveen Kumar P <naveenkumar.p@ittiam.com>2017-05-17 15:58:28 +0530
committerIvan Kutepov <its.kutepov@gmail.com>2017-08-13 19:15:17 +0300
commita977d10880c26dda1e46ac6297cac845094ee163 (patch)
tree3a13bae40ec4fd5101ff48229dd815b0a4d55b23 /decoder
parentf85f3ce19395c1659c2541d0d53ae53274fe5420 (diff)
downloadandroid_external_libhevc-a977d10880c26dda1e46ac6297cac845094ee163.tar.gz
android_external_libhevc-a977d10880c26dda1e46ac6297cac845094ee163.tar.bz2
android_external_libhevc-a977d10880c26dda1e46ac6297cac845094ee163.zip
Set pic_present at end of pic_init instead of beginning
Bug: 37469795 In pic_init, pic_present was set in the beggining. If pic_present was set, process and buffer managment were done. For an error stream, a crash occured when pic_init returned with error after setting pic_present. Change-Id: Iea42e6ad2bc5a74517188fa5e4cc434bb96d46c7 (cherry picked from commit d012a1ffc0a260de924b7af5e3ba30eb65526f8a)
Diffstat (limited to 'decoder')
-rwxr-xr-xdecoder/ihevcd_utils.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/decoder/ihevcd_utils.c b/decoder/ihevcd_utils.c
index 797b079..7d76577 100755
--- a/decoder/ihevcd_utils.c
+++ b/decoder/ihevcd_utils.c
@@ -694,8 +694,6 @@ IHEVCD_ERROR_T ihevcd_parse_pic_init(codec_t *ps_codec)
ps_codec->s_parse.i4_error_code = IHEVCD_SUCCESS;
ps_sps = ps_codec->s_parse.ps_sps;
ps_slice_hdr = ps_codec->s_parse.ps_slice_hdr;
- /* If parse_pic_init is called, then slice data is present in the input bitstrea stream */
- ps_codec->i4_pic_present = 1;
/* Memset picture level intra map and transquant bypass map to zero */
num_min_cu = ((ps_sps->i2_pic_height_in_luma_samples + 7) / 8) * ((ps_sps->i2_pic_width_in_luma_samples + 63) / 64);
@@ -1158,6 +1156,8 @@ IHEVCD_ERROR_T ihevcd_parse_pic_init(codec_t *ps_codec)
}
}
+ /* If parse_pic_init is called, then slice data is present in the input bitstrea stream */
+ ps_codec->i4_pic_present = 1;
return ret;
}