summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Kovalev <dkovalev@google.com>2014-04-01 18:03:26 -0700
committerDmitry Kovalev <dkovalev@google.com>2014-04-01 20:09:35 -0700
commit4f8a4400836de0524118e855f28ca49cae296c84 (patch)
tree0d79874c5520ef44f0fef2933bf30e0585382227
parent86f44a91f4987454ce3288e882d5e33a5a0dc5de (diff)
downloadlibvpx-4f8a4400836de0524118e855f28ca49cae296c84.tar
libvpx-4f8a4400836de0524118e855f28ca49cae296c84.tar.gz
libvpx-4f8a4400836de0524118e855f28ca49cae296c84.tar.bz2
libvpx-4f8a4400836de0524118e855f28ca49cae296c84.zip
Clearing all encoder counts with single vp9_zero() call.
Change-Id: I4341d16ef83acd1cc9e55f7c5eff4af921bf57d4
-rw-r--r--vp9/encoder/vp9_encodeframe.c19
1 files changed, 2 insertions, 17 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index 445786807..cdca93a20 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -2419,17 +2419,6 @@ static void init_encode_frame_mb_context(VP9_COMP *cpi) {
xd->mi[0]->mbmi.mode = DC_PRED;
xd->mi[0]->mbmi.uv_mode = DC_PRED;
- vp9_zero(cm->counts.y_mode);
- vp9_zero(cm->counts.uv_mode);
- vp9_zero(cm->counts.inter_mode);
- vp9_zero(cm->counts.partition);
- vp9_zero(cm->counts.intra_inter);
- vp9_zero(cm->counts.comp_inter);
- vp9_zero(cm->counts.single_ref);
- vp9_zero(cm->counts.comp_ref);
- vp9_zero(cm->counts.tx);
- vp9_zero(cm->counts.skip);
-
// Note: this memset assumes above_context[0], [1] and [2]
// are allocated as part of the same buffer.
vpx_memset(xd->above_context[0], 0,
@@ -3085,16 +3074,12 @@ static void encode_frame_internal(VP9_COMP *cpi) {
// cpi->common.current_video_frame, cpi->common.show_frame,
// cm->frame_type);
- vp9_zero(cm->counts.switchable_interp);
- vp9_zero(cpi->tx_stepdown_count);
-
xd->mi = cm->mi_grid_visible;
- // required for vp9_frame_init_quantizer
xd->mi[0] = cm->mi;
- vp9_zero(cm->counts.mv);
+ vp9_zero(cm->counts);
vp9_zero(cpi->coef_counts);
- vp9_zero(cm->counts.eob_branch);
+ vp9_zero(cpi->tx_stepdown_count);
// Set frame level transform size use case
cm->tx_mode = select_tx_mode(cpi);