diff options
| author | Harish Mahendrakar <harish.mahendrakar@ittiam.com> | 2016-06-21 17:35:49 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-21 17:35:49 +0000 |
| commit | 48b182db5d7825688efe977e48b4b3aef40900e0 (patch) | |
| tree | 45ea78f3633cc3dbc40a8d92edc90536d390f84b | |
| parent | d75185f90ea95515aaa56c79e2d879fc8de253a0 (diff) | |
| parent | 3a419eac8d70cc2ef517d3aa7f9c40c4b7d98cbe (diff) | |
| download | android_external_libavc-48b182db5d7825688efe977e48b4b3aef40900e0.tar.gz android_external_libavc-48b182db5d7825688efe977e48b4b3aef40900e0.tar.bz2 android_external_libavc-48b182db5d7825688efe977e48b4b3aef40900e0.zip | |
Decoder: Do not conceal slices with invalid SPS/PPS
am: 3a419eac8d
Change-Id: I09e962ab090f890a149cb967f2b04fd95a7d76d7
| -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 */ |