diff options
author | Jingning Han <jingning@google.com> | 2013-10-03 17:04:16 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-10-03 17:04:16 -0700 |
commit | 63a92eb66577c068f641026c6d0f9e265f8a1e04 (patch) | |
tree | 6c40e32a871d978b65d6491eab65c9aedd89d21d /vp9 | |
parent | 3b7794f9eb28bf4e70b4ac2bd0e5f1c730c10724 (diff) | |
parent | b9daef91d8b52f1dadee4ca1a3a8ff0f1100b190 (diff) | |
download | libvpx-63a92eb66577c068f641026c6d0f9e265f8a1e04.tar libvpx-63a92eb66577c068f641026c6d0f9e265f8a1e04.tar.gz libvpx-63a92eb66577c068f641026c6d0f9e265f8a1e04.tar.bz2 libvpx-63a92eb66577c068f641026c6d0f9e265f8a1e04.zip |
Merge "Use vp9_zero in sub8x8 RD optimiazion loop"
Diffstat (limited to 'vp9')
-rw-r--r-- | vp9/encoder/vp9_rdopt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index c5cc4e984..0e62d3118 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -3782,7 +3782,7 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, if (cm->mcomp_filter_type == SWITCHABLE) assert(best_filter_diff[SWITCHABLE_FILTERS] == 0); } else { - vpx_memset(best_filter_diff, 0, sizeof(best_filter_diff)); + vp9_zero(best_filter_diff); } if (!x->skip) { @@ -3793,7 +3793,7 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, best_tx_diff[i] = best_rd - best_tx_rd[i]; } } else { - vpx_memset(best_tx_diff, 0, sizeof(best_tx_diff)); + vp9_zero(best_tx_diff); } set_scale_factors(xd, mbmi->ref_frame[0], mbmi->ref_frame[1], @@ -3863,8 +3863,8 @@ int64_t vp9_rd_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x, unsigned char best_zcoeff_blk[256] = { 0 }; x->skip_encode = cpi->sf.skip_encode_frame && xd->q_index < QIDX_SKIP_THRESH; - vpx_memset(x->zcoeff_blk, 0, sizeof(x->zcoeff_blk)); - vpx_memset(ctx->zcoeff_blk, 0, sizeof(ctx->zcoeff_blk)); + vp9_zero(x->zcoeff_blk); + vp9_zero(ctx->zcoeff_blk); for (i = 0; i < 4; i++) { int j; |