diff options
| author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2015-12-31 22:43:49 +0300 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2015-12-31 22:46:14 +0300 |
| commit | 68a0e046a2711e8105a52a43629796f4ef4babd8 (patch) | |
| tree | 6a9814c0fa34007010c52b7eaace04b776818c94 /silk/encode_pulses.c | |
| parent | 9ba205d790cff621d565e554093233b263f7ed0b (diff) | |
Renamed MAX_PULSES to SILK_MAX_PULSES and CELT_MAX_PULSES
Avoids accidental name collisions
Diffstat (limited to 'silk/encode_pulses.c')
| -rw-r--r-- | silk/encode_pulses.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/silk/encode_pulses.c b/silk/encode_pulses.c index a4501438..ab00264f 100644 --- a/silk/encode_pulses.c +++ b/silk/encode_pulses.c @@ -142,7 +142,7 @@ void silk_encode_pulses( sumBits_Q5 = silk_rate_levels_BITS_Q5[ signalType >> 1 ][ k ]; for( i = 0; i < iter; i++ ) { if( nRshifts[ i ] > 0 ) { - sumBits_Q5 += nBits_ptr[ MAX_PULSES + 1 ]; + sumBits_Q5 += nBits_ptr[ SILK_MAX_PULSES + 1 ]; } else { sumBits_Q5 += nBits_ptr[ sum_pulses[ i ] ]; } @@ -162,9 +162,9 @@ void silk_encode_pulses( if( nRshifts[ i ] == 0 ) { ec_enc_icdf( psRangeEnc, sum_pulses[ i ], cdf_ptr, 8 ); } else { - ec_enc_icdf( psRangeEnc, MAX_PULSES + 1, cdf_ptr, 8 ); + ec_enc_icdf( psRangeEnc, SILK_MAX_PULSES + 1, cdf_ptr, 8 ); for( k = 0; k < nRshifts[ i ] - 1; k++ ) { - ec_enc_icdf( psRangeEnc, MAX_PULSES + 1, silk_pulses_per_block_iCDF[ N_RATE_LEVELS - 1 ], 8 ); + ec_enc_icdf( psRangeEnc, SILK_MAX_PULSES + 1, silk_pulses_per_block_iCDF[ N_RATE_LEVELS - 1 ], 8 ); } ec_enc_icdf( psRangeEnc, sum_pulses[ i ], silk_pulses_per_block_iCDF[ N_RATE_LEVELS - 1 ], 8 ); } |