From 3d1492200e76765a239bdb721e7621b6a774b9d0 Mon Sep 17 00:00:00 2001 From: Harish Mahendrakar Date: Sat, 17 Sep 2016 14:04:29 +0530 Subject: Fix in the case of invalid SPS PPS Bug: 31092462 Change-Id: I0e2ab5a1088717bbf36f6b0cf859b5a6e0f59c5d (cherry picked from commit c2e8ffe451e2a78161037ca09a3516e65c80675c) --- decoder/ih264d_api.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'decoder/ih264d_api.c') diff --git a/decoder/ih264d_api.c b/decoder/ih264d_api.c index 6aa71f2..cbfc8ca 100644 --- a/decoder/ih264d_api.c +++ b/decoder/ih264d_api.c @@ -2146,9 +2146,10 @@ WORD32 ih264d_video_decode(iv_obj_t *dec_hdl, void *pv_api_ip, void *pv_api_op) ret1 = ih264d_mark_err_slice_skip(ps_dec, num_mb_skipped, ps_dec->u1_nal_unit_type == IDR_SLICE_NAL, ps_dec->ps_cur_slice->u2_frame_num, &temp_poc, prev_slice_err); - if((ret1 == ERROR_UNAVAIL_PICBUF_T) || (ret1 == ERROR_UNAVAIL_MVBUF_T)) + if((ret1 == ERROR_UNAVAIL_PICBUF_T) || (ret1 == ERROR_UNAVAIL_MVBUF_T) || + (ret1 == ERROR_INV_SPS_PPS_T)) { - return IV_FAIL; + ret = ret1; } } -- cgit v1.2.3