From: Jingning Han <jingning@google.com>
Date: Thu, 13 Nov 2014 21:59:02 +0000 (-0800)
Subject: Merge "Use reconstructed pixels for intra prediction"
X-Git-Tag: v1.4.0~508
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aeff1f7ec249a38b584255bbdf9b2e88f623a0fd;p=libvpx

Merge "Use reconstructed pixels for intra prediction"
---

aeff1f7ec249a38b584255bbdf9b2e88f623a0fd
diff --cc vp9/encoder/vp9_pickmode.c
index 8ac3aad25,af6732844..358bedd33
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@@ -778,30 -779,8 +779,11 @@@ void vp9_pick_inter_mode(VP9_COMP *cpi
  
      // Check that a prediction mode has been selected.
      assert(best_rdc.rdcost < INT64_MAX);
 +
 +    if (x->skip)
 +      break;
    }
  
-   // If best prediction is not in dst buf, then copy the prediction block from
-   // temp buf to dst buf.
-   if (best_pred != NULL && reuse_inter_pred &&
-       best_pred->data != orig_dst.buf) {
-     pd->dst = orig_dst;
- #if CONFIG_VP9_HIGHBITDEPTH
-     if (cm->use_highbitdepth) {
-       vp9_highbd_convolve_copy(best_pred->data, bw, pd->dst.buf, pd->dst.stride,
-                                NULL, 0, NULL, 0, bw, bh, xd->bd);
-     } else {
-       vp9_convolve_copy(best_pred->data, bw, pd->dst.buf, pd->dst.stride,
-                         NULL, 0, NULL, 0, bw, bh);
-     }
- #else
-     vp9_convolve_copy(best_pred->data, bw, pd->dst.buf, pd->dst.stride, NULL, 0,
-                       NULL, 0, bw, bh);
- #endif  // CONFIG_VP9_HIGHBITDEPTH
-   }
- 
    mbmi->mode          = best_mode;
    mbmi->interp_filter = best_pred_filter;
    mbmi->tx_size       = best_tx_size;