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

Decoder Update mb count after mb map is set.

Browse source 
Bug: 25928803

Change-Id: Iccc58a7dd1c5c6ea656dfca332cfb8dddba4de37
This commit is contained in:
Harish Mahendrakar 2016-01-07 16:59:02 +05:30 • committed by Marco Nelissen
parent 2ee0c1bced
commit 4a524d3a8a
2 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
decoder/ih264d_parse_islice.c
View file

@ -899,7 +899,6 @@ WORD32 ih264d_parse_islice_data_cavlc(dec_struct_t * ps_dec,
(UWORD16)(u1_num_mbs >> u1_mbaff));
}
u1_num_mbs++;
ps_dec->u2_total_mbs_coded++;
/****************************************************************/
/* Check for End Of Row */
@ -929,7 +928,7 @@ WORD32 ih264d_parse_islice_data_cavlc(dec_struct_t * ps_dec,
u1_num_mbs_next, u1_tfr_n_mb,
u1_end_of_row);
}
ps_dec->u2_total_mbs_coded += u1_num_mbs;
if(u1_tfr_n_mb)
u1_num_mbs = 0;
u1_mb_idx = u1_num_mbs;
@ -1119,7 +1118,6 @@ WORD32 ih264d_parse_islice_data_cabac(dec_struct_t * ps_dec,
(UWORD16)(u1_num_mbs >> u1_mbaff));
}
u1_num_mbs++;
ps_dec->u2_total_mbs_coded++;
}
@ -1148,7 +1146,7 @@ WORD32 ih264d_parse_islice_data_cabac(dec_struct_t * ps_dec,
u1_num_mbs_next, u1_tfr_n_mb,
u1_end_of_row);
}
ps_dec->u2_total_mbs_coded += u1_num_mbs;
if(u1_tfr_n_mb)
u1_num_mbs = 0;
u1_mb_idx = u1_num_mbs;

11
decoder/ih264d_parse_pslice.c
View file

@ -1021,7 +1021,6 @@ WORD32 ih264d_parse_inter_slice_data_cabac(dec_struct_t * ps_dec,
}
u1_num_mbs++;
ps_dec->u2_total_mbs_coded++;
u1_num_mbsNby2++;
ps_parse_mb_data++;
@ -1072,7 +1071,7 @@ WORD32 ih264d_parse_inter_slice_data_cabac(dec_struct_t * ps_dec,
u1_num_mbs_next, u1_tfr_n_mb,
u1_end_of_row);
}
ps_dec->u2_total_mbs_coded += u1_num_mbs;
if(u1_tfr_n_mb)
u1_num_mbs = 0;
u1_mb_idx = u1_num_mbs;
@ -1358,7 +1357,6 @@ WORD32 ih264d_parse_inter_slice_data_cavlc(dec_struct_t * ps_dec,
i2_cur_mb_addr++;
u1_num_mbs++;
ps_dec->u2_total_mbs_coded++;
u1_num_mbsNby2++;
ps_parse_mb_data++;
@ -1411,7 +1409,7 @@ WORD32 ih264d_parse_inter_slice_data_cavlc(dec_struct_t * ps_dec,
u1_num_mbs_next, u1_tfr_n_mb,
u1_end_of_row);
}
ps_dec->u2_total_mbs_coded += u1_num_mbs;
if(u1_tfr_n_mb)
u1_num_mbs = 0;
u1_mb_idx = u1_num_mbs;
@ -1620,7 +1618,7 @@ WORD32 ih264d_mark_err_slice_skip(dec_struct_t * ps_dec,
ih264d_decode_recon_tfr_nmb(ps_dec, u1_mb_idx, u1_num_mbs,
u1_num_mbs_next, u1_tfr_n_mb, u1_end_of_row);
}
ps_dec->u2_total_mbs_coded += u1_num_mbs;
ps_dec->u1_mb_idx = 0;
ps_dec->u4_num_mbs_cur_nmb = 0;
}
@ -1782,7 +1780,6 @@ WORD32 ih264d_mark_err_slice_skip(dec_struct_t * ps_dec,
i2_cur_mb_addr++;
u1_num_mbs++;
ps_dec->u2_total_mbs_coded++;
u1_num_mbsNby2++;
ps_parse_mb_data++;
@ -1818,7 +1815,7 @@ WORD32 ih264d_mark_err_slice_skip(dec_struct_t * ps_dec,
ih264d_decode_recon_tfr_nmb(ps_dec, u1_mb_idx, u1_num_mbs, u1_num_mbs_next,
u1_tfr_n_mb, u1_end_of_row);
}
ps_dec->u2_total_mbs_coded += u1_num_mbs;
if(u1_tfr_n_mb)
u1_num_mbs = 0;
u1_mb_idx = u1_num_mbs;