commit 3ec16a3e1c2ce44973260955127e251dce905068
author Luc Trudeau <luc@trud.ca> Thu Mar 01 20:58:09 2018 -0500
committer Luc Trudeau <luc@trud.ca> Fri Mar 02 14:46:56 2018 +0000
tree 6bd4959f795f13ddc4a88c786c2521d9217d70f2
parent 5018f6a8cf8ccd480a7f556e34fdccd2bc910e1a

Remove CONFIG_CFL macro

Change-Id: I5c39b364b8614f10658c0adaddbf5628a9f11536

av1/common/av1_rtcd_defs.pl

diff --git a/av1/common/av1_rtcd_defs.pl b/av1/common/av1_rtcd_defs.pl
index a05b1f7..9f46879 100755
--- a/av1/common/av1_rtcd_defs.pl
+++ b/av1/common/av1_rtcd_defs.pl
@@ -36,7 +36,6 @@
 union int_mv;
 struct yv12_buffer_config;
 
-#if CONFIG_CFL
 /* Function pointers return by CfL functions */
 typedef void (*cfl_subsample_lbd_fn)(const uint8_t *input, int input_stride,
                                      int16_t *output_q3);
@@ -53,7 +52,6 @@
 typedef void (*cfl_predict_hbd_fn)(const int16_t *pred_buf_q3, uint16_t *dst,
                                    int dst_stride, TX_SIZE tx_size,
                                    int alpha_q3, int bd);
-#endif
 EOF
 }
 forward_decls qw/av1_common_forward_decls/;
@@ -565,18 +563,16 @@
 specialize qw/av1_upsample_intra_edge_high sse4_1/;
 
 # CFL
-if (aom_config("CONFIG_CFL") eq "yes") {
-  add_proto qw/cfl_subtract_average_fn get_subtract_average_fn/, "TX_SIZE tx_size";
-  specialize qw/get_subtract_average_fn sse2 avx2 neon/;
+add_proto qw/cfl_subtract_average_fn get_subtract_average_fn/, "TX_SIZE tx_size";
+specialize qw/get_subtract_average_fn sse2 avx2 neon/;
 
-  add_proto qw/cfl_subsample_lbd_fn cfl_get_luma_subsampling_420_lbd/, "TX_SIZE tx_size";
-  specialize qw/cfl_get_luma_subsampling_420_lbd ssse3 avx2/;
+add_proto qw/cfl_subsample_lbd_fn cfl_get_luma_subsampling_420_lbd/, "TX_SIZE tx_size";
+specialize qw/cfl_get_luma_subsampling_420_lbd ssse3 avx2/;
 
-  add_proto qw/cfl_predict_lbd_fn get_predict_lbd_fn/, "TX_SIZE tx_size";
-  specialize qw/get_predict_lbd_fn ssse3 avx2/;
+add_proto qw/cfl_predict_lbd_fn get_predict_lbd_fn/, "TX_SIZE tx_size";
+specialize qw/get_predict_lbd_fn ssse3 avx2/;
 
-  add_proto qw/cfl_predict_hbd_fn get_predict_hbd_fn/, "TX_SIZE tx_size";
-  specialize qw/get_predict_hbd_fn ssse3 avx2/;
-}
+add_proto qw/cfl_predict_hbd_fn get_predict_hbd_fn/, "TX_SIZE tx_size";
+specialize qw/get_predict_hbd_fn ssse3 avx2/;
 
 1;