shithub: libvpx

Download patch

ref: 4ebdb4a1b977717fbec7c9037ce8be8dd600460a
parent: abc5a6677064b330d53654743ec65990b1c45592
parent: e3d19bfc63347b01e30cd6fb8856c5d64d515c56
author: Debargha Mukherjee <debargha@google.com>
date: Tue Dec 16 01:41:54 EST 2014 

Merge "Fix for crash in highbitdepth rt mode"


--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -593,7 +593,16 @@
             unsigned int sse = 0;
             int sum = 0;
             if (x4_idx < pixels_wide && y4_idx < pixels_high) {
+#if CONFIG_VP9_HIGHBITDEPTH
+              int s_avg;
+              if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
+                s_avg = vp9_highbd_avg_4x4(s + y4_idx * sp + x4_idx, sp);
+              } else {
+                s_avg = vp9_avg_4x4(s + y4_idx * sp + x4_idx, sp);
+              }
+#else
               int s_avg = vp9_avg_4x4(s + y4_idx * sp + x4_idx, sp);
+#endif
               // For key frame, reference is set to 128.
               sum = s_avg - 128;
               sse = sum * sum;