From aae78c8ac742ef7f0f35ed52ea179d0a5ba152cb Mon Sep 17 00:00:00 2001 From: Jim Bankoski Date: Wed, 29 May 2013 13:56:08 -0700 Subject: [PATCH] valgrind - txfm_thresh not set For 4x4 blocks valgrind points out the cache was uninitalized. This resolves the issue by setting it. Change-Id: I22733000da048643762813a84fbda66d8e4040d2 --- vp9/encoder/vp9_rdopt.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index cc1c480da..c11ebb4c3 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -2397,16 +2397,14 @@ void vp9_rd_pick_intra_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, *returnrate = rate4x4_y + rate_uv + vp9_cost_bit(vp9_get_pred_prob(cm, xd, PRED_MBSKIP), 0); *returndist = dist4x4_y + (dist_uv >> 2); - for (i = 0; i < NB_TXFM_MODES; i++) { - ctx->txfm_rd_diff[i] = MIN(err4x4, err - txfm_cache[i]); - } + vpx_memset(ctx->txfm_rd_diff, 0, sizeof(ctx->txfm_rd_diff)); xd->mode_info_context->mbmi.txfm_size = TX_4X4; } else { *returnrate = rate_y + rate_uv + vp9_cost_bit(vp9_get_pred_prob(cm, xd, PRED_MBSKIP), 0); *returndist = dist_y + (dist_uv >> 2); for (i = 0; i < NB_TXFM_MODES; i++) { - ctx->txfm_rd_diff[i] = MIN(err4x4, err - txfm_cache[i]); + ctx->txfm_rd_diff[i] = txfm_cache[i] - txfm_cache[cm->txfm_mode]; } xd->mode_info_context->mbmi.txfm_size = txfm_size; xd->mode_info_context->mbmi.mode = mode; -- 2.40.0