libvpx: Pull from upstream

source/libvpx/vp9/encoder/vp9_lookahead.c

 /*
  *  Copyright (c) 2011 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 <assert.h>
@@ skipping 20 matching lines @@
   return buf;
 }
 
 
 void vp9_lookahead_destroy(struct lookahead_ctx *ctx) {
   if (ctx) {
     if (ctx->buf) {
       unsigned int i;
 
       for (i = 0; i < ctx->max_sz; i++)
-        vp9_free_frame_buffer(&ctx->buf[i].img);
+        vpx_free_frame_buffer(&ctx->buf[i].img);
       free(ctx->buf);
     }
     free(ctx);
   }
 }
 
 
 struct lookahead_ctx *vp9_lookahead_init(unsigned int width,
                                          unsigned int height,
                                          unsigned int subsampling_x,
@@ skipping 13 matching lines @@
   // Allocate the lookahead structures
   ctx = calloc(1, sizeof(*ctx));
   if (ctx) {
     const int legacy_byte_alignment = 0;
     unsigned int i;
     ctx->max_sz = depth;
     ctx->buf = calloc(depth, sizeof(*ctx->buf));
     if (!ctx->buf)
       goto bail;
     for (i = 0; i < depth; i++)
-      if (vp9_alloc_frame_buffer(&ctx->buf[i].img,
+      if (vpx_alloc_frame_buffer(&ctx->buf[i].img,
                                  width, height, subsampling_x, subsampling_y,
 #if CONFIG_VP9_HIGHBITDEPTH
                                  use_highbitdepth,
 #endif
                                  VP9_ENC_BORDER_IN_PIXELS,
                                  legacy_byte_alignment))
         goto bail;
   }
   return ctx;
  bail:
@@ skipping 79 matching lines @@
         col = active_end;
       }
 
       active_map += mb_cols;
     }
   } else {
 #endif
     if (larger_dimensions) {
       YV12_BUFFER_CONFIG new_img;
       memset(&new_img, 0, sizeof(new_img));
-      if (vp9_alloc_frame_buffer(&new_img,
+      if (vpx_alloc_frame_buffer(&new_img,
                                  width, height, subsampling_x, subsampling_y,
 #if CONFIG_VP9_HIGHBITDEPTH
                                  use_highbitdepth,
 #endif
                                  VP9_ENC_BORDER_IN_PIXELS,
                                  0))
           return 1;
-      vp9_free_frame_buffer(&buf->img);
+      vpx_free_frame_buffer(&buf->img);
       buf->img = new_img;
     } else if (new_dimensions) {
       buf->img.y_crop_width = src->y_crop_width;
       buf->img.y_crop_height = src->y_crop_height;
       buf->img.uv_crop_width = src->uv_crop_width;
       buf->img.uv_crop_height = src->uv_crop_height;
       buf->img.subsampling_x = src->subsampling_x;
       buf->img.subsampling_y = src->subsampling_y;
     }
     // Partial copy not implemented yet
@@ skipping 42 matching lines @@
       buf = ctx->buf + index;
     }
   }
 
   return buf;
 }
 
 unsigned int vp9_lookahead_depth(struct lookahead_ctx *ctx) {
   return ctx->sz;
 }