ref: 6a0e7715552758f016d3a79838021528b6bf9bf2
parent: 989d53686152291884ca73220a3cf6aee5c88c20
parent: 69c7ad340721e9ca3659af054808c10aa91980df
author: Hui Su <huisu@google.com>
date: Fri Apr 8 14:03:21 EDT 2016
Merge "Correct comments for scan order neighbors"
--- a/vp10/common/scan.c
+++ b/vp10/common/scan.c
@@ -229,10 +229,8 @@
990, 959, 1022, 991, 1023,
};
-// Neighborhood 5-tuples for various scans and blocksizes,
-// in {top, left, topleft, topright, bottomleft} order-// for each position in raster scan order.
-// -1 indicates the neighbor does not exist.
+// Neighborhood 2-tuples for various scans and blocksizes,
+// in {top, left} order for each position in corresponding scan order.DECLARE_ALIGNED(16, static const int16_t,
default_scan_4x4_neighbors[17 * MAX_NEIGHBORS]) = {0, 0, 0, 0, 0, 0, 1, 4, 4, 4, 1, 1, 8, 8, 5, 8, 2, 2, 2, 5, 9, 12, 6, 9,
--- a/vp9/common/vp9_scan.c
+++ b/vp9/common/vp9_scan.c
@@ -229,10 +229,8 @@
990, 959, 1022, 991, 1023,
};
-// Neighborhood 5-tuples for various scans and blocksizes,
-// in {top, left, topleft, topright, bottomleft} order-// for each position in raster scan order.
-// -1 indicates the neighbor does not exist.
+// Neighborhood 2-tuples for various scans and blocksizes,
+// in {top, left} order for each position in corresponding scan order.DECLARE_ALIGNED(16, static const int16_t,
default_scan_4x4_neighbors[17 * MAX_NEIGHBORS]) = {0, 0, 0, 0, 0, 0, 1, 4, 4, 4, 1, 1, 8, 8, 5, 8, 2, 2, 2, 5, 9, 12, 6, 9,