diff options
| author | Harish Mahendrakar <harish.mahendrakar@ittiam.com> | 2016-01-07 16:59:02 +0530 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2016-01-07 11:08:06 -0800 |
| commit | 4a524d3a8ae9aa20c36430008e6bd429443f8f1d (patch) | |
| tree | 026b1dd0740f2414a8597b89cca79fcb1c399ce3 | |
| parent | 2ee0c1bced131ffb06d1b430b08a202cd3a52005 (diff) | |
| download | android_external_libavc-4a524d3a8ae9aa20c36430008e6bd429443f8f1d.tar.gz android_external_libavc-4a524d3a8ae9aa20c36430008e6bd429443f8f1d.tar.bz2 android_external_libavc-4a524d3a8ae9aa20c36430008e6bd429443f8f1d.zip | |
Decoder Update mb count after mb map is set.
Bug: 25928803
Change-Id: Iccc58a7dd1c5c6ea656dfca332cfb8dddba4de37
| -rw-r--r-- | decoder/ih264d_parse_islice.c | 6 | ||||
| -rw-r--r-- | decoder/ih264d_parse_pslice.c | 11 |
2 files changed, 6 insertions, 11 deletions
diff --git a/decoder/ih264d_parse_islice.c b/decoder/ih264d_parse_islice.c index 1e4fdfa..001f8fc 100644 --- a/decoder/ih264d_parse_islice.c +++ b/decoder/ih264d_parse_islice.c @@ -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; diff --git a/decoder/ih264d_parse_pslice.c b/decoder/ih264d_parse_pslice.c index d56f44e..a82b0f8 100644 --- a/decoder/ih264d_parse_pslice.c +++ b/decoder/ih264d_parse_pslice.c @@ -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; |