From f85bc8a293af86165979f35db4e1073b19cca354 Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jean-marc.valin@usherbrooke.ca>
Date: Thu, 3 Feb 2011 12:08:38 -0500
Subject: Oops, had inverted some tuning lines

---
 Makefile.draft     | 5 +++--
 celt               | 2 +-
 src/opus_decoder.h | 2 +-
 src/opus_encoder.c | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Makefile.draft b/Makefile.draft
index 189c9334..e2af18db 100644
--- a/Makefile.draft
+++ b/Makefile.draft
@@ -18,7 +18,8 @@ cppflags-from-includes  = $(addprefix -I,$(1))
 ldflags-from-ldlibdirs  = $(addprefix -L,$(1))
 ldlibs-from-libs                = $(addprefix -l,$(1))
 
-CFLAGS  += -O2 -g -Wall -DOPUS_BUILD -Drestrict=
+WARNINGS = -Wall -W -Wstrict-prototypes -Wextra -Wcast-align -Wnested-externs -Wshadow -Wno-parentheses -Wno-unused-parameter -Wno-sign-compare
+CFLAGS  += -O2 -g $(WARNINGS) -DOPUS_BUILD -Drestrict=
 
 CFLAGS  += $(call cppflags-from-defines,$(CDEFINES))
 CFLAGS  += $(call cppflags-from-includes,$(CINCLUDES))
@@ -59,7 +60,7 @@ VPATH = ./ \
         test
 
 # Variable definitions
-LIB_NAME = libopus
+LIB_NAME = opus
 TARGET = $(LIBPREFIX)$(LIB_NAME)$(LIBSUFFIX)
 
 SRCS_C = $(SILK_SOURCES) $(CELT_SOURCES) $(OPUS_SOURCES)
diff --git a/celt b/celt
index ff4116cc..ec6588ae 160000
--- a/celt
+++ b/celt
@@ -1 +1 @@
-Subproject commit ff4116ccb5e771c84c8963c954a595407a95391e
+Subproject commit ec6588ae149f82a182c73501abaf268e0b9a190b
diff --git a/src/opus_decoder.h b/src/opus_decoder.h
index e6f05344..82d9be2f 100644
--- a/src/opus_decoder.h
+++ b/src/opus_decoder.h
@@ -51,7 +51,7 @@ struct OpusDecoder {
 #endif
 };
 
-inline short ADD_SAT16(a, b) {
+inline short ADD_SAT16(short a, short b) {
     int sum = a + b;
     return sum > 32767 ? 32767 : sum < -32768 ? -32768 : (short)sum;
 };
diff --git a/src/opus_encoder.c b/src/opus_encoder.c
index b0e445f8..3a1cdc4b 100644
--- a/src/opus_encoder.c
+++ b/src/opus_encoder.c
@@ -113,10 +113,10 @@ int opus_encode(OpusEncoder *st, const short *pcm, int frame_size,
             if( st->bandwidth == BANDWIDTH_SUPERWIDEBAND ) {
                 if( st->Fs == 100 * frame_size ) {
                     /* 24 kHz, 10 ms */
-                    st->silk_mode.bitRate = ( ( st->silk_mode.bitRate + 8000 - ( 1 - st->use_vbr ) * 7000 ) * 2 ) / 3;
+                    st->silk_mode.bitRate = ( ( st->silk_mode.bitRate + 12000 - ( 1 - st->use_vbr ) * 10000 ) * 2 ) / 3;
                 } else {
                     /* 24 kHz, 20 ms */
-                    st->silk_mode.bitRate = ( ( st->silk_mode.bitRate + 12000 - ( 1 - st->use_vbr ) * 10000 ) * 2 ) / 3;
+                    st->silk_mode.bitRate = ( ( st->silk_mode.bitRate + 8000 - ( 1 - st->use_vbr ) * 7000 ) * 2 ) / 3;
                 }
             } else {
                 if( st->Fs == 100 * frame_size ) {
-- 
cgit v1.2.3