diff options
| author | Jean-Marc Valin <jean-marc.valin@usherbrooke.ca> | 2011-02-03 12:08:38 -0500 |
|---|---|---|
| committer | Jean-Marc Valin <jean-marc.valin@usherbrooke.ca> | 2011-02-03 12:08:38 -0500 |
| commit | f85bc8a293af86165979f35db4e1073b19cca354 (patch) | |
| tree | 98722a4ca2866ff85e32d2fe2e6b12e5ab9cc177 | |
| parent | 686bfe83faa2b9d50d00751e69905f9df7a62af6 (diff) | |
| download | opus-f85bc8a293af86165979f35db4e1073b19cca354.tar.gz | |
Oops, had inverted some tuning lines
| -rw-r--r-- | Makefile.draft | 5 | ||||
| m--------- | celt | 10 | ||||
| -rw-r--r-- | src/opus_decoder.h | 2 | ||||
| -rw-r--r-- | src/opus_encoder.c | 4 |
4 files changed, 11 insertions, 10 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 -Subproject ff4116ccb5e771c84c8963c954a595407a95391 +Subproject ec6588ae149f82a182c73501abaf268e0b9a190 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 ) { |