diff options
author | Gregory Maxwell <greg@xiph.org> | 2011-09-28 05:33:14 +0400 |
---|---|---|
committer | Gregory Maxwell <greg@xiph.org> | 2011-09-28 05:33:14 +0400 |
commit | 7152a9aa9a479ac39053a39548343a8ec2757094 (patch) | |
tree | 92bd8760df487beea168b7bd3a674f7fb26df2cb | |
parent | 748c960cf7ab61a92adc323fe5bbae03af9949f4 (diff) |
Fix some GCC warings in the silk/ directory.
-rw-r--r-- | silk/HP_variable_cutoff.c | 3 | ||||
-rw-r--r-- | silk/PLC.c | 7 | ||||
-rw-r--r-- | silk/PLC.h | 5 | ||||
-rw-r--r-- | silk/decode_frame.c | 2 | ||||
-rw-r--r-- | silk/enc_API.c | 2 | ||||
-rw-r--r-- | silk/fixed/main_FIX.h | 3 | ||||
-rw-r--r-- | silk/float/main_FLP.h | 3 | ||||
-rw-r--r-- | silk/main.h | 1 | ||||
-rw-r--r-- | silk/stereo_LR_to_MS.c | 2 | ||||
-rw-r--r-- | silk/stereo_quant_pred.c | 1 |
10 files changed, 9 insertions, 20 deletions
diff --git a/silk/HP_variable_cutoff.c b/silk/HP_variable_cutoff.c index 1cd82a4e..c66f47bb 100644 --- a/silk/HP_variable_cutoff.c +++ b/silk/HP_variable_cutoff.c @@ -37,8 +37,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /* 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; @@ -69,7 +69,7 @@ void silk_PLC( /****************************/ /* Update state */ /****************************/ - silk_PLC_update( psDec, psDecCtrl, frame, length ); + silk_PLC_update( psDec, psDecCtrl ); } } @@ -78,9 +78,7 @@ void silk_PLC( /**************************************************/ 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 @@ void silk_PLC_conceal( /* 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 */ ) @@ -56,9 +56,7 @@ void silk_PLC( 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_conceal( 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 */ ); diff --git a/silk/decode_frame.c b/silk/decode_frame.c index d70dccb1..413ff832 100644 --- a/silk/decode_frame.c +++ b/silk/decode_frame.c @@ -117,7 +117,7 @@ TOC(decode_core) /****************************************************************/ /* 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 */ diff --git a/silk/enc_API.c b/silk/enc_API.c index e8a65563..ccf98b66 100644 --- a/silk/enc_API.c +++ b/silk/enc_API.c @@ -307,7 +307,7 @@ opus_int silk_Encode( } } - 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 ); diff --git a/silk/fixed/main_FIX.h b/silk/fixed/main_FIX.h index 0a98edc3..e0b1e054 100644 --- a/silk/fixed/main_FIX.h +++ b/silk/fixed/main_FIX.h @@ -52,8 +52,7 @@ extern "C" /* 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 */ diff --git a/silk/float/main_FLP.h b/silk/float/main_FLP.h index a8da330b..b81c7dca 100644 --- a/silk/float/main_FLP.h +++ b/silk/float/main_FLP.h @@ -50,8 +50,7 @@ extern "C" /* 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 */ diff --git a/silk/main.h b/silk/main.h index a91cf07d..c3178ba4 100644 --- a/silk/main.h +++ b/silk/main.h @@ -80,7 +80,6 @@ opus_int32 silk_stereo_find_predictor( /* O Returns predict /* 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 */ ); diff --git a/silk/stereo_LR_to_MS.c b/silk/stereo_LR_to_MS.c index b27a4e25..7c4b7c1d 100644 --- a/silk/stereo_LR_to_MS.c +++ b/silk/stereo_LR_to_MS.c @@ -150,7 +150,7 @@ void silk_stereo_LR_to_MS( #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 ]; diff --git a/silk/stereo_quant_pred.c b/silk/stereo_quant_pred.c index 2ffe3fa0..f91ed923 100644 --- a/silk/stereo_quant_pred.c +++ b/silk/stereo_quant_pred.c @@ -33,7 +33,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /* 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 */ ) |