commit dac5e391af658c5d0424f60fcb1e237848fa8c97
author Luc Trudeau <luc@trud.ca> Mon Jun 05 15:52:02 2017 -0400
committer Luc Trudeau <luc@trud.ca> Tue Jun 06 15:32:04 2017 +0000
tree 687e40610624cd8244f532aa7b28c032dbbba9ea
parent e2ac9855f226a66d5a570db9369b7ff213e60a5c

[CFL] Get subsampling from AV1 common

This change does not impact the bitstream
  PSNR | PSNR Cb | PSNR Cr | PSNR HVS |   SSIM | MS SSIM | CIEDE 2000
0.0000 |  0.0000 |  0.0000 |   0.0000 | 0.0000 |  0.0000 |     0.0000

Change-Id: I6e131e91bad5efa345ed2542ae970eb6122eff51

av1/common/cfl.c

diff --git a/av1/common/cfl.c b/av1/common/cfl.c
index 749a535..061bae0 100644
--- a/av1/common/cfl.c
+++ b/av1/common/cfl.c
@@ -15,16 +15,15 @@
 
 #include "aom/internal/aom_codec_internal.h"
 
-void cfl_init(CFL_CTX *cfl, AV1_COMMON *cm, int subsampling_x,
-              int subsampling_y) {
-  if (!((subsampling_x == 0 && subsampling_y == 0) ||
-        (subsampling_x == 1 && subsampling_y == 1))) {
+void cfl_init(CFL_CTX *cfl, AV1_COMMON *cm) {
+  if (!((cm->subsampling_x == 0 && cm->subsampling_y == 0) ||
+        (cm->subsampling_x == 1 && cm->subsampling_y == 1))) {
     aom_internal_error(&cm->error, AOM_CODEC_UNSUP_BITSTREAM,
                        "Only 4:4:4 and 4:2:0 are currently supported by CfL");
   }
   memset(&cfl->y_pix, 0, sizeof(uint8_t) * MAX_SB_SQUARE);
-  cfl->subsampling_x = subsampling_x;
-  cfl->subsampling_y = subsampling_y;
+  cfl->subsampling_x = cm->subsampling_x;
+  cfl->subsampling_y = cm->subsampling_y;
 }
 
 // CfL computes its own block-level DC_PRED. This is required to compute both