From d2499ead93dc4298c0882fe98902acb1b5209f99 Mon Sep 17 00:00:00 2001 From: trav90 Date: Fri, 19 Oct 2018 23:05:00 -0500 Subject: Update libaom to commit ID 1e227d41f0616de9548a673a83a21ef990b62591 --- third_party/aom/aom_scale/yv12config.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'third_party/aom/aom_scale/yv12config.h') diff --git a/third_party/aom/aom_scale/yv12config.h b/third_party/aom/aom_scale/yv12config.h index 2b4f597b0..2fb81acd7 100644 --- a/third_party/aom/aom_scale/yv12config.h +++ b/third_party/aom/aom_scale/yv12config.h @@ -9,8 +9,8 @@ * PATENTS file, you can obtain it at www.aomedia.org/license/patent. */ -#ifndef AOM_SCALE_YV12CONFIG_H_ -#define AOM_SCALE_YV12CONFIG_H_ +#ifndef AOM_AOM_SCALE_YV12CONFIG_H_ +#define AOM_AOM_SCALE_YV12CONFIG_H_ #ifdef __cplusplus extern "C" { @@ -28,7 +28,11 @@ extern "C" { // TODO(jingning): Use unified inter predictor for encoder and // decoder during the development process. Revisit the frame border // to improve the decoder performance. +#if CONFIG_REDUCED_ENCODER_BORDER +#define AOM_BORDER_IN_PIXELS 160 +#else #define AOM_BORDER_IN_PIXELS 288 +#endif // CONFIG_REDUCED_ENCODER_BORDER typedef struct yv12_buffer_config { union { @@ -136,4 +140,4 @@ int aom_free_frame_buffer(YV12_BUFFER_CONFIG *ybf); } #endif -#endif // AOM_SCALE_YV12CONFIG_H_ +#endif // AOM_AOM_SCALE_YV12CONFIG_H_ -- cgit v1.2.3