Merge "Set pic_present at end of pic_init instead of beginning" into lmp-dev am: 95cd002d79

am: 18a176494f

Change-Id: Ia7a85186a641c18b11bce66a79ca20c14080a3d5
This commit is contained in:
Naveen Kumar P 2017-06-06 19:39:36 +00:00 • committed by android-build-merger
commit b318a2b6a6

View file

@ -777,8 +777,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);
@ -1212,6 +1210,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;
}