Commit f85bc8a2 authored by Jean-Marc Valin's avatar Jean-Marc Valin
Browse files

Oops, had inverted some tuning lines

parent 686bfe83
...@@ -18,7 +18,8 @@ cppflags-from-includes = $(addprefix -I,$(1)) ...@@ -18,7 +18,8 @@ cppflags-from-includes = $(addprefix -I,$(1))
ldflags-from-ldlibdirs = $(addprefix -L,$(1)) ldflags-from-ldlibdirs = $(addprefix -L,$(1))
ldlibs-from-libs = $(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-defines,$(CDEFINES))
CFLAGS += $(call cppflags-from-includes,$(CINCLUDES)) CFLAGS += $(call cppflags-from-includes,$(CINCLUDES))
...@@ -59,7 +60,7 @@ VPATH = ./ \ ...@@ -59,7 +60,7 @@ VPATH = ./ \
test test
# Variable definitions # Variable definitions
LIB_NAME = libopus LIB_NAME = opus
TARGET = $(LIBPREFIX)$(LIB_NAME)$(LIBSUFFIX) TARGET = $(LIBPREFIX)$(LIB_NAME)$(LIBSUFFIX)
SRCS_C = $(SILK_SOURCES) $(CELT_SOURCES) $(OPUS_SOURCES) SRCS_C = $(SILK_SOURCES) $(CELT_SOURCES) $(OPUS_SOURCES)
......
celt @ ec6588ae
Subproject commit ff4116ccb5e771c84c8963c954a595407a95391e Subproject commit ec6588ae149f82a182c73501abaf268e0b9a190b
...@@ -51,7 +51,7 @@ struct OpusDecoder { ...@@ -51,7 +51,7 @@ struct OpusDecoder {
#endif #endif
}; };
inline short ADD_SAT16(a, b) { inline short ADD_SAT16(short a, short b) {
int sum = a + b; int sum = a + b;
return sum > 32767 ? 32767 : sum < -32768 ? -32768 : (short)sum; return sum > 32767 ? 32767 : sum < -32768 ? -32768 : (short)sum;
}; };
......
...@@ -113,10 +113,10 @@ int opus_encode(OpusEncoder *st, const short *pcm, int frame_size, ...@@ -113,10 +113,10 @@ int opus_encode(OpusEncoder *st, const short *pcm, int frame_size,
if( st->bandwidth == BANDWIDTH_SUPERWIDEBAND ) { if( st->bandwidth == BANDWIDTH_SUPERWIDEBAND ) {
if( st->Fs == 100 * frame_size ) { if( st->Fs == 100 * frame_size ) {
/* 24 kHz, 10 ms */ /* 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 { } else {
/* 24 kHz, 20 ms */ /* 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 { } else {
if( st->Fs == 100 * frame_size ) { if( st->Fs == 100 * frame_size ) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment