From d012a1ffc0a260de924b7af5e3ba30eb65526f8a Mon Sep 17 00:00:00 2001 From: Naveen Kumar P Date: Wed, 17 May 2017 15:58:28 +0530 Subject: [PATCH] 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 --- decoder/ihevcd_utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/decoder/ihevcd_utils.c b/decoder/ihevcd_utils.c index 733b3c8..03387f3 100644 --- a/decoder/ihevcd_utils.c +++ b/decoder/ihevcd_utils.c @@ -776,8 +776,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); @@ -1240,6 +1238,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; }