commit d3df694fa8dc0ddd4d414dcb7091ad6e450283ad
author Geza Lore <gezalore@gmail.com> Wed Jun 15 10:49:37 2016 +0100
committer Geza Lore <gezalore@gmail.com> Wed Jun 15 10:52:29 2016 +0100
tree bcd5c29c9c2040273afa0455d49e3bb4375ab133
parent 1f493d1ff8418bdd8e18a4f124b83b26f8ceb7a0

Fix estimate_wedge_sign with high bit-depth.

This fixes some crashes in
VP10/EndToEndTestLarge.EndtoEndPSNRTest/ with high bit-depth and
ext-inter.

Change-Id: I10f0f08e1be4bd5c388616074d4aa3f91a2fda7a

vp10/encoder/rdopt.c

diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c
index 36e6282..de5571f 100644
--- a/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c
@@ -6577,6 +6577,13 @@
   uint32_t esq[2][4], var;
   int64_t tl, br;
 
+#if CONFIG_VP9_HIGHBITDEPTH
+  if (x->e_mbd.cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
+    pred0 = CONVERT_TO_BYTEPTR(pred0);
+    pred1 = CONVERT_TO_BYTEPTR(pred1);
+  }
+#endif  // CONFIG_VP9_HIGHBITDEPTH
+
   var = cpi->fn_ptr[f_index].vf(
       src, src_stride,
       pred0, stride0, &esq[0][0]);