From 65df9904ceb5477a63e99e1e8fd8ace9a7cb8bda Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sun, 15 Feb 2015 20:03:02 +0100 Subject: dca: Add array sizes to array declarations --- libavcodec/dcadata.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'libavcodec/dcadata.h') diff --git a/libavcodec/dcadata.h b/libavcodec/dcadata.h index 8be4475d15..e3ea4aca2d 100644 --- a/libavcodec/dcadata.h +++ b/libavcodec/dcadata.h @@ -6266,7 +6266,7 @@ DECLARE_ALIGNED(8, static const int8_t, high_freq_vq)[1024][32] = { /* FIR filter coefficients, they can be cut on half and maybe use float instead of double */ -DECLARE_ALIGNED(16, static const float, fir_32bands_perfect)[] = { +DECLARE_ALIGNED(16, static const float, fir_32bands_perfect)[512] = { +1.135985195E-010, +7.018770981E-011, -1.608403011E-008, @@ -6781,7 +6781,7 @@ DECLARE_ALIGNED(16, static const float, fir_32bands_perfect)[] = { -1.135985195E-010 }; -DECLARE_ALIGNED(16, static const float, fir_32bands_nonperfect)[] = { +DECLARE_ALIGNED(16, static const float, fir_32bands_nonperfect)[512] = { -1.390191784E-007, -1.693738625E-007, -2.030677564E-007, @@ -7298,7 +7298,7 @@ DECLARE_ALIGNED(16, static const float, fir_32bands_nonperfect)[] = { /* pre-scale lfe fir coefficients */ #define SCALE(c) ((c) / (256.0f * 32768.0f)) -DECLARE_ALIGNED(16, static const float, lfe_fir_64)[] = { +DECLARE_ALIGNED(16, static const float, lfe_fir_64)[256] = { SCALE(2.658434386830777e-4), SCALE(9.029330685734748e-3), SCALE(7.939263433218002e-2), SCALE(2.425158768892288e-1), SCALE(3.430179357528686e-1), SCALE(2.398228943347931e-1), @@ -7429,7 +7429,7 @@ DECLARE_ALIGNED(16, static const float, lfe_fir_64)[] = { SCALE(3.165979683399200e-2), SCALE(1.527829794213176e-3), }; -DECLARE_ALIGNED(16, static const float, lfe_fir_128)[] = { +DECLARE_ALIGNED(16, static const float, lfe_fir_128)[256] = { SCALE(0.00053168571), SCALE(0.15878495574), SCALE(0.68603444099), SCALE(0.15492856503), SCALE(0.00016358691), SCALE(0.16269733012), SCALE(0.68591803312), SCALE(0.15112841129), SCALE(0.00018878609), SCALE(0.16666537523), SCALE(0.68568539619), SCALE(0.14738474786), @@ -7663,11 +7663,11 @@ static const float dca_default_coeffs[10][6][2] = { * where Ch(n) represents the subband samples in the (n)th audio channel. */ -static const int8_t dca_lfe_index[] = { +static const int8_t dca_lfe_index[16] = { 1, 2, 2, 2, 2, 3, 2, 3, 2, 3, 2, 3, 1, 3, 2, 3 }; -static const int8_t dca_channel_reorder_lfe[][9] = { +static const int8_t dca_channel_reorder_lfe[16][9] = { { 0, -1, -1, -1, -1, -1, -1, -1, -1 }, { 0, 1, -1, -1, -1, -1, -1, -1, -1 }, { 0, 1, -1, -1, -1, -1, -1, -1, -1 }, @@ -7686,7 +7686,7 @@ static const int8_t dca_channel_reorder_lfe[][9] = { { 4, 2, 5, 0, 1, 6, 8, 7, -1 }, }; -static const int8_t dca_channel_reorder_lfe_xch[][9] = { +static const int8_t dca_channel_reorder_lfe_xch[16][9] = { { 0, 2, -1, -1, -1, -1, -1, -1, -1 }, { 0, 1, 3, -1, -1, -1, -1, -1, -1 }, { 0, 1, 3, -1, -1, -1, -1, -1, -1 }, @@ -7705,7 +7705,7 @@ static const int8_t dca_channel_reorder_lfe_xch[][9] = { { 4, 2, 5, 0, 1, 6, 9, 8, 7 }, }; -static const int8_t dca_channel_reorder_nolfe[][9] = { +static const int8_t dca_channel_reorder_nolfe[16][9] = { { 0, -1, -1, -1, -1, -1, -1, -1, -1 }, { 0, 1, -1, -1, -1, -1, -1, -1, -1 }, { 0, 1, -1, -1, -1, -1, -1, -1, -1 }, @@ -7724,7 +7724,7 @@ static const int8_t dca_channel_reorder_nolfe[][9] = { { 3, 2, 4, 0, 1, 5, 7, 6, -1 }, }; -static const int8_t dca_channel_reorder_nolfe_xch[][9] = { +static const int8_t dca_channel_reorder_nolfe_xch[16][9] = { { 0, 1, -1, -1, -1, -1, -1, -1, -1 }, { 0, 1, 2, -1, -1, -1, -1, -1, -1 }, { 0, 1, 2, -1, -1, -1, -1, -1, -1 }, @@ -7743,7 +7743,7 @@ static const int8_t dca_channel_reorder_nolfe_xch[][9] = { { 3, 2, 4, 0, 1, 5, 8, 7, 6 }, }; -static const uint16_t dca_vlc_offs[] = { +static const uint16_t dca_vlc_offs[63] = { 0, 512, 640, 768, 1282, 1794, 2436, 3080, 3770, 4454, 5364, 5372, 5380, 5388, 5392, 5396, 5412, 5420, 5428, 5460, 5492, 5508, 5572, 5604, 5668, 5796, 5860, 5892, 6412, 6668, 6796, 7308, 7564, -- cgit v1.2.3