diff options
| author | Harish Mahendrakar <harish.mahendrakar@ittiam.com> | 2016-01-07 16:59:02 +0530 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2016-01-22 13:36:11 -0800 |
| commit | c64afe769aa2b451524cd8e206d2f131bb46e839 (patch) | |
| tree | 2e35e915a499c35c16b398e9dc9cd3abc7608d43 | |
| parent | 533e5a7f03b976e2fa621e722394f1e4891f340e (diff) | |
| download | android_external_libavc-c64afe769aa2b451524cd8e206d2f131bb46e839.tar.gz android_external_libavc-c64afe769aa2b451524cd8e206d2f131bb46e839.tar.bz2 android_external_libavc-c64afe769aa2b451524cd8e206d2f131bb46e839.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 4f58c5b..f712c64 100644 --- a/decoder/ih264d_parse_islice.c +++ b/decoder/ih264d_parse_islice.c @@ -898,7 +898,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 */ @@ -928,7 +927,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; @@ -1117,7 +1116,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++; } @@ -1146,7 +1144,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 5a105cc..4084fca 100644 --- a/decoder/ih264d_parse_pslice.c +++ b/decoder/ih264d_parse_pslice.c @@ -1020,7 +1020,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++; @@ -1071,7 +1070,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; @@ -1356,7 +1355,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++; @@ -1409,7 +1407,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; @@ -1618,7 +1616,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; } @@ -1788,7 +1786,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++; @@ -1824,7 +1821,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; |