From: Jingning Han <jingning@google.com>
Date: Tue, 12 Aug 2014 00:56:48 +0000 (-0700)
Subject: Merge "Enable fast forward txfm and quant for rate-distortion search"
X-Git-Tag: v1.4.0~1049
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=245e57c78e9d78db0caa493194f0c0ec9b05eacc;p=libvpx

Merge "Enable fast forward txfm and quant for rate-distortion search"
---

245e57c78e9d78db0caa493194f0c0ec9b05eacc
diff --cc vp9/encoder/vp9_rdopt.c
index 5caafd370,35ba85d74..cc55dd78f
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@@ -2313,9 -2350,12 +2349,12 @@@ static int64_t handle_inter_mode(VP9_CO
    if (!is_comp_pred) {
      if (cpi->allow_encode_breakout)
        rd_encode_breakout_test(cpi, x, bsize, rate2, distortion, distortion_uv,
 -                              disable_skip, this_rd);
 +                              disable_skip);
    }
  
+   vpx_memcpy(x->skip_txfm, skip_txfm, sizeof(skip_txfm));
+   vpx_memcpy(x->bsse, bsse, sizeof(bsse));
+ 
    if (!x->skip) {
      int skippable_y, skippable_uv;
      int64_t sseuv = INT64_MAX;