diff options
| -rw-r--r-- | decoder/ih264d_api.c | 1 | ||||
| -rw-r--r-- | decoder/ih264d_parse_headers.c | 10 | ||||
| -rw-r--r-- | decoder/ih264d_structs.h | 1 |
3 files changed, 12 insertions, 0 deletions
diff --git a/decoder/ih264d_api.c b/decoder/ih264d_api.c index 9395444..635a7cf 100644 --- a/decoder/ih264d_api.c +++ b/decoder/ih264d_api.c @@ -1935,6 +1935,7 @@ WORD32 ih264d_video_decode(iv_obj_t *dec_hdl, void *pv_api_ip, void *pv_api_op) ps_dec->u4_bs_deblk_thread_created = 0; ps_dec->u4_cur_bs_mb_num = 0; ps_dec->u4_start_recon_deblk = 0; + ps_dec->u4_sps_cnt_in_process = 0; DEBUG_THREADS_PRINTF(" Starting process call\n"); diff --git a/decoder/ih264d_parse_headers.c b/decoder/ih264d_parse_headers.c index f2744d4..d8c37a6 100644 --- a/decoder/ih264d_parse_headers.c +++ b/decoder/ih264d_parse_headers.c @@ -1158,6 +1158,16 @@ WORD32 ih264d_parse_nal_unit(iv_obj_t *dec_hdl, /* ! */ ih264d_rbsp_to_sodb(ps_dec->ps_bitstrm); i_status = ih264d_parse_sps(ps_dec, ps_bitstrm); + ps_dec->u4_sps_cnt_in_process++; + /*If a resolution change happens within a process call, due to multiple sps + * we will not support it. + */ + if((ps_dec->u4_sps_cnt_in_process > 1 ) && + (i_status == IVD_RES_CHANGED)) + { + i_status = ERROR_INV_SPS_PPS_T; + ps_dec->u1_res_changed = 0; + } if(i_status == ERROR_INV_SPS_PPS_T) return i_status; if(!i_status) diff --git a/decoder/ih264d_structs.h b/decoder/ih264d_structs.h index d8b02da..d6cd3f8 100644 --- a/decoder/ih264d_structs.h +++ b/decoder/ih264d_structs.h @@ -1251,6 +1251,7 @@ typedef struct _DecStruct UWORD32 u4_cur_bs_mb_num; UWORD32 u4_bs_cur_slice_num_mbs; UWORD32 u4_cur_deblk_mb_num; + UWORD32 u4_sps_cnt_in_process; volatile UWORD16 u2_cur_slice_num_bs; UWORD32 u4_deblk_mb_x; |