ref: 666ecf21dff74385442b18bebcc169c5ca6ef155
parent: 3ab4d5719669af665e03ea5bd0a96164f8ccabff
author: Alex Converse <aconverse@google.com>
date: Wed Apr 9 07:39:59 EDT 2014
Cleanup table declarations in vp9_rdopt. Change-Id: Ia4bef41a6b0252593ad84612a2a143c724fd03ea
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -81,7 +81,7 @@
const scan_order *so;
};
-const MODE_DEFINITION vp9_mode_order[MAX_MODES] = {+static const MODE_DEFINITION vp9_mode_order[MAX_MODES] = { {NEARESTMV, {LAST_FRAME, NONE}}, {NEARESTMV, {ALTREF_FRAME, NONE}}, {NEARESTMV, {GOLDEN_FRAME, NONE}},@@ -121,7 +121,7 @@
{D45_PRED, {INTRA_FRAME, NONE}},};
-const REF_DEFINITION vp9_ref_order[MAX_REFS] = {+static const REF_DEFINITION vp9_ref_order[MAX_REFS] = { {{LAST_FRAME, NONE}}, {{GOLDEN_FRAME, NONE}}, {{ALTREF_FRAME, NONE}},@@ -134,8 +134,9 @@
// certain modes are assumed to be based on 8x8 blocks.
// This table is used to correct for blocks size.
// The factors here are << 2 (2 = x0.5, 32 = x8 etc).
-static int rd_thresh_block_size_factor[BLOCK_SIZES] =
- {2, 3, 3, 4, 6, 6, 8, 12, 12, 16, 24, 24, 32};+static const uint8_t rd_thresh_block_size_factor[BLOCK_SIZES] = {+ 2, 3, 3, 4, 6, 6, 8, 12, 12, 16, 24, 24, 32
+};
static int raster_block_offset(BLOCK_SIZE plane_bsize,
int raster_block, int stride) {@@ -192,7 +193,7 @@
}
}
-static const int rd_iifactor[32] = {+static const uint8_t rd_iifactor[32] = {4, 4, 3, 2, 1, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
--
⑨