diff options
Diffstat (limited to 'third_party/aom/av1/encoder/lookahead.c')
| -rw-r--r-- | third_party/aom/av1/encoder/lookahead.c | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/third_party/aom/av1/encoder/lookahead.c b/third_party/aom/av1/encoder/lookahead.c index 591ca6152..1bf8ecbac 100644 --- a/third_party/aom/av1/encoder/lookahead.c +++ b/third_party/aom/av1/encoder/lookahead.c @@ -11,10 +11,9 @@ #include <assert.h> #include <stdlib.h> -#include "./aom_config.h" +#include "config/aom_config.h" #include "av1/common/common.h" - #include "av1/encoder/encoder.h" #include "av1/encoder/extend.h" #include "av1/encoder/lookahead.h" @@ -42,14 +41,9 @@ void av1_lookahead_destroy(struct lookahead_ctx *ctx) { } } -struct lookahead_ctx *av1_lookahead_init(unsigned int width, - unsigned int height, - unsigned int subsampling_x, - unsigned int subsampling_y, -#if CONFIG_HIGHBITDEPTH - int use_highbitdepth, -#endif - unsigned int depth) { +struct lookahead_ctx *av1_lookahead_init( + unsigned int width, unsigned int height, unsigned int subsampling_x, + unsigned int subsampling_y, int use_highbitdepth, unsigned int depth) { struct lookahead_ctx *ctx = NULL; // Clamp the lookahead queue depth @@ -68,10 +62,7 @@ struct lookahead_ctx *av1_lookahead_init(unsigned int width, if (!ctx->buf) goto bail; for (i = 0; i < depth; i++) if (aom_alloc_frame_buffer(&ctx->buf[i].img, width, height, subsampling_x, - subsampling_y, -#if CONFIG_HIGHBITDEPTH - use_highbitdepth, -#endif + subsampling_y, use_highbitdepth, AOM_BORDER_IN_PIXELS, legacy_byte_alignment)) goto bail; } @@ -84,10 +75,7 @@ bail: #define USE_PARTIAL_COPY 0 int av1_lookahead_push(struct lookahead_ctx *ctx, YV12_BUFFER_CONFIG *src, - int64_t ts_start, int64_t ts_end, -#if CONFIG_HIGHBITDEPTH - int use_highbitdepth, -#endif + int64_t ts_start, int64_t ts_end, int use_highbitdepth, aom_enc_frame_flags_t flags) { struct lookahead_entry *buf; #if USE_PARTIAL_COPY @@ -160,10 +148,7 @@ int av1_lookahead_push(struct lookahead_ctx *ctx, YV12_BUFFER_CONFIG *src, YV12_BUFFER_CONFIG new_img; memset(&new_img, 0, sizeof(new_img)); if (aom_alloc_frame_buffer(&new_img, width, height, subsampling_x, - subsampling_y, -#if CONFIG_HIGHBITDEPTH - use_highbitdepth, -#endif + subsampling_y, use_highbitdepth, AOM_BORDER_IN_PIXELS, 0)) return 1; aom_free_frame_buffer(&buf->img); |