From b08e2e23eec181e9951df33cd704ac294c5407b6 Mon Sep 17 00:00:00 2001 From: Vignesh Venkatasubramanian Date: Mon, 10 Mar 2014 09:50:31 -0700 Subject: libvpx: Roll latest libvpx and enable VP9 Encoder Rolling latest libvpx from upstream and generating configurations with VP9 Encoder enabled. Updating a mistake in UPDATING file. Upstream Hash: 1f08824d6db735e4cacb0419785a789395e42b2b Change-Id: Ie2c45e2253ade4a9ce88ca640cae39a7ece2d8f4 --- libvpx/vp9/encoder/vp9_lookahead.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'libvpx/vp9/encoder/vp9_lookahead.c') diff --git a/libvpx/vp9/encoder/vp9_lookahead.c b/libvpx/vp9/encoder/vp9_lookahead.c index c28c868..a88d5ec 100644 --- a/libvpx/vp9/encoder/vp9_lookahead.c +++ b/libvpx/vp9/encoder/vp9_lookahead.c @@ -11,9 +11,12 @@ #include #include "./vpx_config.h" + #include "vp9/common/vp9_common.h" + +#include "vp9/encoder/vp9_extend.h" #include "vp9/encoder/vp9_lookahead.h" -#include "vp9/common/vp9_extend.h" +#include "vp9/encoder/vp9_onyx_int.h" struct lookahead_ctx { unsigned int max_sz; /* Absolute size of the queue */ @@ -73,7 +76,7 @@ struct lookahead_ctx * vp9_lookahead_init(unsigned int width, for (i = 0; i < depth; i++) if (vp9_alloc_frame_buffer(&ctx->buf[i].img, width, height, subsampling_x, subsampling_y, - VP9BORDERINPIXELS)) + VP9_ENC_BORDER_IN_PIXELS)) goto bail; } return ctx; @@ -85,8 +88,7 @@ struct lookahead_ctx * vp9_lookahead_init(unsigned int width, #define USE_PARTIAL_COPY 0 int vp9_lookahead_push(struct lookahead_ctx *ctx, YV12_BUFFER_CONFIG *src, - int64_t ts_start, int64_t ts_end, unsigned int flags, - unsigned char *active_map) { + int64_t ts_start, int64_t ts_end, unsigned int flags) { struct lookahead_entry *buf; #if USE_PARTIAL_COPY int row, col, active_end; @@ -173,7 +175,6 @@ struct lookahead_entry * vp9_lookahead_peek(struct lookahead_ctx *ctx, int index) { struct lookahead_entry *buf = NULL; - assert(index < (int)ctx->max_sz); if (index < (int)ctx->sz) { index += ctx->read_idx; if (index >= (int)ctx->max_sz) -- cgit v1.2.3