commit fa455fcabb2a42eba4626622b27fd4279947efa9
author Jonathan Matthews <jonathan.matthews@argondesign.com> Fri Feb 02 16:22:51 2018 +0000
committer Yaowu Xu <yaowu@google.com> Sat Feb 10 19:05:42 2018 -0800
tree c1e84977309faada83075f9a200dbd7de3ae1dbb
parent 3c30fb48ab667ac8d72350551575e5c6f3b6d369

Make av1_decode_tg_tiles_and_wrapup handle highbd

BUG=aomedia:1310

Change-Id: Ibfa14836b1f80b54984b9d275f04ff842821cc6c

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 16dce8a..69d212d 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -3527,14 +3527,21 @@
   const int num_planes = av1_num_planes(cm);
   // If the bit stream is monochrome, set the U and V buffers to a constant.
   if (num_planes < 3) {
-    const int bytes_per_sample = cm->use_highbitdepth ? 2 : 1;
-
     YV12_BUFFER_CONFIG *cur_buf = (YV12_BUFFER_CONFIG *)xd->cur_buf;
+    const int val = 1 << (cm->bit_depth - 1);
 
     for (int buf_idx = 1; buf_idx <= 2; buf_idx++) {
       for (int row_idx = 0; row_idx < cur_buf->crop_heights[1]; row_idx++) {
-        memset(&cur_buf->buffers[buf_idx][row_idx * cur_buf->uv_stride], 1 << 7,
-               cur_buf->crop_widths[1] * bytes_per_sample);
+        if (cm->use_highbitdepth) {
+          // TODO(yaowu): replace this with aom_memset16() for speed
+          for (int col_idx = 0; col_idx < cur_buf->crop_widths[1]; col_idx++) {
+            uint16_t *base = CONVERT_TO_SHORTPTR(cur_buf->buffers[buf_idx]);
+            base[row_idx * cur_buf->uv_stride + col_idx] = val;
+          }
+        } else {
+          memset(&cur_buf->buffers[buf_idx][row_idx * cur_buf->uv_stride],
+                 1 << 7, cur_buf->crop_widths[1]);
+        }
       }
     }
   }