summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarish Mahendrakar <harish.mahendrakar@ittiam.com>2016-06-21 17:41:21 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-21 17:41:21 +0000
commit44a2462a71503dafecfcac46de79c5b181a59746 (patch)
tree45ea78f3633cc3dbc40a8d92edc90536d390f84b
parent46635d205b573fb5615d1f83e95ca4e4a04c94f4 (diff)
parentea40cf81eb3c24686edbbe4341c7cb6fe8abcf41 (diff)
downloadandroid_external_libavc-44a2462a71503dafecfcac46de79c5b181a59746.tar.gz
android_external_libavc-44a2462a71503dafecfcac46de79c5b181a59746.tar.bz2
android_external_libavc-44a2462a71503dafecfcac46de79c5b181a59746.zip
Decoder: Do not conceal slices with invalid SPS/PPS am: 3a419eac8d am: 48b182db5d
am: ea40cf81eb Change-Id: I44998b2614b5eb09965592c1f5d5d72d05ae1e65
-rw-r--r--decoder/ih264d_api.c7
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 */