580b307fd7
Sync opus codec to upstream commit
02fed471a4568852d6618e041c4f2af0d7730ee2 (August 30 2013)
This brings in a lot of optimizations but also makes the diff
between our codec and the upstream much smaller as most of our
optimizations have been upstreamed or supeceded.
Speedups across the board for CELT mode files:
64kbps 128kbps
H300 9.82MHz 15.48MHz
c200 4.86MHz 9.63MHz
fuze v1 10.32MHz 15.92MHz
For the silk mode test file (16kbps) arm targets get a speedup
of about 2MHz while the H300 is 7.8MHz slower, likely because it's
now using the pseudostack more rather than the real stack which
is in iram. Patches to get around that are upcomming.
Change-Id: Ifecf963e461c51ac42e09dac1e91bc4bc3b12fa3
77 lines
3.6 KiB
C
77 lines
3.6 KiB
C
/***********************************************************************
|
|
Copyright (c) 2006-2011, Skype Limited. All rights reserved.
|
|
Redistribution and use in source and binary forms, with or without
|
|
modification, are permitted provided that the following conditions
|
|
are met:
|
|
- Redistributions of source code must retain the above copyright notice,
|
|
this list of conditions and the following disclaimer.
|
|
- Redistributions in binary form must reproduce the above copyright
|
|
notice, this list of conditions and the following disclaimer in the
|
|
documentation and/or other materials provided with the distribution.
|
|
- Neither the name of Internet Society, IETF or IETF Trust, nor the
|
|
names of specific contributors, may be used to endorse or promote
|
|
products derived from this software without specific prior written
|
|
permission.
|
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
|
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
POSSIBILITY OF SUCH DAMAGE.
|
|
***********************************************************************/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
/***********************************************************
|
|
* Pitch analyser function
|
|
********************************************************** */
|
|
#include "SigProc_FIX.h"
|
|
#include "pitch_est_defines.h"
|
|
|
|
void silk_decode_pitch(
|
|
opus_int16 lagIndex, /* I */
|
|
opus_int8 contourIndex, /* O */
|
|
opus_int pitch_lags[], /* O 4 pitch values */
|
|
const opus_int Fs_kHz, /* I sampling frequency (kHz) */
|
|
const opus_int nb_subfr /* I number of sub frames */
|
|
)
|
|
{
|
|
opus_int lag, k, min_lag, max_lag, cbk_size;
|
|
const opus_int8 *Lag_CB_ptr;
|
|
|
|
if( Fs_kHz == 8 ) {
|
|
if( nb_subfr == PE_MAX_NB_SUBFR ) {
|
|
Lag_CB_ptr = &silk_CB_lags_stage2[ 0 ][ 0 ];
|
|
cbk_size = PE_NB_CBKS_STAGE2_EXT;
|
|
} else {
|
|
silk_assert( nb_subfr == PE_MAX_NB_SUBFR >> 1 );
|
|
Lag_CB_ptr = &silk_CB_lags_stage2_10_ms[ 0 ][ 0 ];
|
|
cbk_size = PE_NB_CBKS_STAGE2_10MS;
|
|
}
|
|
} else {
|
|
if( nb_subfr == PE_MAX_NB_SUBFR ) {
|
|
Lag_CB_ptr = &silk_CB_lags_stage3[ 0 ][ 0 ];
|
|
cbk_size = PE_NB_CBKS_STAGE3_MAX;
|
|
} else {
|
|
silk_assert( nb_subfr == PE_MAX_NB_SUBFR >> 1 );
|
|
Lag_CB_ptr = &silk_CB_lags_stage3_10_ms[ 0 ][ 0 ];
|
|
cbk_size = PE_NB_CBKS_STAGE3_10MS;
|
|
}
|
|
}
|
|
|
|
min_lag = silk_SMULBB( PE_MIN_LAG_MS, Fs_kHz );
|
|
max_lag = silk_SMULBB( PE_MAX_LAG_MS, Fs_kHz );
|
|
lag = min_lag + lagIndex;
|
|
|
|
for( k = 0; k < nb_subfr; k++ ) {
|
|
pitch_lags[ k ] = lag + matrix_ptr( Lag_CB_ptr, k, contourIndex, cbk_size );
|
|
pitch_lags[ k ] = silk_LIMIT( pitch_lags[ k ], min_lag, max_lag );
|
|
}
|
|
}
|