From 88e5cdc5ad86113e916b82dac813f6a21e2f7786 Mon Sep 17 00:00:00 2001
From: "Timothy B. Terriberry" <tterribe@xiph.org>
Date: Mon, 17 Oct 2011 13:16:23 -0700
Subject: [PATCH] Fix fixed-point build bustage from 53cc1a03.
---
silk/fixed/encode_frame_FIX.c | 10 +++++++++-
silk/fixed/main_FIX.h | 7 -------
silk/fixed/process_gains_FIX.c | 2 +-
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/silk/fixed/encode_frame_FIX.c b/silk/fixed/encode_frame_FIX.c
index 8899c2678..357b627cb 100644
--- a/silk/fixed/encode_frame_FIX.c
+++ b/silk/fixed/encode_frame_FIX.c
@@ -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)
/*****************************************/
diff --git a/silk/fixed/main_FIX.h b/silk/fixed/main_FIX.h
index 56ba1ef07..33f6ececd 100644
--- a/silk/fixed/main_FIX.h
+++ b/silk/fixed/main_FIX.h
@@ -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 */
diff --git a/silk/fixed/process_gains_FIX.c b/silk/fixed/process_gains_FIX.c
index 4fe55bb0e..25a13a57d 100644
--- a/silk/fixed/process_gains_FIX.c
+++ b/silk/fixed/process_gains_FIX.c
@@ -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 */
)
{
--
GitLab