fix line endings
This commit is contained in:
parent
3466a2e468
commit
cd98ec85e2
|
@ -945,4 +945,3 @@ SWIGEXPORT void SWIGSTDCALL CSharp_eslSetLogLevel(int jarg1) {
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -8,4 +8,3 @@
|
||||||
|
|
||||||
./iLBC_test 20 iLBC.INP tmp.BIT iLBC_20ms_tlm05.OUT tlm05.chn
|
./iLBC_test 20 iLBC.INP tmp.BIT iLBC_20ms_tlm05.OUT tlm05.chn
|
||||||
./iLBC_test 30 iLBC.INP tmp.BIT iLBC_30ms_tlm05.OUT tlm05.chn
|
./iLBC_test 30 iLBC.INP tmp.BIT iLBC_30ms_tlm05.OUT tlm05.chn
|
||||||
|
|
||||||
|
|
|
@ -150,4 +150,3 @@ SKP_int SKP_Silk_LPC_inverse_pred_gain_Q24( /* O: Returns 1 if unstable, oth
|
||||||
|
|
||||||
return LPC_inverse_pred_gain_QA( invGain_Q30, Atmp_QA, order );
|
return LPC_inverse_pred_gain_QA( invGain_Q30, Atmp_QA, order );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -118,5 +118,3 @@ void SKP_Silk_LPC_synthesis_order16(const SKP_int16 *in, /* I: excita
|
||||||
S[ 15 ] = SKP_LSHIFT_SAT32( out32_Q10, 4 );
|
S[ 15 ] = SKP_LSHIFT_SAT32( out32_Q10, 4 );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -77,4 +77,3 @@ void SKP_Silk_LTP_analysis_filter_FIX(
|
||||||
x_ptr += subfr_length;
|
x_ptr += subfr_length;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -77,5 +77,3 @@ void SKP_Silk_NLSF_VQ_sum_error_FIX(
|
||||||
in_Q15 += LPC_order;
|
in_Q15 += LPC_order;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -136,4 +136,3 @@ void SKP_Silk_NLSF_stabilize(
|
||||||
NLSF_Q15[i] = SKP_min_int( NLSF_Q15[i], NLSF_Q15[i+1] - NDeltaMin_Q15[i+1] );
|
NLSF_Q15[i] = SKP_min_int( NLSF_Q15[i], NLSF_Q15[i+1] - NDeltaMin_Q15[i+1] );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -385,4 +385,3 @@ void SKP_Silk_PLC_glue_frames(
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -76,4 +76,3 @@ void SKP_Silk_PLC_glue_frames(
|
||||||
);
|
);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -98,4 +98,3 @@ void SKP_Silk_apply_sine_window_new(
|
||||||
S1_Q16 = SKP_min( S1_Q16, ( 1 << 16 ) );
|
S1_Q16 = SKP_min( S1_Q16, ( 1 << 16 ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -88,4 +88,3 @@ void SKP_Silk_decode_signs(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -73,4 +73,3 @@ extern const SKP_int16 SKP_Silk_cbk_sizes_stage3[ SKP_Silk_PITCH_EST_MAX_COMPLEX
|
||||||
extern const SKP_int16 SKP_Silk_cbk_offsets_stage3[ SKP_Silk_PITCH_EST_MAX_COMPLEX + 1 ];
|
extern const SKP_int16 SKP_Silk_cbk_offsets_stage3[ SKP_Silk_PITCH_EST_MAX_COMPLEX + 1 ];
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -150,4 +150,3 @@ void SKP_Silk_corrMatrix_FIX(
|
||||||
}
|
}
|
||||||
*rshifts = rshifts_local;
|
*rshifts = rshifts_local;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -50,4 +50,3 @@ SKP_int SKP_Silk_init_decoder(
|
||||||
|
|
||||||
return(0);
|
return(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -239,6 +239,3 @@ SKP_int subfr_length
|
||||||
sLPC_Q14[ MAX_LPC_ORDER + i ] = SKP_LSHIFT( vec_Q10[ i ], 4 );
|
sLPC_Q14[ MAX_LPC_ORDER + i ] = SKP_LSHIFT( vec_Q10[ i ], 4 );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -77,4 +77,3 @@ void SKP_Silk_decoder_set_fs(
|
||||||
/* Check that settings are valid */
|
/* Check that settings are valid */
|
||||||
SKP_assert( psDec->frame_length > 0 && psDec->frame_length <= MAX_FRAME_LENGTH );
|
SKP_assert( psDec->frame_length > 0 && psDec->frame_length <= MAX_FRAME_LENGTH );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -242,5 +242,3 @@ SKP_int SKP_Silk_SDK_Encode(
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -129,4 +129,3 @@ void SKP_Silk_find_pred_coefs_FIX(
|
||||||
SKP_memcpy( psEnc->sPred.prev_NLSFq_Q15, NLSF_Q15, psEnc->sCmn.predictLPCOrder * sizeof( SKP_int ) );
|
SKP_memcpy( psEnc->sPred.prev_NLSFq_Q15, NLSF_Q15, psEnc->sCmn.predictLPCOrder * sizeof( SKP_int ) );
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -46,4 +46,3 @@ SKP_int32 SKP_Silk_lin2log( const SKP_int32 inLin ) /* I: Input in linear
|
||||||
/* Piece-wise parabolic approximation */
|
/* Piece-wise parabolic approximation */
|
||||||
return( SKP_LSHIFT( 31 - lz, 7 ) + SKP_SMLAWB( frac_Q7, SKP_MUL( frac_Q7, 128 - frac_Q7 ), 179 ) );
|
return( SKP_LSHIFT( 31 - lz, 7 ) + SKP_SMLAWB( frac_Q7, SKP_MUL( frac_Q7, 128 - frac_Q7 ), 179 ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -119,4 +119,3 @@ SKP_INLINE SKP_int32 SKP_Silk_CLZ32(SKP_int32 in32)
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif //_SKP_SILK_API_C_H_
|
#endif //_SKP_SILK_API_C_H_
|
||||||
|
|
||||||
|
|
|
@ -37,4 +37,3 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
#define PITCH_EST_FLATCONTOUR_BIAS_Q20 52429 /* 0.05f */
|
#define PITCH_EST_FLATCONTOUR_BIAS_Q20 52429 /* 0.05f */
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -86,4 +86,3 @@ const SKP_int16 SKP_Silk_cbk_offsets_stage3[SKP_Silk_PITCH_EST_MAX_COMPLEX + 1]
|
||||||
((PITCH_EST_NB_CBKS_STAGE3_MAX - PITCH_EST_NB_CBKS_STAGE3_MID) >> 1),
|
((PITCH_EST_NB_CBKS_STAGE3_MAX - PITCH_EST_NB_CBKS_STAGE3_MID) >> 1),
|
||||||
0
|
0
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -103,4 +103,3 @@ void SKP_Silk_quant_LTP_gains_FIX(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -160,7 +160,7 @@ SKP_int SKP_Silk_resampler_init(
|
||||||
/* Upsample */
|
/* Upsample */
|
||||||
if( Fs_Hz_out == SKP_MUL( Fs_Hz_in, 2 ) ) { /* Fs_out : Fs_in = 2 : 1 */
|
if( Fs_Hz_out == SKP_MUL( Fs_Hz_in, 2 ) ) { /* Fs_out : Fs_in = 2 : 1 */
|
||||||
/* Special case: directly use 2x upsampler */
|
/* Special case: directly use 2x upsampler */
|
||||||
S->resampler_function = SKP_Silk_resampler_private_up2_HQ_wrapper;
|
S->resampler_function = SKP_Silk_resampler_private_up2_HQ_wrapper;
|
||||||
} else {
|
} else {
|
||||||
/* Default resampler */
|
/* Default resampler */
|
||||||
S->resampler_function = SKP_Silk_resampler_private_IIR_FIR;
|
S->resampler_function = SKP_Silk_resampler_private_IIR_FIR;
|
||||||
|
@ -176,50 +176,50 @@ SKP_int SKP_Silk_resampler_init(
|
||||||
} else if ( Fs_Hz_out < Fs_Hz_in ) {
|
} else if ( Fs_Hz_out < Fs_Hz_in ) {
|
||||||
/* Downsample */
|
/* Downsample */
|
||||||
if( SKP_MUL( Fs_Hz_out, 4 ) == SKP_MUL( Fs_Hz_in, 3 ) ) { /* Fs_out : Fs_in = 3 : 4 */
|
if( SKP_MUL( Fs_Hz_out, 4 ) == SKP_MUL( Fs_Hz_in, 3 ) ) { /* Fs_out : Fs_in = 3 : 4 */
|
||||||
S->FIR_Fracs = 3;
|
S->FIR_Fracs = 3;
|
||||||
S->Coefs = SKP_Silk_Resampler_3_4_COEFS;
|
S->Coefs = SKP_Silk_Resampler_3_4_COEFS;
|
||||||
S->resampler_function = SKP_Silk_resampler_private_down_FIR;
|
S->resampler_function = SKP_Silk_resampler_private_down_FIR;
|
||||||
} else if( SKP_MUL( Fs_Hz_out, 3 ) == SKP_MUL( Fs_Hz_in, 2 ) ) { /* Fs_out : Fs_in = 2 : 3 */
|
} else if( SKP_MUL( Fs_Hz_out, 3 ) == SKP_MUL( Fs_Hz_in, 2 ) ) { /* Fs_out : Fs_in = 2 : 3 */
|
||||||
S->FIR_Fracs = 2;
|
S->FIR_Fracs = 2;
|
||||||
S->Coefs = SKP_Silk_Resampler_2_3_COEFS;
|
S->Coefs = SKP_Silk_Resampler_2_3_COEFS;
|
||||||
S->resampler_function = SKP_Silk_resampler_private_down_FIR;
|
S->resampler_function = SKP_Silk_resampler_private_down_FIR;
|
||||||
} else if( SKP_MUL( Fs_Hz_out, 2 ) == Fs_Hz_in ) { /* Fs_out : Fs_in = 1 : 2 */
|
} else if( SKP_MUL( Fs_Hz_out, 2 ) == Fs_Hz_in ) { /* Fs_out : Fs_in = 1 : 2 */
|
||||||
S->FIR_Fracs = 1;
|
S->FIR_Fracs = 1;
|
||||||
S->Coefs = SKP_Silk_Resampler_1_2_COEFS;
|
S->Coefs = SKP_Silk_Resampler_1_2_COEFS;
|
||||||
S->resampler_function = SKP_Silk_resampler_private_down_FIR;
|
S->resampler_function = SKP_Silk_resampler_private_down_FIR;
|
||||||
} else if( SKP_MUL( Fs_Hz_out, 8 ) == SKP_MUL( Fs_Hz_in, 3 ) ) { /* Fs_out : Fs_in = 3 : 8 */
|
} else if( SKP_MUL( Fs_Hz_out, 8 ) == SKP_MUL( Fs_Hz_in, 3 ) ) { /* Fs_out : Fs_in = 3 : 8 */
|
||||||
S->FIR_Fracs = 3;
|
S->FIR_Fracs = 3;
|
||||||
S->Coefs = SKP_Silk_Resampler_3_8_COEFS;
|
S->Coefs = SKP_Silk_Resampler_3_8_COEFS;
|
||||||
S->resampler_function = SKP_Silk_resampler_private_down_FIR;
|
S->resampler_function = SKP_Silk_resampler_private_down_FIR;
|
||||||
} else if( SKP_MUL( Fs_Hz_out, 3 ) == Fs_Hz_in ) { /* Fs_out : Fs_in = 1 : 3 */
|
} else if( SKP_MUL( Fs_Hz_out, 3 ) == Fs_Hz_in ) { /* Fs_out : Fs_in = 1 : 3 */
|
||||||
S->FIR_Fracs = 1;
|
S->FIR_Fracs = 1;
|
||||||
S->Coefs = SKP_Silk_Resampler_1_3_COEFS;
|
S->Coefs = SKP_Silk_Resampler_1_3_COEFS;
|
||||||
S->resampler_function = SKP_Silk_resampler_private_down_FIR;
|
S->resampler_function = SKP_Silk_resampler_private_down_FIR;
|
||||||
} else if( SKP_MUL( Fs_Hz_out, 4 ) == Fs_Hz_in ) { /* Fs_out : Fs_in = 1 : 4 */
|
} else if( SKP_MUL( Fs_Hz_out, 4 ) == Fs_Hz_in ) { /* Fs_out : Fs_in = 1 : 4 */
|
||||||
S->FIR_Fracs = 1;
|
S->FIR_Fracs = 1;
|
||||||
down2 = 1;
|
down2 = 1;
|
||||||
S->Coefs = SKP_Silk_Resampler_1_2_COEFS;
|
S->Coefs = SKP_Silk_Resampler_1_2_COEFS;
|
||||||
S->resampler_function = SKP_Silk_resampler_private_down_FIR;
|
S->resampler_function = SKP_Silk_resampler_private_down_FIR;
|
||||||
} else if( SKP_MUL( Fs_Hz_out, 6 ) == Fs_Hz_in ) { /* Fs_out : Fs_in = 1 : 6 */
|
} else if( SKP_MUL( Fs_Hz_out, 6 ) == Fs_Hz_in ) { /* Fs_out : Fs_in = 1 : 6 */
|
||||||
S->FIR_Fracs = 1;
|
S->FIR_Fracs = 1;
|
||||||
down2 = 1;
|
down2 = 1;
|
||||||
S->Coefs = SKP_Silk_Resampler_1_3_COEFS;
|
S->Coefs = SKP_Silk_Resampler_1_3_COEFS;
|
||||||
S->resampler_function = SKP_Silk_resampler_private_down_FIR;
|
S->resampler_function = SKP_Silk_resampler_private_down_FIR;
|
||||||
} else if( SKP_MUL( Fs_Hz_out, 441 ) == SKP_MUL( Fs_Hz_in, 80 ) ) { /* Fs_out : Fs_in = 80 : 441 */
|
} else if( SKP_MUL( Fs_Hz_out, 441 ) == SKP_MUL( Fs_Hz_in, 80 ) ) { /* Fs_out : Fs_in = 80 : 441 */
|
||||||
S->Coefs = SKP_Silk_Resampler_80_441_ARMA4_COEFS;
|
S->Coefs = SKP_Silk_Resampler_80_441_ARMA4_COEFS;
|
||||||
S->resampler_function = SKP_Silk_resampler_private_IIR_FIR;
|
S->resampler_function = SKP_Silk_resampler_private_IIR_FIR;
|
||||||
} else if( SKP_MUL( Fs_Hz_out, 441 ) == SKP_MUL( Fs_Hz_in, 120 ) ) { /* Fs_out : Fs_in = 120 : 441 */
|
} else if( SKP_MUL( Fs_Hz_out, 441 ) == SKP_MUL( Fs_Hz_in, 120 ) ) { /* Fs_out : Fs_in = 120 : 441 */
|
||||||
S->Coefs = SKP_Silk_Resampler_120_441_ARMA4_COEFS;
|
S->Coefs = SKP_Silk_Resampler_120_441_ARMA4_COEFS;
|
||||||
S->resampler_function = SKP_Silk_resampler_private_IIR_FIR;
|
S->resampler_function = SKP_Silk_resampler_private_IIR_FIR;
|
||||||
} else if( SKP_MUL( Fs_Hz_out, 441 ) == SKP_MUL( Fs_Hz_in, 160 ) ) { /* Fs_out : Fs_in = 160 : 441 */
|
} else if( SKP_MUL( Fs_Hz_out, 441 ) == SKP_MUL( Fs_Hz_in, 160 ) ) { /* Fs_out : Fs_in = 160 : 441 */
|
||||||
S->Coefs = SKP_Silk_Resampler_160_441_ARMA4_COEFS;
|
S->Coefs = SKP_Silk_Resampler_160_441_ARMA4_COEFS;
|
||||||
S->resampler_function = SKP_Silk_resampler_private_IIR_FIR;
|
S->resampler_function = SKP_Silk_resampler_private_IIR_FIR;
|
||||||
} else if( SKP_MUL( Fs_Hz_out, 441 ) == SKP_MUL( Fs_Hz_in, 240 ) ) { /* Fs_out : Fs_in = 240 : 441 */
|
} else if( SKP_MUL( Fs_Hz_out, 441 ) == SKP_MUL( Fs_Hz_in, 240 ) ) { /* Fs_out : Fs_in = 240 : 441 */
|
||||||
S->Coefs = SKP_Silk_Resampler_240_441_ARMA4_COEFS;
|
S->Coefs = SKP_Silk_Resampler_240_441_ARMA4_COEFS;
|
||||||
S->resampler_function = SKP_Silk_resampler_private_IIR_FIR;
|
S->resampler_function = SKP_Silk_resampler_private_IIR_FIR;
|
||||||
} else if( SKP_MUL( Fs_Hz_out, 441 ) == SKP_MUL( Fs_Hz_in, 320 ) ) { /* Fs_out : Fs_in = 320 : 441 */
|
} else if( SKP_MUL( Fs_Hz_out, 441 ) == SKP_MUL( Fs_Hz_in, 320 ) ) { /* Fs_out : Fs_in = 320 : 441 */
|
||||||
S->Coefs = SKP_Silk_Resampler_320_441_ARMA4_COEFS;
|
S->Coefs = SKP_Silk_Resampler_320_441_ARMA4_COEFS;
|
||||||
S->resampler_function = SKP_Silk_resampler_private_IIR_FIR;
|
S->resampler_function = SKP_Silk_resampler_private_IIR_FIR;
|
||||||
} else {
|
} else {
|
||||||
/* Default resampler */
|
/* Default resampler */
|
||||||
S->resampler_function = SKP_Silk_resampler_private_IIR_FIR;
|
S->resampler_function = SKP_Silk_resampler_private_IIR_FIR;
|
||||||
|
@ -289,28 +289,28 @@ SKP_int SKP_Silk_resampler(
|
||||||
|
|
||||||
while( inLen > 0 ) {
|
while( inLen > 0 ) {
|
||||||
/* Number of input and output samples to process */
|
/* Number of input and output samples to process */
|
||||||
nSamplesIn = SKP_min( inLen, S->batchSizePrePost );
|
nSamplesIn = SKP_min( inLen, S->batchSizePrePost );
|
||||||
nSamplesOut = SKP_SMULWB( S->ratio_Q16, nSamplesIn );
|
nSamplesOut = SKP_SMULWB( S->ratio_Q16, nSamplesIn );
|
||||||
|
|
||||||
SKP_assert( SKP_RSHIFT32( nSamplesIn, S->nPreDownsamplers ) <= 480 );
|
SKP_assert( SKP_RSHIFT32( nSamplesIn, S->nPreDownsamplers ) <= 480 );
|
||||||
SKP_assert( SKP_RSHIFT32( nSamplesOut, S->nPostUpsamplers ) <= 480 );
|
SKP_assert( SKP_RSHIFT32( nSamplesOut, S->nPostUpsamplers ) <= 480 );
|
||||||
|
|
||||||
if( S->nPreDownsamplers > 0 ) {
|
if( S->nPreDownsamplers > 0 ) {
|
||||||
S->down_pre_function( S->sDownPre, in_buf, in, nSamplesIn );
|
S->down_pre_function( S->sDownPre, in_buf, in, nSamplesIn );
|
||||||
if( S->nPostUpsamplers > 0 ) {
|
if( S->nPostUpsamplers > 0 ) {
|
||||||
S->resampler_function( S, out_buf, in_buf, SKP_RSHIFT32( nSamplesIn, S->nPreDownsamplers ) );
|
S->resampler_function( S, out_buf, in_buf, SKP_RSHIFT32( nSamplesIn, S->nPreDownsamplers ) );
|
||||||
S->up_post_function( S->sUpPost, out, out_buf, SKP_RSHIFT32( nSamplesOut, S->nPostUpsamplers ) );
|
S->up_post_function( S->sUpPost, out, out_buf, SKP_RSHIFT32( nSamplesOut, S->nPostUpsamplers ) );
|
||||||
} else {
|
} else {
|
||||||
S->resampler_function( S, out, in_buf, SKP_RSHIFT32( nSamplesIn, S->nPreDownsamplers ) );
|
S->resampler_function( S, out, in_buf, SKP_RSHIFT32( nSamplesIn, S->nPreDownsamplers ) );
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
S->resampler_function( S, out_buf, in, SKP_RSHIFT32( nSamplesIn, S->nPreDownsamplers ) );
|
S->resampler_function( S, out_buf, in, SKP_RSHIFT32( nSamplesIn, S->nPreDownsamplers ) );
|
||||||
S->up_post_function( S->sUpPost, out, out_buf, SKP_RSHIFT32( nSamplesOut, S->nPostUpsamplers ) );
|
S->up_post_function( S->sUpPost, out, out_buf, SKP_RSHIFT32( nSamplesOut, S->nPostUpsamplers ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
in += nSamplesIn;
|
in += nSamplesIn;
|
||||||
out += nSamplesOut;
|
out += nSamplesOut;
|
||||||
inLen -= nSamplesIn;
|
inLen -= nSamplesIn;
|
||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -128,4 +128,3 @@ void SKP_Silk_resampler_private_ARMA4(
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#endif // SKP_Silk_RESAMPLER_H
|
#endif // SKP_Silk_RESAMPLER_H
|
||||||
|
|
||||||
|
|
|
@ -74,4 +74,3 @@ void SKP_Silk_resampler_private_ARMA4(
|
||||||
out[ k ] = (SKP_int16)SKP_SAT16( SKP_RSHIFT32( SKP_SMLAWB( 128, out2_Q8, Coef[ 6 ] ), 8 ) );
|
out[ k ] = (SKP_int16)SKP_SAT16( SKP_RSHIFT32( SKP_SMLAWB( 128, out2_Q8, Coef[ 6 ] ), 8 ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -102,4 +102,3 @@ void SKP_Silk_resampler_private_IIR_FIR(
|
||||||
/* Copy last part of filtered signal to the state for the next call */
|
/* Copy last part of filtered signal to the state for the next call */
|
||||||
SKP_memcpy( S->sFIR, &buf[nSamplesIn << S->input2x ], RESAMPLER_ORDER_FIR_144 * sizeof( SKP_int32 ) );
|
SKP_memcpy( S->sFIR, &buf[nSamplesIn << S->input2x ], RESAMPLER_ORDER_FIR_144 * sizeof( SKP_int32 ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -138,9 +138,9 @@ void SKP_Silk_resampler_private_down_FIR(
|
||||||
|
|
||||||
/* Interpolate filtered signal */
|
/* Interpolate filtered signal */
|
||||||
if( S->FIR_Fracs == 1 ) {
|
if( S->FIR_Fracs == 1 ) {
|
||||||
out = SKP_Silk_resampler_private_down_FIR_INTERPOL0(out, buf2, FIR_Coefs, max_index_Q16, index_increment_Q16);
|
out = SKP_Silk_resampler_private_down_FIR_INTERPOL0(out, buf2, FIR_Coefs, max_index_Q16, index_increment_Q16);
|
||||||
} else {
|
} else {
|
||||||
out = SKP_Silk_resampler_private_down_FIR_INTERPOL1(out, buf2, FIR_Coefs, max_index_Q16, index_increment_Q16, S->FIR_Fracs);
|
out = SKP_Silk_resampler_private_down_FIR_INTERPOL1(out, buf2, FIR_Coefs, max_index_Q16, index_increment_Q16, S->FIR_Fracs);
|
||||||
}
|
}
|
||||||
|
|
||||||
in += nSamplesIn << S->input2x;
|
in += nSamplesIn << S->input2x;
|
||||||
|
@ -157,4 +157,3 @@ void SKP_Silk_resampler_private_down_FIR(
|
||||||
/* Copy last part of filtered signal to the state for the next call */
|
/* Copy last part of filtered signal to the state for the next call */
|
||||||
SKP_memcpy( S->sFIR, &buf2[ nSamplesIn ], RESAMPLER_DOWN_ORDER_FIR * sizeof( SKP_int32 ) );
|
SKP_memcpy( S->sFIR, &buf2[ nSamplesIn ], RESAMPLER_DOWN_ORDER_FIR * sizeof( SKP_int32 ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -77,4 +77,3 @@ typedef struct _SKP_Silk_resampler_state_struct{
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#endif /* SKP_Silk_RESAMPLER_STRUCTS_H */
|
#endif /* SKP_Silk_RESAMPLER_STRUCTS_H */
|
||||||
|
|
||||||
|
|
|
@ -40,4 +40,3 @@ void SKP_Silk_scale_vector32_Q26_lshift_18(
|
||||||
data1[ i ] = (SKP_int32)SKP_CHECK_FIT32( SKP_RSHIFT64( SKP_SMULL( data1[ i ], gain_Q26 ), 8 ) );// OUTPUT: Q18
|
data1[ i ] = (SKP_int32)SKP_CHECK_FIT32( SKP_RSHIFT64( SKP_SMULL( data1[ i ], gain_Q26 ), 8 ) );// OUTPUT: Q18
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -75,4 +75,3 @@ SKP_int SKP_Silk_sigm_Q15( SKP_int in_Q5 )
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -145,4 +145,3 @@ void SKP_Silk_insertion_sort_increasing_all_values(
|
||||||
a[ j + 1 ] = value; /* Write value */
|
a[ j + 1 ] = value; /* Write value */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -97,4 +97,3 @@ void SKP_Silk_sum_sqr_shift(
|
||||||
*shift = shft;
|
*shift = shft;
|
||||||
*energy = nrg;
|
*energy = nrg;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -887,4 +887,3 @@ const SKP_Silk_NLSF_CB_struct SKP_Silk_NLSF_CB0_10 =
|
||||||
SKP_Silk_NLSF_MSVQ_CB0_10_CDF_start_ptr,
|
SKP_Silk_NLSF_MSVQ_CB0_10_CDF_start_ptr,
|
||||||
SKP_Silk_NLSF_MSVQ_CB0_10_CDF_middle_idx
|
SKP_Silk_NLSF_MSVQ_CB0_10_CDF_middle_idx
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -48,4 +48,3 @@ extern const SKP_int SKP_Silk_NLSF_MSVQ_CB0_10_CDF_middle_idx[
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -1317,4 +1317,3 @@ const SKP_Silk_NLSF_CB_struct SKP_Silk_NLSF_CB0_16 =
|
||||||
SKP_Silk_NLSF_MSVQ_CB0_16_CDF_start_ptr,
|
SKP_Silk_NLSF_MSVQ_CB0_16_CDF_start_ptr,
|
||||||
SKP_Silk_NLSF_MSVQ_CB0_16_CDF_middle_idx
|
SKP_Silk_NLSF_MSVQ_CB0_16_CDF_middle_idx
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -48,4 +48,3 @@ extern const SKP_int SKP_Silk_NLSF_MSVQ_CB0_16_CDF_middle_idx[
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -575,4 +575,3 @@ const SKP_Silk_NLSF_CB_struct SKP_Silk_NLSF_CB1_10 =
|
||||||
SKP_Silk_NLSF_MSVQ_CB1_10_CDF_start_ptr,
|
SKP_Silk_NLSF_MSVQ_CB1_10_CDF_start_ptr,
|
||||||
SKP_Silk_NLSF_MSVQ_CB1_10_CDF_middle_idx
|
SKP_Silk_NLSF_MSVQ_CB1_10_CDF_middle_idx
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -48,4 +48,3 @@ extern const SKP_int SKP_Silk_NLSF_MSVQ_CB1_10_CDF_middle_idx[
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -701,4 +701,3 @@ const SKP_Silk_NLSF_CB_struct SKP_Silk_NLSF_CB1_16 =
|
||||||
SKP_Silk_NLSF_MSVQ_CB1_16_CDF_start_ptr,
|
SKP_Silk_NLSF_MSVQ_CB1_16_CDF_start_ptr,
|
||||||
SKP_Silk_NLSF_MSVQ_CB1_16_CDF_middle_idx
|
SKP_Silk_NLSF_MSVQ_CB1_16_CDF_middle_idx
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -48,4 +48,3 @@ extern const SKP_int SKP_Silk_NLSF_MSVQ_CB1_16_CDF_middle_idx[
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -145,4 +145,3 @@ const SKP_int32 SKP_Silk_Transition_LP_A_Q28[ TRANSITION_INT_NUM ][ TRANSITION_N
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -232,4 +232,3 @@ const SKP_uint16 SKP_Silk_shell_code_table_offsets[ 19 ] = {
|
||||||
42, 52, 63, 75, 88, 102, 117, 133,
|
42, 52, 63, 75, 88, 102, 117, 133,
|
||||||
150, 168, 187
|
150, 168, 187
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -39,4 +39,3 @@ const SKP_uint16 SKP_Silk_sign_CDF[ 36 ] =
|
||||||
55630, 51806, 48073, 45036,
|
55630, 51806, 48073, 45036,
|
||||||
48416, 43857, 42678, 41146,
|
48416, 43857, 42678, 41146,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -49,4 +49,3 @@ const SKP_uint16 SKP_Silk_type_offset_joint_CDF[ 4 ][ 5 ] =
|
||||||
0, 6067, 7215, 13010, 65535
|
0, 6067, 7215, 13010, 65535
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -83,4 +83,3 @@ void SKP_Silk_warped_autocorrelation_FIX(
|
||||||
}
|
}
|
||||||
SKP_assert( corr_QC[ 0 ] >= 0 ); // If breaking, decrease QC
|
SKP_assert( corr_QC[ 0 ] >= 0 ); // If breaking, decrease QC
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,4 +14,3 @@ Contact: <sip:[3ffe:1200:3012:c000:210:a4ff:fe8d:6a46]:5062>
|
||||||
Content-Length: 0
|
Content-Length: 0
|
||||||
Accept:
|
Accept:
|
||||||
Allow:
|
Allow:
|
||||||
|
|
||||||
|
|
|
@ -4,5 +4,3 @@ From: "caller"<sip:caller@example.com>
|
||||||
Call-ID: 1234abcd@10.0.0.1
|
Call-ID: 1234abcd@10.0.0.1
|
||||||
CSeq: 1 OPTIONS
|
CSeq: 1 OPTIONS
|
||||||
Via: SIP/2.0/UDP 135.180.130.133
|
Via: SIP/2.0/UDP 135.180.130.133
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -4,5 +4,3 @@ From: "caller" <sip:caller@example.com>
|
||||||
Call-ID: 1234abcd@10.0.0.1
|
Call-ID: 1234abcd@10.0.0.1
|
||||||
CSeq: 2 OPTIONS
|
CSeq: 2 OPTIONS
|
||||||
Via: SIP/2.0/UDP 135.180.130.133
|
Via: SIP/2.0/UDP 135.180.130.133
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -6,5 +6,3 @@ Call-ID: k345asrl3fdbv@10.0.0.1
|
||||||
CSeq: 1 REGISTER
|
CSeq: 1 REGISTER
|
||||||
Via: SIP/2.0/UDP 135.180.130.133
|
Via: SIP/2.0/UDP 135.180.130.133
|
||||||
Contact: <sip:user@example.com?Route=%3Csip:sip.example.com%3E>
|
Contact: <sip:user@example.com?Route=%3Csip:sip.example.com%3E>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -6,5 +6,3 @@ Call-ID: k345asrl3fdbv@10.0.0.1
|
||||||
CSeq: 1 REGISTER
|
CSeq: 1 REGISTER
|
||||||
Via: SIP/2.0/UDP 135.180.130.133
|
Via: SIP/2.0/UDP 135.180.130.133
|
||||||
Contact: sip:user@example.com?Route=%3Csip:sip.example.com%3E
|
Contact: sip:user@example.com?Route=%3Csip:sip.example.com%3E
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -48,5 +48,3 @@ c=IN IP4 135.180.130.88
|
||||||
m=audio 492170 RTP/AVP 0 12
|
m=audio 492170 RTP/AVP 0 12
|
||||||
m=video 3227 RTP/AVP 31
|
m=video 3227 RTP/AVP 31
|
||||||
a=rtpmap:31 LPC
|
a=rtpmap:31 LPC
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -12,5 +12,3 @@ Contact: sip:host.company.com
|
||||||
Expires: 0xpires: 0sip:host.company.com
|
Expires: 0xpires: 0sip:host.company.com
|
||||||
Expires: 0
|
Expires: 0
|
||||||
Contact: sip:host.company.com
|
Contact: sip:host.company.com
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -5,5 +5,3 @@ To: sip:watson@bell-tel.com
|
||||||
Call-ID: 70710@saturn.bell-tel.com
|
Call-ID: 70710@saturn.bell-tel.com
|
||||||
CSeq: 2 REGISTER
|
CSeq: 2 REGISTER
|
||||||
Contact: sip:+1-972-555-2222@gw1.wcom.com;user=phone
|
Contact: sip:+1-972-555-2222@gw1.wcom.com;user=phone
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -5,5 +5,3 @@ To: sip:watson@bell-tel.com
|
||||||
Call-ID: 70710@saturn.bell-tel.com
|
Call-ID: 70710@saturn.bell-tel.com
|
||||||
CSeq: 3 REGISTER
|
CSeq: 3 REGISTER
|
||||||
Contact: <sip:+1-972-555-2222@gw1.wcom.com;user=phone>
|
Contact: <sip:+1-972-555-2222@gw1.wcom.com;user=phone>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -4,5 +4,3 @@ From: A. Bell <sip:a.g.bell@bell-tel.com>
|
||||||
To: T. Watson <sip:t.watson@ieee.org>
|
To: T. Watson <sip:t.watson@ieee.org>
|
||||||
Call-ID: 31414@c.bell-tel.com
|
Call-ID: 31414@c.bell-tel.com
|
||||||
CSeq: 1 INVITE
|
CSeq: 1 INVITE
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -4,5 +4,3 @@ From: Bell, Alexander <sip:a.g.bell@bell-tel.com>
|
||||||
To: Watson, Thomas <sip:t.watson@ieee.org>
|
To: Watson, Thomas <sip:t.watson@ieee.org>
|
||||||
Call-ID: 31415@c.bell-tel.com
|
Call-ID: 31415@c.bell-tel.com
|
||||||
CSeq: 1 INVITE
|
CSeq: 1 INVITE
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -5,4 +5,3 @@ From: A. Bell <sip:a.g.bell@bell-tel.com>
|
||||||
To: T. Watson <sip:t.watson@ieee.org>
|
To: T. Watson <sip:t.watson@ieee.org>
|
||||||
Call-ID: 31416@c.bell-tel.com
|
Call-ID: 31416@c.bell-tel.com
|
||||||
CSeq: 1 INVITE
|
CSeq: 1 INVITE
|
||||||
|
|
||||||
|
|
|
@ -4,8 +4,3 @@ From: A. Bell <sip:a.g.bell@bell-tel.com>
|
||||||
To: T. Watson <sip:t.watson@ieee.org>
|
To: T. Watson <sip:t.watson@ieee.org>
|
||||||
Call-ID: 31417@c.bell-tel.com
|
Call-ID: 31417@c.bell-tel.com
|
||||||
CSeq: 1 INVITE
|
CSeq: 1 INVITE
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -32,4 +32,3 @@
|
||||||
|
|
||||||
// Microsoft version of 'inline'
|
// Microsoft version of 'inline'
|
||||||
#define inline __inline
|
#define inline __inline
|
||||||
|
|
||||||
|
|
|
@ -122,4 +122,3 @@ Changes from the 1.00 -> 1.01 release for Win32:
|
||||||
to the output directory
|
to the output directory
|
||||||
|
|
||||||
4) Major refactoring of the Wininet Transport.
|
4) Major refactoring of the Wininet Transport.
|
||||||
|
|
||||||
|
|
|
@ -18,4 +18,3 @@ freely, subject to the following restrictions:
|
||||||
2. Altered source versions must be plainly marked as such, and must not be
|
2. Altered source versions must be plainly marked as such, and must not be
|
||||||
misrepresented as being the original software.
|
misrepresented as being the original software.
|
||||||
3. This notice may not be removed or altered from any source distribution.
|
3. This notice may not be removed or altered from any source distribution.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue