ref: 7152a9aa9a479ac39053a39548343a8ec2757094
parent: 748c960cf7ab61a92adc323fe5bbae03af9949f4
author: Gregory Maxwell <[email protected]>
date: Tue Sep 27 17:33:14 EDT 2011
Fix some GCC warings in the silk/ directory.
--- a/silk/HP_variable_cutoff.c
+++ b/silk/HP_variable_cutoff.c
@@ -37,8 +37,7 @@
/* High-pass filter with cutoff frequency adaptation based on pitch lag statistics */
void silk_HP_variable_cutoff(
- silk_encoder_state_Fxx state_Fxx[], /* I/O Encoder states */
- const opus_int nChannels /* I Number of channels */
+ silk_encoder_state_Fxx state_Fxx[] /* I/O Encoder states */
)
{opus_int quality_Q15;
--- a/silk/PLC.c
+++ b/silk/PLC.c
@@ -69,7 +69,7 @@
/****************************/
/* Update state */
/****************************/
- silk_PLC_update( psDec, psDecCtrl, frame, length );
+ silk_PLC_update( psDec, psDecCtrl );
}
}
@@ -78,9 +78,7 @@
/**************************************************/
void silk_PLC_update(
silk_decoder_state *psDec, /* (I/O) Decoder state */
- silk_decoder_control *psDecCtrl, /* (I/O) Decoder control */
- opus_int16 frame[],
- opus_int length
+ silk_decoder_control *psDecCtrl /* (I/O) Decoder control */
)
{opus_int32 LTP_Gain_Q14, temp_LTP_Gain_Q14;
@@ -337,7 +335,6 @@
/* Glues concealed frames with new good recieved frames */
void silk_PLC_glue_frames(
silk_decoder_state *psDec, /* I/O decoder state */
- silk_decoder_control *psDecCtrl, /* I/O Decoder control */
opus_int16 frame[], /* I/O signal */
opus_int length /* I length of residual */
)
--- a/silk/PLC.h
+++ b/silk/PLC.h
@@ -56,9 +56,7 @@
void silk_PLC_update(
silk_decoder_state *psDec, /* I/O Decoder state */
- silk_decoder_control *psDecCtrl, /* I/O Decoder control */
- opus_int16 signal[],
- opus_int length
+ silk_decoder_control *psDecCtrl /* I/O Decoder control */
);
void silk_PLC_conceal(
@@ -70,7 +68,6 @@
void silk_PLC_glue_frames(
silk_decoder_state *psDec, /* I/O decoder state */
- silk_decoder_control *psDecCtrl, /* I/O Decoder control */
opus_int16 signal[], /* I/O signal */
opus_int length /* I length of signal */
);
--- a/silk/decode_frame.c
+++ b/silk/decode_frame.c
@@ -117,7 +117,7 @@
/****************************************************************/
/* Ensure smooth connection of extrapolated and good frames */
/****************************************************************/
- silk_PLC_glue_frames( psDec, &sDecCtrl, pOut, L );
+ silk_PLC_glue_frames( psDec, pOut, L );
/************************************************/
/* Comfort noise generation / estimation */
--- a/silk/enc_API.c
+++ b/silk/enc_API.c
@@ -307,7 +307,7 @@
}
}
- silk_HP_variable_cutoff( psEnc->state_Fxx, psEnc->nChannelsInternal );
+ silk_HP_variable_cutoff( psEnc->state_Fxx );
/* Total target bits for packet */
nBits = silk_DIV32_16( silk_MUL( encControl->bitRate, encControl->payloadSize_ms ), 1000 );
--- a/silk/fixed/main_FIX.h
+++ b/silk/fixed/main_FIX.h
@@ -52,8 +52,7 @@
/* High-pass filter with cutoff frequency adaptation based on pitch lag statistics */
void silk_HP_variable_cutoff(
- silk_encoder_state_Fxx state_Fxx[], /* I/O Encoder states */
- const opus_int nChannels /* I Number of channels */
+ silk_encoder_state_Fxx state_Fxx[] /* I/O Encoder states */
);
/* Encoder main function */
--- a/silk/float/main_FLP.h
+++ b/silk/float/main_FLP.h
@@ -50,8 +50,7 @@
/* High-pass filter with cutoff frequency adaptation based on pitch lag statistics */
void silk_HP_variable_cutoff(
- silk_encoder_state_Fxx state_Fxx[], /* I/O Encoder states */
- const opus_int nChannels /* I Number of channels */
+ silk_encoder_state_Fxx state_Fxx[] /* I/O Encoder states */
);
/* Encoder main function */
--- a/silk/main.h
+++ b/silk/main.h
@@ -80,7 +80,6 @@
/* Quantize mid/side predictors */
void silk_stereo_quant_pred(
- stereo_enc_state *state, /* I/O State */
opus_int32 pred_Q13[], /* I/O Predictors (out: quantized) */
opus_int8 ix[ 2 ][ 3 ] /* O Quantization indices */
);
--- a/silk/stereo_LR_to_MS.c
+++ b/silk/stereo_LR_to_MS.c
@@ -150,7 +150,7 @@
#endif
/* Quantize predictors */
- silk_stereo_quant_pred( state, pred_Q13, ix );
+ silk_stereo_quant_pred( pred_Q13, ix );
/* Interpolate predictors and subtract prediction from side channel */
pred0_Q13 = -state->pred_prev_Q13[ 0 ];
--- a/silk/stereo_quant_pred.c
+++ b/silk/stereo_quant_pred.c
@@ -33,7 +33,6 @@
/* Quantize mid/side predictors */
void silk_stereo_quant_pred(
- stereo_enc_state *state, /* I/O State */
opus_int32 pred_Q13[], /* I/O Predictors (out: quantized) */
opus_int8 ix[ 2 ][ 3 ] /* O Quantization indices */
)