commit 71e87847ebf1c8ef1c1cacc86ec19499eb266e0c
author Sebastien Alaiwan <sebastien.alaiwan@allegrodvt.com> Wed Apr 12 16:03:28 2017 +0200
committer James Zern <jzern@google.com> Wed Apr 12 22:29:11 2017 +0000
tree 0ae1062bcb1bd257d688fcaa7b9c309139772e45
parent f6214b964755bac807792a3d55d7bad66f0527ac

Homogenize configuration option name.

Rename '--enable-aom-highbitdepth' to '--enable-highbitdepth'

Change-Id: I1de13c3508c30c552532993419d8ace326142ab6

av1/encoder/pickrst.c

diff --git a/av1/encoder/pickrst.c b/av1/encoder/pickrst.c
index 103a0ec..58151f1 100644
--- a/av1/encoder/pickrst.c
+++ b/av1/encoder/pickrst.c
@@ -56,7 +56,7 @@
   // Y and UV components cannot be mixed
   assert(components_pattern == 1 || components_pattern == 2 ||
          components_pattern == 4 || components_pattern == 6);
-#if CONFIG_AOM_HIGHBITDEPTH
+#if CONFIG_HIGHBITDEPTH
   if (cm->use_highbitdepth) {
     if ((components_pattern >> AOM_PLANE_Y) & 1) {
       filt_err +=
@@ -72,7 +72,7 @@
     }
     return filt_err;
   }
-#endif  // CONFIG_AOM_HIGHBITDEPTH
+#endif  // CONFIG_HIGHBITDEPTH
   if ((components_pattern >> AOM_PLANE_Y) & 1) {
     filt_err += aom_get_y_sse_part(src, dst, h_start, width, v_start, height);
   }
@@ -90,7 +90,7 @@
                                      const YV12_BUFFER_CONFIG *dst,
                                      int components_pattern) {
   int64_t filt_err = 0;
-#if CONFIG_AOM_HIGHBITDEPTH
+#if CONFIG_HIGHBITDEPTH
   if (cm->use_highbitdepth) {
     if ((components_pattern >> AOM_PLANE_Y) & 1) {
       filt_err += aom_highbd_get_y_sse(src, dst);
@@ -105,7 +105,7 @@
   }
 #else
   (void)cm;
-#endif  // CONFIG_AOM_HIGHBITDEPTH
+#endif  // CONFIG_HIGHBITDEPTH
   if ((components_pattern >> AOM_PLANE_Y) & 1) {
     filt_err = aom_get_y_sse(src, dst);
   }
@@ -297,7 +297,7 @@
 
   for (ep = 0; ep < SGRPROJ_PARAMS; ep++) {
     int exq[2];
-#if CONFIG_AOM_HIGHBITDEPTH
+#if CONFIG_HIGHBITDEPTH
     if (bit_depth > 8) {
       uint16_t *dat = CONVERT_TO_SHORTPTR(dat8);
 #if USE_HIGHPASS_IN_SGRPROJ
@@ -322,7 +322,7 @@
 #endif  // USE_HIGHPASS_IN_SGRPROJ
       av1_selfguided_restoration(dat8, width, height, dat_stride, flt2, width,
                                  sgr_params[ep].r2, sgr_params[ep].e2, tmpbuf2);
-#if CONFIG_AOM_HIGHBITDEPTH
+#if CONFIG_HIGHBITDEPTH
     }
 #endif
     get_proj_subspace(src8, width, height, src_stride, dat8, dat_stride,
@@ -380,11 +380,11 @@
         dgd->y_buffer + v_start * dgd->y_stride + h_start, h_end - h_start,
         v_end - v_start, dgd->y_stride,
         src->y_buffer + v_start * src->y_stride + h_start, src->y_stride,
-#if CONFIG_AOM_HIGHBITDEPTH
+#if CONFIG_HIGHBITDEPTH
         cm->bit_depth,
 #else
         8,
-#endif  // CONFIG_AOM_HIGHBITDEPTH
+#endif  // CONFIG_HIGHBITDEPTH
         &rsi->sgrproj_info[tile_idx].ep, rsi->sgrproj_info[tile_idx].xqd,
         cm->rst_internal.tmpbuf);
     rsi->restoration_type[tile_idx] = RESTORE_SGRPROJ;
@@ -475,7 +475,7 @@
   }
 }
 
-#if CONFIG_AOM_HIGHBITDEPTH
+#if CONFIG_HIGHBITDEPTH
 static double find_average_highbd(uint16_t *src, int h_start, int h_end,
                                   int v_start, int v_end, int stride) {
   uint64_t sum = 0;
@@ -528,7 +528,7 @@
     }
   }
 }
-#endif  // CONFIG_AOM_HIGHBITDEPTH
+#endif  // CONFIG_HIGHBITDEPTH
 
 // Solves Ax = b, where x and b are column vectors
 static int linsolve(int n, double *A, int stride, double *b, double *x) {
@@ -795,21 +795,21 @@
                              WIENER_HALFWIN, &h_start, &h_end, &v_start,
                              &v_end);
     if (plane == AOM_PLANE_U) {
-#if CONFIG_AOM_HIGHBITDEPTH
+#if CONFIG_HIGHBITDEPTH
       if (cm->use_highbitdepth)
         compute_stats_highbd(dgd->u_buffer, src->u_buffer, h_start, h_end,
                              v_start, v_end, dgd_stride, src_stride, M, H);
       else
-#endif  // CONFIG_AOM_HIGHBITDEPTH
+#endif  // CONFIG_HIGHBITDEPTH
         compute_stats(dgd->u_buffer, src->u_buffer, h_start, h_end, v_start,
                       v_end, dgd_stride, src_stride, M, H);
     } else if (plane == AOM_PLANE_V) {
-#if CONFIG_AOM_HIGHBITDEPTH
+#if CONFIG_HIGHBITDEPTH
       if (cm->use_highbitdepth)
         compute_stats_highbd(dgd->v_buffer, src->v_buffer, h_start, h_end,
                              v_start, v_end, dgd_stride, src_stride, M, H);
       else
-#endif  // CONFIG_AOM_HIGHBITDEPTH
+#endif  // CONFIG_HIGHBITDEPTH
         compute_stats(dgd->v_buffer, src->v_buffer, h_start, h_end, v_start,
                       v_end, dgd_stride, src_stride, M, H);
     } else {
@@ -913,7 +913,7 @@
   }
 
 // Construct a (WIENER_HALFWIN)-pixel border around the frame
-#if CONFIG_AOM_HIGHBITDEPTH
+#if CONFIG_HIGHBITDEPTH
   if (cm->use_highbitdepth)
     extend_frame_highbd(CONVERT_TO_SHORTPTR(dgd->y_buffer), width, height,
                         dgd_stride);
@@ -936,12 +936,12 @@
     av1_get_rest_tile_limits(tile_idx, 0, 0, nhtiles, nvtiles, tile_width,
                              tile_height, width, height, 0, 0, &h_start, &h_end,
                              &v_start, &v_end);
-#if CONFIG_AOM_HIGHBITDEPTH
+#if CONFIG_HIGHBITDEPTH
     if (cm->use_highbitdepth)
       compute_stats_highbd(dgd->y_buffer, src->y_buffer, h_start, h_end,
                            v_start, v_end, dgd_stride, src_stride, M, H);
     else
-#endif  // CONFIG_AOM_HIGHBITDEPTH
+#endif  // CONFIG_HIGHBITDEPTH
       compute_stats(dgd->y_buffer, src->y_buffer, h_start, h_end, v_start,
                     v_end, dgd_stride, src_stride, M, H);