diff options
| author | Alex Converse <aconverse@google.com> | 2014-04-09 11:39:59 -0700 |
|---|---|---|
| committer | Alex Converse <aconverse@google.com> | 2014-04-09 14:22:39 -0700 |
| commit | 666ecf21dff74385442b18bebcc169c5ca6ef155 (patch) | |
| tree | aa21448375a87d6228024e0a6b2b59f5961dd72e /vp9/encoder/vp9_rdopt.c | |
| parent | 3ab4d5719669af665e03ea5bd0a96164f8ccabff (diff) | |
| download | libvpx-666ecf21dff74385442b18bebcc169c5ca6ef155.tar libvpx-666ecf21dff74385442b18bebcc169c5ca6ef155.tar.gz libvpx-666ecf21dff74385442b18bebcc169c5ca6ef155.tar.bz2 libvpx-666ecf21dff74385442b18bebcc169c5ca6ef155.zip | |
Cleanup table declarations in vp9_rdopt.
Change-Id: Ia4bef41a6b0252593ad84612a2a143c724fd03ea
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 233c4b2b2..8bc208046 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -81,7 +81,7 @@ struct rdcost_block_args { 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 @@ const MODE_DEFINITION vp9_mode_order[MAX_MODES] = { {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 @@ const REF_DEFINITION vp9_ref_order[MAX_REFS] = { // 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 void fill_token_costs(vp9_coeff_cost *c, } } -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, |