commit f883962882fa085ec36b2e25d494254ef8a43751
author Yaowu Xu <yaowu@google.com> Mon Aug 15 12:15:30 2016 -0700
committer Yaowu Xu <yaowu@google.com> Tue Aug 16 13:43:46 2016 +0000
tree 371ffcdddc0209bb338d53678ce2f7609bbf712e
parent de9089f5a5736cdbe9eeedc1b8b940340c4d2b90

yv12config.c: remove dead CONFIG_ALPHA code

cherry picked from libvpx: 29b9461.

Change-Id: Ic763d567e757f7b2a8ed751bbe46653eb2b2ad3c

aom_scale/generic/yv12config.c

diff --git a/aom_scale/generic/yv12config.c b/aom_scale/generic/yv12config.c
index 554965b..8e1ac0b 100644
--- a/aom_scale/generic/yv12config.c
+++ b/aom_scale/generic/yv12config.c
@@ -157,31 +157,12 @@
     const uint64_t uvplane_size =
         (uv_height + 2 * uv_border_h) * (uint64_t)uv_stride + byte_alignment;
 
-#if CONFIG_ALPHA
-    const int alpha_width = aligned_width;
-    const int alpha_height = aligned_height;
-    const int alpha_stride = y_stride;
-    const int alpha_border_w = border;
-    const int alpha_border_h = border;
-    const uint64_t alpha_plane_size =
-        (alpha_height + 2 * alpha_border_h) * (uint64_t)alpha_stride +
-        byte_alignment;
-#if CONFIG_AOM_HIGHBITDEPTH
-    const uint64_t frame_size =
-        (1 + use_highbitdepth) *
-        (yplane_size + 2 * uvplane_size + alpha_plane_size);
-#else
-    const uint64_t frame_size =
-        yplane_size + 2 * uvplane_size + alpha_plane_size;
-#endif  // CONFIG_AOM_HIGHBITDEPTH
-#else
 #if CONFIG_AOM_HIGHBITDEPTH
     const uint64_t frame_size =
         (1 + use_highbitdepth) * (yplane_size + 2 * uvplane_size);
 #else
     const uint64_t frame_size = yplane_size + 2 * uvplane_size;
 #endif  // CONFIG_AOM_HIGHBITDEPTH
-#endif  // CONFIG_ALPHA
 
     uint8_t *buf = NULL;
 
@@ -271,15 +252,6 @@
                                        (uv_border_h * uv_stride) + uv_border_w,
                                    aom_byte_align);
 
-#if CONFIG_ALPHA
-    ybf->alpha_width = alpha_width;
-    ybf->alpha_height = alpha_height;
-    ybf->alpha_stride = alpha_stride;
-    ybf->alpha_buffer = (uint8_t *)yv12_align_addr(
-        buf + yplane_size + 2 * uvplane_size + (alpha_border_h * alpha_stride) +
-            alpha_border_w,
-        aom_byte_align);
-#endif
     ybf->corrupted = 0; /* assume not corrupted by errors */
     return 0;
   }