shithub: libvpx

Info  •  Files  •  Log  •  Branches

Fix chrome valgrind warning due to the use of mismatched bsize

This commit fixes a mismatched use case of block size in non-RD
intra prediction check. The residual SSE and variance should be
calculated per transform block size, instead of operating block
size, which caused chrome valgrind warning on conditional jump
based on uninitialized value (webm issue 823). This commit
resolves this issue.

Change-Id: I595c06599c7e0fd0e4a08736519ba68fc14bc79a

--- a/vp9/common/vp9_common_data.c

+++ b/vp9/common/vp9_common_data.c

@@ -107,6 +107,13 @@

   TX_32X32, TX_32X32, TX_32X32, TX_32X32

 };

+const BLOCK_SIZE txsize_to_bsize[TX_SIZES] = {

+    BLOCK_4X4,  // TX_4X4

+    BLOCK_8X8,  // TX_8X8

+    BLOCK_16X16,  // TX_16X16

+    BLOCK_32X32,  // TX_32X32

+};

+

 const TX_SIZE tx_mode_to_biggest_tx_size[TX_MODES] = {

   TX_4X4,  // ONLY_4X4

   TX_8X8,  // ALLOW_8X8

--- a/vp9/common/vp9_common_data.h

+++ b/vp9/common/vp9_common_data.h

@@ -29,6 +29,7 @@

 extern const PARTITION_TYPE partition_lookup[][BLOCK_SIZES];

 extern const BLOCK_SIZE subsize_lookup[PARTITION_TYPES][BLOCK_SIZES];

 extern const TX_SIZE max_txsize_lookup[BLOCK_SIZES];

+extern const BLOCK_SIZE txsize_to_bsize[TX_SIZES];

 extern const TX_SIZE tx_mode_to_biggest_tx_size[TX_MODES];

 extern const BLOCK_SIZE ss_size_lookup[BLOCK_SIZES][2][2];

--- a/vp9/encoder/vp9_pickmode.c

+++ b/vp9/encoder/vp9_pickmode.c

@@ -681,6 +681,7 @@

     int i, j;

     const int width  = num_4x4_blocks_wide_lookup[bsize];

     const int height = num_4x4_blocks_high_lookup[bsize];

+    const BLOCK_SIZE bsize_tx = txsize_to_bsize[mbmi->tx_size];

     int rate2 = 0;

     int64_t dist2 = 0;

@@ -706,7 +707,7 @@

                                   src_stride,

                                   &pd->dst.buf[4 * (j * dst_stride + i)],

                                   dst_stride, i, j, 0);

-          model_rd_for_sb_y(cpi, bsize, x, xd, &rate, &dist, &var_y, &sse_y);

+          model_rd_for_sb_y(cpi, bsize_tx, x, xd, &rate, &dist, &var_y, &sse_y);

           rate2 += rate;

           dist2 += dist;

           ++block_idx;