diff options
author | Harish Mahendrakar <harish.mahendrakar@ittiam.com> | 2016-05-26 10:46:21 +0530 |
---|---|---|
committer | The Android Automerger <android-build@google.com> | 2016-06-23 15:05:09 -0700 |
commit | 7554755536019e439433c515eeb44e701fb3bfb2 (patch) | |
tree | d22e95f333e23ae808ab150d0cf94ee3ef5857d0 | |
parent | a78887bcffbc2995cf9ed72e0697acf560875e9e (diff) | |
download | android_external_libavc-7554755536019e439433c515eeb44e701fb3bfb2.tar.gz android_external_libavc-7554755536019e439433c515eeb44e701fb3bfb2.tar.bz2 android_external_libavc-7554755536019e439433c515eeb44e701fb3bfb2.zip |
Decoder: Do not conceal slices with invalid SPS/PPS
Bug: 28835995
-rw-r--r-- | decoder/ih264d_api.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/decoder/ih264d_api.c b/decoder/ih264d_api.c index bcdd376..cef51b0 100644 --- a/decoder/ih264d_api.c +++ b/decoder/ih264d_api.c @@ -2066,8 +2066,10 @@ WORD32 ih264d_video_decode(iv_obj_t *dec_hdl, void *pv_api_ip, void *pv_api_op) if((ret == IVD_RES_CHANGED) || (ret == IVD_MEM_ALLOC_FAILED) || (ret == ERROR_UNAVAIL_PICBUF_T) - || (ret == ERROR_UNAVAIL_MVBUF_T)) + || (ret == ERROR_UNAVAIL_MVBUF_T) + || (ret == ERROR_INV_SPS_PPS_T)) { + ps_dec->u4_slice_start_code_found = 0; break; } @@ -2149,7 +2151,8 @@ WORD32 ih264d_video_decode(iv_obj_t *dec_hdl, void *pv_api_ip, void *pv_api_op) if((ret == IVD_RES_CHANGED) || (ret == IVD_MEM_ALLOC_FAILED) || (ret == ERROR_UNAVAIL_PICBUF_T) - || (ret == ERROR_UNAVAIL_MVBUF_T)) + || (ret == ERROR_UNAVAIL_MVBUF_T) + || (ret == ERROR_INV_SPS_PPS_T)) { /* signal the decode thread */ |