Fix some GCC warings in the silk/ directory.
authorGregory Maxwell <greg@xiph.org>
Wed, 28 Sep 2011 01:33:14 +0000 (21:33 -0400)
committerGregory Maxwell <greg@xiph.org>
Wed, 28 Sep 2011 01:33:14 +0000 (21:33 -0400)
silk/HP_variable_cutoff.c
silk/PLC.c
silk/PLC.h
silk/decode_frame.c
silk/enc_API.c
silk/fixed/main_FIX.h
silk/float/main_FLP.h
silk/main.h
silk/stereo_LR_to_MS.c
silk/stereo_quant_pred.c

index 1cd82a4..c66f47b 100644 (file)
@@ -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;
index 43894c2..9fe5a87 100644 (file)
@@ -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 */
 )
index 4fe09e2..0ac537b 100644 (file)
@@ -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       */
 );
index d70dccb..413ff83 100644 (file)
@@ -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        */
index e8a6556..ccf98b6 100644 (file)
@@ -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 );
index 0a98edc..e0b1e05 100644 (file)
@@ -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 */
index a8da330..b81c7dc 100644 (file)
@@ -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 */
index a91cf07..c3178ba 100644 (file)
@@ -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                        */
 );
index b27a4e2..7c4b7c1 100644 (file)
@@ -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 ];
index 2ffe3fa..f91ed92 100644 (file)
@@ -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                        */
 )