shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "valgrind - txfm_thresh not set" into experimental

--- a/vp9/encoder/vp9_rdopt.c

+++ b/vp9/encoder/vp9_rdopt.c

@@ -2442,9 +2442,7 @@

     *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 +

@@ -2451,7 +2449,7 @@

         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;