generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Fix tx-skip warnings on Windows" into nextgen

Browse Source
This commit is contained in:
hui su 2015-06-15 19:41:23 +00:00 committed by Gerrit Code Review
commit 0809dc09cb
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
vp9/common/vp9_scan.c
View File

@ -2760,30 +2760,25 @@ DECLARE_ALIGNED(16, static const int16_t, vp9_default_iscan_64x64[4096]) = {
#endif // CONFIG_TX64X64
#if CONFIG_TX_SKIP
DECLARE_ALIGNED(16, int16_t, vp9_default_scan_pxd_4x4[16]);
DECLARE_ALIGNED(16, int16_t, vp9_default_scan_pxd_8x8[64]);
DECLARE_ALIGNED(16, int16_t, vp9_default_scan_pxd_16x16[256]);
DECLARE_ALIGNED(16, int16_t, vp9_default_scan_pxd_32x32[1024]);
int16_t vp9_default_scan_pxd_4x4[16];
int16_t vp9_default_scan_pxd_8x8[64];
int16_t vp9_default_scan_pxd_16x16[256];
int16_t vp9_default_scan_pxd_32x32[1024];
DECLARE_ALIGNED(16, int16_t, vp9_default_iscan_pxd_4x4[16]);
DECLARE_ALIGNED(16, int16_t, vp9_default_iscan_pxd_8x8[64]);
DECLARE_ALIGNED(16, int16_t, vp9_default_iscan_pxd_16x16[256]);
DECLARE_ALIGNED(16, int16_t, vp9_default_iscan_pxd_32x32[1024]);
int16_t vp9_default_iscan_pxd_4x4[16];
int16_t vp9_default_iscan_pxd_8x8[64];
int16_t vp9_default_iscan_pxd_16x16[256];
int16_t vp9_default_iscan_pxd_32x32[1024];
DECLARE_ALIGNED(16, int16_t,
vp9_default_scan_pxd_4x4_neighbors[17 * MAX_NEIGHBORS]);
DECLARE_ALIGNED(16, int16_t,
vp9_default_scan_pxd_8x8_neighbors[65 * MAX_NEIGHBORS]);
DECLARE_ALIGNED(16, int16_t,
vp9_default_scan_pxd_16x16_neighbors[257 * MAX_NEIGHBORS]);
DECLARE_ALIGNED(16, int16_t,
vp9_default_scan_pxd_32x32_neighbors[1025 * MAX_NEIGHBORS]);
int16_t vp9_default_scan_pxd_4x4_neighbors[17 * MAX_NEIGHBORS];
int16_t vp9_default_scan_pxd_8x8_neighbors[65 * MAX_NEIGHBORS];
int16_t vp9_default_scan_pxd_16x16_neighbors[257 * MAX_NEIGHBORS];
int16_t vp9_default_scan_pxd_32x32_neighbors[1025 * MAX_NEIGHBORS];
#if CONFIG_TX64X64
DECLARE_ALIGNED(16, int16_t, vp9_default_scan_pxd_64x64[4096]);
DECLARE_ALIGNED(16, int16_t, vp9_default_iscan_pxd_64x64[4096]);
DECLARE_ALIGNED(16, int16_t,
vp9_default_scan_pxd_64x64_neighbors[4097 * MAX_NEIGHBORS]);
int16_t vp9_default_scan_pxd_64x64[4096];
int16_t vp9_default_iscan_pxd_64x64[4096];
int16_t vp9_default_scan_pxd_64x64_neighbors[4097 * MAX_NEIGHBORS];
#endif // CONFIG_TX64X64
const scan_order vp9_default_scan_orders_pxd[TX_SIZES] = {