libvpx: Pull from upstream

source/libvpx/vp8/encoder/encodeframe.c

 /*
  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 
 #include "vpx_config.h"
 #include "vp8_rtcd.h"
+#include "./vpx_dsp_rtcd.h"
 #include "encodemb.h"
 #include "encodemv.h"
 #include "vp8/common/common.h"
 #include "onyx_int.h"
 #include "vp8/common/extend.h"
 #include "vp8/common/entropymode.h"
 #include "vp8/common/quant_common.h"
 #include "segmentation.h"
 #include "vp8/common/setupintrarecon.h"
 #include "encodeintra.h"
@@ skipping 59 matching lines @@
     unsigned int act;
     unsigned int sse;
     (void)cpi;
     /* TODO: This could also be done over smaller areas (8x8), but that would
      *  require extensive changes elsewhere, as lambda is assumed to be fixed
      *  over an entire MB in most of the code.
      * Another option is to compute four 8x8 variances, and pick a single
      *  lambda using a non-linear combination (e.g., the smallest, or second
      *  smallest, etc.).
      */
-    act =  vp8_variance16x16(x->src.y_buffer,
+    act =  vpx_variance16x16(x->src.y_buffer,
                     x->src.y_stride, VP8_VAR_OFFS, 0, &sse);
     act = act<<4;
 
     /* If the region is flat, lower the activity some more. */
     if (act < 8<<12)
         act = act < 5<<12 ? act : 5<<12;
 
     return act;
 }
 
@@ skipping 1310 matching lines @@
             vp8_fix_contexts(xd);
         }
         else
         {
             vp8_stuff_mb(cpi, x, t);
         }
     }
 
     return rate;
 }