wrapper/libavc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit 'f2dadab7e1' into HEAD

Browse source
This commit is contained in:
Bill Yi 2016-06-28 08:59:01 -07:00
commit 63fed249f5
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
decoder/ih264d_api.c
View file

@ -1928,6 +1928,7 @@ WORD32 ih264d_video_decode(iv_obj_t *dec_hdl, void *pv_api_ip, void *pv_api_op)
ps_dec->cur_dec_mb_num = 0; ps_dec->cur_dec_mb_num = 0;
ps_dec->cur_recon_mb_num = 0; ps_dec->cur_recon_mb_num = 0;
ps_dec->u4_first_slice_in_pic = 2; ps_dec->u4_first_slice_in_pic = 2;
ps_dec->u1_first_pb_nal_in_pic = 1;
ps_dec->u1_slice_header_done = 0; ps_dec->u1_slice_header_done = 0;
ps_dec->u1_dangling_field = 0; ps_dec->u1_dangling_field = 0;
@ -2099,8 +2100,10 @@ WORD32 ih264d_video_decode(iv_obj_t *dec_hdl, void *pv_api_ip, void *pv_api_op)
if((ret == IVD_RES_CHANGED) if((ret == IVD_RES_CHANGED)
|| (ret == IVD_MEM_ALLOC_FAILED) || (ret == IVD_MEM_ALLOC_FAILED)
|| (ret == ERROR_UNAVAIL_PICBUF_T) || (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; break;
} }
@ -2182,7 +2185,8 @@ WORD32 ih264d_video_decode(iv_obj_t *dec_hdl, void *pv_api_ip, void *pv_api_op)
if((ret == IVD_RES_CHANGED) if((ret == IVD_RES_CHANGED)
|| (ret == IVD_MEM_ALLOC_FAILED) || (ret == IVD_MEM_ALLOC_FAILED)
|| (ret == ERROR_UNAVAIL_PICBUF_T) || (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 */ /* signal the decode thread */

1
decoder/ih264d_parse_slice.c
View file

@ -940,7 +940,6 @@ WORD32 ih264d_end_of_pic(dec_struct_t *ps_dec,
dec_slice_params_t *ps_cur_slice = ps_dec->ps_cur_slice; dec_slice_params_t *ps_cur_slice = ps_dec->ps_cur_slice;
WORD32 ret; WORD32 ret;
ps_dec->u1_first_pb_nal_in_pic = 1;
ps_dec->u2_mbx = 0xffff; ps_dec->u2_mbx = 0xffff;
ps_dec->u2_mby = 0; ps_dec->u2_mby = 0;
{ {