summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@cyngn.com>2016-03-07 18:12:16 -0800
committerJessica Wagantall <jwagantall@cyngn.com>2016-03-07 18:12:16 -0800
commitcccc2b85cd9759336fd66db717f5c9f0363cc462 (patch)
tree2e35e915a499c35c16b398e9dc9cd3abc7608d43
parent9cf14a5109535b374156969683595930977d1ccc (diff)
parentc64afe769aa2b451524cd8e206d2f131bb46e839 (diff)
downloadandroid_external_libavc-cccc2b85cd9759336fd66db717f5c9f0363cc462.tar.gz
android_external_libavc-cccc2b85cd9759336fd66db717f5c9f0363cc462.tar.bz2
android_external_libavc-cccc2b85cd9759336fd66db717f5c9f0363cc462.zip
Merge tag 'android-6.0.1_r17' into HEAD
Android 6.0.1 release 17 Ticket: CYNGNOS-1854
-rw-r--r--decoder/ih264d_parse_islice.c6
-rw-r--r--decoder/ih264d_parse_pslice.c11
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;