summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarish Mahendrakar <harish.mahendrakar@ittiam.com>2016-05-26 10:46:21 +0530
committerMarco Nelissen <marcone@google.com>2016-06-14 13:43:54 -0700
commit3a419eac8d70cc2ef517d3aa7f9c40c4b7d98cbe (patch)
tree2eb5d6186dda0d186ca90c3f6aaf66b50fa31e35
parent2e88a2aa6788d559c5cf3a2f19c6ec4d5780518b (diff)
downloadandroid_external_libavc-3a419eac8d70cc2ef517d3aa7f9c40c4b7d98cbe.tar.gz
android_external_libavc-3a419eac8d70cc2ef517d3aa7f9c40c4b7d98cbe.tar.bz2
android_external_libavc-3a419eac8d70cc2ef517d3aa7f9c40c4b7d98cbe.zip
Decoder: Do not conceal slices with invalid SPS/PPS
Bug: 28835995
-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 4123f3f..a8dea4f 100644
--- a/decoder/ih264d_api.c
+++ b/decoder/ih264d_api.c
@@ -3051,8 +3051,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_STREAM_WIDTH_HEIGHT_NOT_SUPPORTED)
|| (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;
}
@@ -3133,7 +3135,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_STREAM_WIDTH_HEIGHT_NOT_SUPPORTED)
|| (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 */