Silence the remaining silk/ GCC warnings.
authorGregory Maxwell <greg@xiph.org>
Wed, 28 Sep 2011 03:30:18 +0000 (23:30 -0400)
committerGregory Maxwell <greg@xiph.org>
Wed, 28 Sep 2011 03:30:18 +0000 (23:30 -0400)
silk/NSQ_del_dec.c
silk/PLC.c
silk/PLC.h
silk/decode_frame.c
silk/resampler_private_copy.c

index 140aa84..f2d3c7c 100644 (file)
@@ -64,7 +64,6 @@ static inline void silk_nsq_del_dec_scale_states(
     opus_int32           sLTP_Q16[],                 /* O    LTP state matching scaled input     */
     opus_int             subfr,                      /* I    Subframe number                     */
     opus_int             nStatesDelayedDecision,     /* I    Number of del dec states            */
-    opus_int             smpl_buf_idx,               /* I    Index to newest samples in buffers  */
     const opus_int       LTP_scale_Q14,              /* I    LTP state scaling                   */
     const opus_int32     Gains_Q16[ MAX_NB_SUBFR ],  /* I                                        */
     const opus_int       pitchL[ MAX_NB_SUBFR ],     /* I    Pitch lag                           */
@@ -243,7 +242,7 @@ void silk_NSQ_del_dec(
         }
 
         silk_nsq_del_dec_scale_states( psEncC, NSQ, psDelDec, x, x_sc_Q10, sLTP, sLTP_Q16, k,
-            psEncC->nStatesDelayedDecision, smpl_buf_idx, LTP_scale_Q14, Gains_Q16, pitchL, psIndices->signalType, decisionDelay );
+            psEncC->nStatesDelayedDecision, LTP_scale_Q14, Gains_Q16, pitchL, psIndices->signalType, decisionDelay );
 
         silk_noise_shape_quantizer_del_dec( NSQ, psDelDec, psIndices->signalType, x_sc_Q10, pulses, pxq, sLTP_Q16,
             delayedGain_Q16, A_Q12, B_Q14, AR_shp_Q13, lag, HarmShapeFIRPacked_Q14, Tilt_Q14[ k ], LF_shp_Q14[ k ],
@@ -610,7 +609,6 @@ static inline void silk_nsq_del_dec_scale_states(
     opus_int32           sLTP_Q16[],                 /* O    LTP state matching scaled input     */
     opus_int             subfr,                      /* I    Subframe number                     */
     opus_int             nStatesDelayedDecision,     /* I    Number of del dec states            */
-    opus_int             smpl_buf_idx,               /* I    Index to newest samples in buffers  */
     const opus_int       LTP_scale_Q14,              /* I    LTP state scaling                   */
     const opus_int32     Gains_Q16[ MAX_NB_SUBFR ],  /* I                                        */
     const opus_int       pitchL[ MAX_NB_SUBFR ],     /* I    Pitch lag                           */
index 9fe5a87..d4029fb 100644 (file)
@@ -48,7 +48,6 @@ void silk_PLC(
     silk_decoder_state          *psDec,             /* I Decoder state          */
     silk_decoder_control        *psDecCtrl,         /* I Decoder control        */
     opus_int16                   frame[],            /* O Concealed signal       */
-    opus_int                     length,             /* I length of residual     */
     opus_int                     lost                /* I Loss flag              */
 )
 {
@@ -62,7 +61,7 @@ void silk_PLC(
         /****************************/
         /* Generate Signal          */
         /****************************/
-        silk_PLC_conceal( psDec, psDecCtrl, frame, length );
+        silk_PLC_conceal( psDec, psDecCtrl, frame );
 
         psDec->lossCnt++;
     } else {
@@ -151,8 +150,7 @@ void silk_PLC_update(
 void silk_PLC_conceal(
     silk_decoder_state          *psDec,             /* I/O Decoder state */
     silk_decoder_control        *psDecCtrl,         /* I/O Decoder control */
-    opus_int16                   frame[],            /* O concealed signal */
-    opus_int                     length              /* I length of residual */
+    opus_int16                   frame[]            /* O concealed signal */
 )
 {
     opus_int   i, j, k;
index 0ac537b..ea6266f 100644 (file)
@@ -50,7 +50,6 @@ void silk_PLC(
     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 residual     */
     opus_int                     lost                /* I Loss flag              */
 );
 
@@ -62,8 +61,7 @@ void silk_PLC_update(
 void silk_PLC_conceal(
     silk_decoder_state      *psDec,             /* I/O Decoder state        */
     silk_decoder_control    *psDecCtrl,         /* I/O Decoder control      */
-    opus_int16                   signal[],           /* O LPC residual signal    */
-    opus_int                     length              /* I length of signal       */
+    opus_int16                signal[]          /* O LPC residual signal    */
 );
 
 void silk_PLC_glue_frames(
index 413ff83..2478617 100644 (file)
@@ -93,7 +93,7 @@ TOC(decode_core)
         /********************************************************/
         /* Update PLC state                                     */
         /********************************************************/
-        silk_PLC( psDec, &sDecCtrl, pOut, L, 0 );
+        silk_PLC( psDec, &sDecCtrl, pOut, 0 );
 
         psDec->lossCnt = 0;
         psDec->prevSignalType = psDec->indices.signalType;
@@ -103,7 +103,7 @@ TOC(decode_core)
         psDec->first_frame_after_reset = 0;
     } else {
         /* Handle packet loss by extrapolation */
-        silk_PLC( psDec, &sDecCtrl, pOut, L, 1 );
+        silk_PLC( psDec, &sDecCtrl, pOut, 1 );
     }
 
     /*************************/
index 1d253e1..8e7a976 100644 (file)
@@ -32,12 +32,18 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "SigProc_FIX.h"
 #include "resampler_private.h"
 
+#ifdef __GNUC__
+#define OPUS_UNUSED_VAR __attribute__ ((unused))
+#else
+#define OPUS_UNUSED_VAR
+#endif
+
 /* Copy */
 void silk_resampler_private_copy(
-    void                            *SS,            /* I/O: Resampler state (unused)                */
-    opus_int16                        out[],            /* O:    Output signal                             */
+    void                 *SS OPUS_UNUSED_VAR,            /* I/O: Resampler state (unused)                */
+    opus_int16                         out[],            /* O:    Output signal                             */
     const opus_int16                    in[],            /* I:    Input signal                            */
-    opus_int32                        inLen            /* I:    Number of input samples                    */
+    opus_int32                         inLen             /* I:    Number of input samples                    */
 )
 {
     silk_memcpy( out, in, inLen * sizeof( opus_int16 ) );