Fix fixed-point build bustage from 53cc1a03.
authorTimothy B. Terriberry <tterribe@xiph.org>
Mon, 17 Oct 2011 20:16:23 +0000 (13:16 -0700)
committerJean-Marc Valin <jmvalin@jmvalin.ca>
Mon, 17 Oct 2011 20:19:28 +0000 (16:19 -0400)
silk/fixed/encode_frame_FIX.c
silk/fixed/main_FIX.h
silk/fixed/process_gains_FIX.c

index 8899c26..357b627 100644 (file)
@@ -32,6 +32,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "main_FIX.h"
 #include "tuning_parameters.h"
 
+/* Low Bitrate Redundancy (LBRR) encoding. Reuse all parameters but encode with lower bitrate           */
+static inline void silk_LBRR_encode_FIX(
+    silk_encoder_state_FIX          *psEnc,             /* I/O  Pointer to Silk FIX encoder state           */
+    silk_encoder_control_FIX        *psEncCtrl,         /* I/O  Pointer to Silk FIX encoder control struct  */
+    const opus_int16                 xfw[],              /* I    Input signal                                */
+    opus_int                         condCoding         /* I    The type of conditional coding used so far for this frame */
+);
+
 /****************/
 /* Encode frame */
 /****************/
@@ -121,7 +129,7 @@ TOC(FIND_PRED_COEF)
     /* Process gains                        */
     /****************************************/
 TIC(PROCESS_GAINS)
-    silk_process_gains_FIX( psEnc, &sEncCtrl );
+    silk_process_gains_FIX( psEnc, &sEncCtrl, condCoding );
 TOC(PROCESS_GAINS)
 
     /*****************************************/
index 56ba1ef..33f6ece 100644 (file)
@@ -63,13 +63,6 @@ opus_int silk_encode_frame_FIX(
     opus_int                         condCoding         /* I    The type of conditional coding to use   */
 );
 
-/* Low Bitrate Redundancy (LBRR) encoding. Reuse all parameters but encode with lower bitrate           */
-void silk_LBRR_encode_FIX(
-    silk_encoder_state_FIX          *psEnc,             /* I/O  Pointer to Silk FIX encoder state           */
-    silk_encoder_control_FIX        *psEncCtrl,         /* I/O  Pointer to Silk FIX encoder control struct  */
-    const opus_int16                 xfw[]               /* I    Input signal                                */
-);
-
 /* Initializes the Silk encoder state */
 opus_int silk_init_encoder(
     silk_encoder_state_FIX          *psEnc              /* I/O  Pointer to Silk FIX encoder state           */
index 4fe55bb..25a13a5 100644 (file)
@@ -35,7 +35,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /* Processing of gains */
 void silk_process_gains_FIX(
     silk_encoder_state_FIX      *psEnc,         /* I/O  Encoder state_FIX                           */
-    silk_encoder_control_FIX    *psEncCtrl      /* I/O  Encoder control_FIX                         */
+    silk_encoder_control_FIX    *psEncCtrl,     /* I/O  Encoder control_FIX                         */
     opus_int                     condCoding     /* The type of conditional coding to use            */
 )
 {