commit 1d569bead4a6821a740886328daa3c0a7fadce1e
author Yunqing Wang <yunqingwang@google.com> Wed Oct 09 13:23:12 2019 -0700
committer Yunqing Wang <yunqingwang@google.com> Thu Oct 10 16:32:18 2019 +0000
tree 32242e0dae0cb4af565cfefbadafd6d75957da7c
parent 86e672d599d9ddf98de332a073da42d255bbd126

Allocate proper buffer border

For alt_ref_buffer, use the same border as lookahead buffers, and
allocate proper buffer border.

Speed 1 Borg test result:
         avg_psnr: ovr_psnr:  ssim:
lowres:   0.000    0.000      0.000
midres:   0.000    0.000      0.000
hdres:   -0.009   -0.008      0.003

STATS_CHANGED

Change-Id: Id53debe2e380f06541023aa20af0c550dfc08520

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 91640dc..88c3307 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -925,9 +925,9 @@
   AV1_COMMON *cm = &cpi->common;
   const SequenceHeader *const seq_params = &cm->seq_params;
   const AV1EncoderConfig *oxcf = &cpi->oxcf;
+  int is_scale = (oxcf->resize_mode || oxcf->superres_mode);
 
   if (!cpi->lookahead) {
-    int is_scale = (oxcf->resize_mode || oxcf->superres_mode);
     cpi->lookahead = av1_lookahead_init(
         oxcf->width, oxcf->height, seq_params->subsampling_x,
         seq_params->subsampling_y, seq_params->use_highbitdepth,
@@ -938,10 +938,12 @@
                        "Failed to allocate lag buffers");
 
   // TODO(agrange) Check if ARF is enabled and skip allocation if not.
+  // (yunqing)Here use same border as lookahead buffers.
   if (aom_realloc_frame_buffer(
           &cpi->alt_ref_buffer, oxcf->width, oxcf->height,
           seq_params->subsampling_x, seq_params->subsampling_y,
-          seq_params->use_highbitdepth, oxcf->border_in_pixels,
+          seq_params->use_highbitdepth,
+          is_scale ? oxcf->border_in_pixels : AOM_ENC_LOOKAHEAD_BORDER,
           cm->byte_alignment, NULL, NULL, NULL))
     aom_internal_error(&cm->error, AOM_CODEC_MEM_ERROR,
                        "Failed to allocate altref buffer");