commit 105b72c12ee93389401e49b1dff5a555712f34ed
author hui su <huisu@google.com> Thu Jul 13 10:36:23 2017 -0700
committer Hui Su <huisu@google.com> Thu Jul 13 19:40:17 2017 +0000
tree 6eb7fa93fc25d27438b4f797c0ff86a88b244462
parent 00021354b558bec28ad6302c43840e2517a5587c

Handle hbd in is_screen_content()

BUG=aomedia:654

Change-Id: Ic77a456246f87acb59ae95ddd4c421e741a99789

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index a206673..8a65d88 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -5029,8 +5029,11 @@
 #if CONFIG_PALETTE
 // Estimate if the source frame is screen content, based on the portion of
 // blocks that have no more than 4 (experimentally selected) luma colors.
-static int is_screen_content(const uint8_t *src, int stride, int width,
-                             int height) {
+static int is_screen_content(const uint8_t *src,
+#if CONFIG_HIGHBITDEPTH
+                             int use_hbd, int bd,
+#endif  // CONFIG_HIGHBITDEPTH
+                             int stride, int width, int height) {
   assert(src != NULL);
   int counts = 0;
   const int blk_w = 16;
@@ -5039,7 +5042,12 @@
   for (int r = 0; r + blk_h <= height; r += blk_h) {
     for (int c = 0; c + blk_w <= width; c += blk_w) {
       const int n_colors =
-          av1_count_colors(src + r * stride + c, stride, blk_w, blk_h);
+#if CONFIG_HIGHBITDEPTH
+          use_hbd ? av1_count_colors_highbd(src + r * stride + c, stride, blk_w,
+                                            blk_h, bd)
+                  :
+#endif  // CONFIG_HIGHBITDEPTH
+                  av1_count_colors(src + r * stride + c, stride, blk_w, blk_h);
       if (n_colors > 1 && n_colors <= limit) counts++;
     }
   }
@@ -5076,9 +5084,12 @@
 
 #if CONFIG_PALETTE
   if (cpi->auto_tune_content && frame_is_intra_only(cm)) {
-    cm->allow_screen_content_tools =
-        is_screen_content(cpi->source->y_buffer, cpi->source->y_stride,
-                          cpi->source->y_width, cpi->source->y_height);
+    cm->allow_screen_content_tools = is_screen_content(
+        cpi->source->y_buffer,
+#if CONFIG_HIGHBITDEPTH
+        cpi->source->flags & YV12_FLAG_HIGHBITDEPTH, xd->bd,
+#endif  // CONFIG_HIGHBITDEPTH
+        cpi->source->y_stride, cpi->source->y_width, cpi->source->y_height);
   }
 #endif  // CONFIG_PALETTE