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/common/restoration.c

diff --git a/av1/common/restoration.c b/av1/common/restoration.c
index 7ecf01d..b7ed9f9 100644
--- a/av1/common/restoration.c
+++ b/av1/common/restoration.c
@@ -40,12 +40,12 @@
 typedef void (*restore_func_type)(uint8_t *data8, int width, int height,
                                   int stride, RestorationInternal *rst,
                                   uint8_t *dst8, int dst_stride);
-#if CONFIG_AOM_HIGHBITDEPTH
+#if CONFIG_HIGHBITDEPTH
 typedef void (*restore_func_highbd_type)(uint8_t *data8, int width, int height,
                                          int stride, RestorationInternal *rst,
                                          int bit_depth, uint8_t *dst8,
                                          int dst_stride);
-#endif  // CONFIG_AOM_HIGHBITDEPTH
+#endif  // CONFIG_HIGHBITDEPTH
 
 int av1_alloc_restoration_struct(AV1_COMMON *cm, RestorationInfo *rst_info,
                                  int width, int height) {
@@ -929,7 +929,7 @@
   }
 }
 
-#if CONFIG_AOM_HIGHBITDEPTH
+#if CONFIG_HIGHBITDEPTH
 void extend_frame_highbd(uint16_t *data, int width, int height, int stride) {
   uint16_t *data_p;
   int i, j;
@@ -1216,7 +1216,7 @@
     }
   }
 }
-#endif  // CONFIG_AOM_HIGHBITDEPTH
+#endif  // CONFIG_HIGHBITDEPTH
 
 static void loop_restoration_rows(YV12_BUFFER_CONFIG *frame, AV1_COMMON *cm,
                                   int start_mi_row, int end_mi_row,
@@ -1233,16 +1233,16 @@
   restore_func_type restore_funcs[RESTORE_TYPES] = {
     NULL, loop_wiener_filter, loop_sgrproj_filter, loop_switchable_filter
   };
-#if CONFIG_AOM_HIGHBITDEPTH
+#if CONFIG_HIGHBITDEPTH
   restore_func_highbd_type restore_funcs_highbd[RESTORE_TYPES] = {
     NULL, loop_wiener_filter_highbd, loop_sgrproj_filter_highbd,
     loop_switchable_filter_highbd
   };
-#endif  // CONFIG_AOM_HIGHBITDEPTH
+#endif  // CONFIG_HIGHBITDEPTH
   restore_func_type restore_func;
-#if CONFIG_AOM_HIGHBITDEPTH
+#if CONFIG_HIGHBITDEPTH
   restore_func_highbd_type restore_func_highbd;
-#endif  // CONFIG_AOM_HIGHBITDEPTH
+#endif  // CONFIG_HIGHBITDEPTH
   YV12_BUFFER_CONFIG dst_;
 
   yend = AOMMIN(yend, cm->height);
@@ -1282,7 +1282,7 @@
     memset(dst, 0, sizeof(YV12_BUFFER_CONFIG));
     if (aom_realloc_frame_buffer(
             dst, cm->width, cm->height, cm->subsampling_x, cm->subsampling_y,
-#if CONFIG_AOM_HIGHBITDEPTH
+#if CONFIG_HIGHBITDEPTH
             cm->use_highbitdepth,
 #endif
             AOM_BORDER_IN_PIXELS, cm->byte_alignment, NULL, NULL, NULL) < 0)
@@ -1299,7 +1299,7 @@
       cm->rst_internal.rsi = &rsi[0];
       restore_func =
           restore_funcs[cm->rst_internal.rsi->frame_restoration_type];
-#if CONFIG_AOM_HIGHBITDEPTH
+#if CONFIG_HIGHBITDEPTH
       restore_func_highbd =
           restore_funcs_highbd[cm->rst_internal.rsi->frame_restoration_type];
       if (cm->use_highbitdepth)
@@ -1308,7 +1308,7 @@
             &cm->rst_internal, cm->bit_depth,
             dst->y_buffer + ystart * dst->y_stride, dst->y_stride);
       else
-#endif  // CONFIG_AOM_HIGHBITDEPTH
+#endif  // CONFIG_HIGHBITDEPTH
         restore_func(frame->y_buffer + ystart * ystride, ywidth, yend - ystart,
                      ystride, &cm->rst_internal,
                      dst->y_buffer + ystart * dst->y_stride, dst->y_stride);
@@ -1328,7 +1328,7 @@
       cm->rst_internal.rsi = &rsi[AOM_PLANE_U];
       restore_func =
           restore_funcs[cm->rst_internal.rsi->frame_restoration_type];
-#if CONFIG_AOM_HIGHBITDEPTH
+#if CONFIG_HIGHBITDEPTH
       restore_func_highbd =
           restore_funcs_highbd[cm->rst_internal.rsi->frame_restoration_type];
       if (cm->use_highbitdepth)
@@ -1337,7 +1337,7 @@
             uvstride, &cm->rst_internal, cm->bit_depth,
             dst->u_buffer + uvstart * dst->uv_stride, dst->uv_stride);
       else
-#endif  // CONFIG_AOM_HIGHBITDEPTH
+#endif  // CONFIG_HIGHBITDEPTH
         restore_func(frame->u_buffer + uvstart * uvstride, uvwidth,
                      uvend - uvstart, uvstride, &cm->rst_internal,
                      dst->u_buffer + uvstart * dst->uv_stride, dst->uv_stride);
@@ -1357,7 +1357,7 @@
       cm->rst_internal.rsi = &rsi[AOM_PLANE_V];
       restore_func =
           restore_funcs[cm->rst_internal.rsi->frame_restoration_type];
-#if CONFIG_AOM_HIGHBITDEPTH
+#if CONFIG_HIGHBITDEPTH
       restore_func_highbd =
           restore_funcs_highbd[cm->rst_internal.rsi->frame_restoration_type];
       if (cm->use_highbitdepth)
@@ -1366,7 +1366,7 @@
             uvstride, &cm->rst_internal, cm->bit_depth,
             dst->v_buffer + uvstart * dst->uv_stride, dst->uv_stride);
       else
-#endif  // CONFIG_AOM_HIGHBITDEPTH
+#endif  // CONFIG_HIGHBITDEPTH
         restore_func(frame->v_buffer + uvstart * uvstride, uvwidth,
                      uvend - uvstart, uvstride, &cm->rst_internal,
                      dst->v_buffer + uvstart * dst->uv_stride, dst->uv_stride);