Merge "Set pic_present at end of pic_init instead of beginning" into lmp-dev am: 95cd002d79 am: 18a176494f am: b318a2b6a6 am: ab634125fb am: 66ae5b6dc1

am: f82e8aa4b8

Change-Id: I307203710349a7428ff41d83b24aa31a60cfe440
This commit is contained in:
Naveen Kumar P 2017-06-06 20:03:09 +00:00 • committed by android-build-merger
commit 67f15e8623

View file

@ -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;
}