commit 6d69ba0c74209b18076b5a0a4a22b16cefcac277
author Jonathan Matthews <jonathan.matthews@argondesign.com> Fri Jan 27 12:01:12 2017 +0000
committer Urvang Joshi <urvang@google.com> Fri Jan 27 17:26:15 2017 +0000
tree 3892c40dfb067010787e04c90bcc5e1ea05abbe9
parent cda0b5e46c7c7936b13ded98fcd9d27a5497137b

Bugfix: decode_palette_tokens inverting stride and width.

Introduced in I745ca032f313c5041aacc98c03ae4bfc33d840de.
Stride should be plane_block_width and width should be cols,
 sanity check: cols <= plane_block_width.

Change-Id: Ic5128e94a909e498010c92fef2013da8df6d6d85

av1/decoder/detokenize.c

diff --git a/av1/decoder/detokenize.c b/av1/decoder/detokenize.c
index 50b24e0..30733f9 100644
--- a/av1/decoder/detokenize.c
+++ b/av1/decoder/detokenize.c
@@ -329,7 +329,7 @@
   for (i = 0; i < rows; ++i) {
     for (j = (i == 0 ? 1 : 0); j < cols; ++j) {
       const int color_ctx = av1_get_palette_color_context(
-          color_map, plane_block_width, cols, i, j, n, color_order, NULL);
+          color_map, cols, plane_block_width, i, j, n, color_order, NULL);
       const int color_idx = aom_read_tree(r, av1_palette_color_tree[n - 2],
                                           prob[n - 2][color_ctx], ACCT_STR);
       assert(color_idx >= 0 && color_idx < n);