diff options
| author | tlegrand@chromium.org <tlegrand@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-23 09:13:50 +0000 |
|---|---|---|
| committer | tlegrand@chromium.org <tlegrand@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-23 09:13:50 +0000 |
| commit | e3ea049fcaee2247e45f0ce793d4313babb4ef69 (patch) | |
| tree | 4449fa158c45dea4175443f44c3dfc1264bd6dfb /Makefile.unix | |
| parent | 6b6bee25314cfac02cc555cddedb9680c63a26d6 (diff) | |
| download | src-e3ea049fcaee2247e45f0ce793d4313babb4ef69.tar.gz | |
Updating Opus to a pre-release of 1.1
This CL updates Opus to a pre-release of the coming Opus 1.1 version. The code is extracted from http://git.xiph.org/?p=opus.git, commit aee4d8057632ea0cfc1d55d88acf8466b47b7b4b from October 1st 2013.
This version includes both algorithmic and platform optimizations, as well an important fix for a denorm problem when the input goes silent after active audio. The problem causes high CPU usage.
Review URL: https://codereview.chromium.org/28553003
git-svn-id: svn://svn.chromium.org/chrome/trunk/deps/third_party/opus@230378 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'Makefile.unix')
| -rw-r--r-- | Makefile.unix | 48 |
1 files changed, 26 insertions, 22 deletions
diff --git a/Makefile.unix b/Makefile.unix index 88637c1..c0bab7c 100644 --- a/Makefile.unix +++ b/Makefile.unix @@ -20,8 +20,8 @@ CFLAGS := -Drestrict= $(CFLAGS) ###################### END OF OPTIONS ###################### -include version.mk -CFLAGS += -DOPUS_VERSION='$(OPUS_VERSION)' +-include package_version + include silk_sources.mk include celt_sources.mk include opus_sources.mk @@ -30,6 +30,7 @@ ifdef FIXED_POINT SILK_SOURCES += $(SILK_SOURCES_FIXED) else SILK_SOURCES += $(SILK_SOURCES_FLOAT) +OPUS_SOURCES += $(OPUS_SOURCES_FLOAT) endif EXESUFFIX = @@ -45,29 +46,19 @@ CP = $(TOOLCHAIN_PREFIX)cp cppflags-from-defines = $(addprefix -D,$(1)) cppflags-from-includes = $(addprefix -I,$(1)) ldflags-from-ldlibdirs = $(addprefix -L,$(1)) -ldlibs-from-libs = $(addprefix -l,$(1)) +ldlibs-from-libs = $(addprefix -l,$(1)) WARNINGS = -Wall -W -Wstrict-prototypes -Wextra -Wcast-align -Wnested-externs -Wshadow CFLAGS += -O2 -g $(WARNINGS) -DOPUS_BUILD +CINCLUDES = include silk celt + ifdef FIXED_POINT CFLAGS += -DFIXED_POINT=1 -DDISABLE_FLOAT_API +CINCLUDES += silk/fixed +else +CINCLUDES += silk/float endif -CINCLUDES += include/ \ - silk/ \ - silk/float/ \ - silk/fixed/ \ - celt/ \ - src/ - -# VPATH e.g. VPATH = src:../headers -VPATH = ./ \ - silk/interface \ - silk/src_FIX \ - silk/src_FLP \ - silk/src_SigProc_FIX \ - silk/src_SigProc_FLP \ - test LIBS = m @@ -108,9 +99,7 @@ OPUSCOMPARE_SRCS_C = src/opus_compare.c OPUSCOMPARE_OBJS := $(patsubst %.c,%$(OBJSUFFIX),$(OPUSCOMPARE_SRCS_C)) # Rules -default: all - -all: $(TARGET) lib opus_demo opus_compare +all: lib opus_demo opus_compare lib: $(TARGET) @@ -123,5 +112,20 @@ opus_demo$(EXESUFFIX): $(OPUSDEMO_OBJS) $(TARGET) opus_compare$(EXESUFFIX): $(OPUSCOMPARE_OBJS) $(LINK.o.cmdline) +celt/celt.o: CFLAGS += -DPACKAGE_VERSION='$(PACKAGE_VERSION)' +celt/celt.o: package_version + +package_version: force + @if [ -x ./update_version ]; then \ + ./update_version || true; \ + elif [ ! -e ./package_version ]; then \ + echo 'PACKAGE_VERSION="unknown"' > ./package_version; \ + fi + +force: + clean: - rm -f opus_demo$(EXESUFFIX) opus_compare$(EXESUFFIX) $(TARGET) $(OBJS) $(OPUSDEMO_OBJS) + rm -f opus_demo$(EXESUFFIX) opus_compare$(EXESUFFIX) $(TARGET) \ + $(OBJS) $(OPUSDEMO_OBJS) $(OPUSCOMPARE_OBJS) + +.PHONY: all lib clean |