Commit 96b31516 authored by Luc Trudeau's avatar Luc Trudeau

[CFL] Fix warnings when chroma_sub8x8 is disabled

This change does not alter the bitstream

Resuls on Subset1 (compared to 70a80a81 with cfl)
  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: I7672eb4cde3c649ebba32610f7e56500e378c062
parent 70a80a81
......@@ -285,11 +285,9 @@ void cfl_store(CFL_CTX *cfl, const uint8_t *input, int input_stride, int row,
#if CONFIG_CHROMA_SUB8X8
if (bsize < BLOCK_8X8) {
#if CONFIG_DEBUG
// Transform cannot be smaller than
assert(tx_width >= 4);
assert(tx_height >= 4);
#endif
const int bw = block_size_wide[bsize];
const int bh = block_size_high[bsize];
......@@ -316,6 +314,8 @@ void cfl_store(CFL_CTX *cfl, const uint8_t *input, int input_stride, int row,
col++;
}
}
#else
(void)bsize;
#endif
// Invalidate current parameters
......
......@@ -660,7 +660,7 @@ static void predict_and_reconstruct_intra_block(
#if CONFIG_CFL
if (plane == AOM_PLANE_Y) {
struct macroblockd_plane *const pd = &xd->plane[plane];
#if CONFIG_CB4X4 && !CONFIG_CHROMA_2X2
#if CONFIG_CHROMA_SUB8X8
const BLOCK_SIZE plane_bsize =
AOMMAX(BLOCK_4X4, get_plane_block_size(mbmi->sb_type, pd));
#else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment