shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Add highbitdepth function for vp9_avg_8x8"

--- a/vp9/common/vp9_rtcd_defs.pl

+++ b/vp9/common/vp9_rtcd_defs.pl

@@ -1114,6 +1114,11 @@

 add_proto qw/unsigned int vp9_avg_8x8/, "const uint8_t *, int p";

 specialize qw/vp9_avg_8x8 sse2/;

+if (vpx_config("CONFIG_VP9_HIGHBITDEPTH") eq "yes") {

+  add_proto qw/unsigned int vp9_highbd_avg_8x8/, "const uint8_t *, int p";

+  specialize qw/vp9_highbd_avg_8x8/;

+}

+

 # ENCODEMB INVOKE

 add_proto qw/void vp9_subtract_block/, "int rows, int cols, int16_t *diff_ptr, ptrdiff_t diff_stride, const uint8_t *src_ptr, ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride";

--- a/vp9/encoder/vp9_avg.c

+++ b/vp9/encoder/vp9_avg.c

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

  *  in the file PATENTS.  All contributing project authors may

  *  be found in the AUTHORS file in the root of the source tree.

  */

+#include "vp9/common/vp9_common.h"

 #include "vpx_ports/mem.h"

 unsigned int vp9_avg_8x8_c(const uint8_t *s, int p) {

@@ -17,3 +18,16 @@

   return (sum + 32) >> 6;

 }

+

+#if CONFIG_VP9_HIGHBITDEPTH

+unsigned int vp9_highbd_avg_8x8_c(const uint8_t *s8, int p) {

+  int i, j;

+  int sum = 0;

+  const uint16_t* s = CONVERT_TO_SHORTPTR(s8);

+  for (i = 0; i < 8; ++i, s+=p)

+    for (j = 0; j < 8; sum += s[j], ++j) {}

+

+  return (sum + 32) >> 6;

+}

+#endif  // CONFIG_VP9_HIGHBITDEPTH

+

--- a/vp9/encoder/vp9_encodeframe.c

+++ b/vp9/encoder/vp9_encodeframe.c

@@ -533,8 +533,19 @@

         int sum = 0;

         if (x_idx < pixels_wide && y_idx < pixels_high) {

-          int s_avg = vp9_avg_8x8(s + y_idx * sp + x_idx, sp);

-          int d_avg = vp9_avg_8x8(d + y_idx * dp + x_idx, dp);

+          int s_avg, d_avg;

+#if CONFIG_VP9_HIGHBITDEPTH

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

+            s_avg = vp9_highbd_avg_8x8(s + y_idx * sp + x_idx, sp);

+            d_avg = vp9_highbd_avg_8x8(d + y_idx * dp + x_idx, dp);

+          } else {

+            s_avg = vp9_avg_8x8(s + y_idx * sp + x_idx, sp);

+            d_avg = vp9_avg_8x8(d + y_idx * dp + x_idx, dp);

+          }

+#else

+          s_avg = vp9_avg_8x8(s + y_idx * sp + x_idx, sp);

+          d_avg = vp9_avg_8x8(d + y_idx * dp + x_idx, dp);

+#endif

           sum = s_avg - d_avg;

           sse = sum * sum;

         }