shithub: libvpx

Info  •  Files  •  Log  •  Branches

Use high bd path to substract blocks in hbd build.

BUG=webm:1609

Change-Id: Ifc15d616e7cfb247b399def64ef7691589d90075

--- a/test/vp9_end_to_end_test.cc

+++ b/test/vp9_end_to_end_test.cc

@@ -30,7 +30,7 @@

 const double kPsnrThreshold[][5] = {

   { 36.0, 37.0, 37.0, 37.0, 37.0 }, { 35.0, 36.0, 36.0, 36.0, 36.0 },

   { 34.0, 35.0, 35.0, 35.0, 35.0 }, { 33.0, 34.0, 34.0, 34.0, 34.0 },

-  { 32.0, 33.0, 33.0, 33.0, 33.0 }, { 31.0, 32.0, 32.0, 32.0, 32.0 },

+  { 32.0, 33.0, 33.0, 33.0, 33.0 }, { 30.5, 32.0, 32.0, 32.0, 32.0 },

   { 30.0, 31.0, 31.0, 31.0, 31.0 }, { 29.0, 30.0, 30.0, 30.0, 30.0 },

 };

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

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

@@ -698,9 +698,19 @@

   // The max tx_size passed in is TX_16X16.

   assert(tx_size != TX_32X32);

-

+#if CONFIG_VP9_HIGHBITDEPTH

+  if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {

+    vpx_highbd_subtract_block(bh, bw, p->src_diff, bw, p->src.buf,

+                              p->src.stride, pd->dst.buf, pd->dst.stride,

+                              x->e_mbd.bd);

+  } else {

+    vpx_subtract_block(bh, bw, p->src_diff, bw, p->src.buf, p->src.stride,

+                       pd->dst.buf, pd->dst.stride);

+  }

+#else

   vpx_subtract_block(bh, bw, p->src_diff, bw, p->src.buf, p->src.stride,

                      pd->dst.buf, pd->dst.stride);

+#endif

   *skippable = 1;

   // Keep track of the row and column of the blocks we use so that we know

   // if we are in the unrestricted motion border.