Merge "Using vp9_zero instead of vpx_memset."
This commit is contained in:
commit
3aed95dbdb
@ -1757,7 +1757,7 @@ static void encode_sb_row(VP9_COMP *cpi, int mi_row, TOKENEXTRA **tp,
|
||||
int dummy_rate;
|
||||
int64_t dummy_dist;
|
||||
|
||||
vpx_memset(cpi->mb.pred_mv, 0, sizeof(cpi->mb.pred_mv));
|
||||
vp9_zero(cpi->mb.pred_mv);
|
||||
|
||||
if (cpi->sf.reference_masking)
|
||||
rd_pick_reference_frame(cpi, mi_row, mi_col);
|
||||
|
@ -3171,8 +3171,8 @@ int64_t vp9_rd_pick_inter_mode_sb(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;
|
||||
@ -4060,7 +4060,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) {
|
||||
@ -4071,7 +4071,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],
|
||||
|
Loading…
x
Reference in New Issue
Block a user