shithub: opus

--- a/dnn/Makefile

+++ /dev/null

@@ -1,68 +1,0 @@

-# Makefile for LPCNet

-CC=gcc

-CFLAGS+=-Wall -W -Wextra -Wno-unused-function -O3 -g -I../include

-AVX2:=$(shell cat /proc/cpuinfo | grep -c avx2)

-AVX:=$(shell cat /proc/cpuinfo | grep -c avx)

-NEON:=$(shell cat /proc/cpuinfo | grep -c neon)

-ifneq ($(AVX2),0)

-CFLAGS+=-mavx2 -mfma

-else

-# AVX2 machines will also match on AVX

-ifneq ($(AVX),0)

-CFLAGS+=-mavx

-endif

-endif

-ifneq ($(NEON),0)

-CFLAGS+=-mfpu=neon -march=armv8-a -mtune=cortex-a53

-endif

-all: dump_data lpcnet_demo test_lpcnet test_vec

-lpcnet_data-8ea8396.tar.gz:

-	wget https://media.xiph.org/lpcnet/data/lpcnet_data-8ea8396.tar.gz

-download: src/ceps_codebooks.c src/nnet_data.c

-src/ceps_codebooks.c: lpcnet_data-8ea8396.tar.gz

-	tar xvf lpcnet_data-8ea8396.tar.gz

-dump_data_objs := src/common.o src/dump_data.o src/freq.o src/kiss_fft.o src/pitch.o src/celt_lpc.o src/lpcnet_dec.o src/lpcnet_enc.o src/ceps_codebooks.o

-dump_data_deps := $(dump_data_objs:.o=.d)

-dump_data: download $(dump_data_objs)

-	gcc -o $@ $(CFLAGS) $(dump_data_objs) -lm

--include $dump_data_deps(_deps)

-test_lpcnet_objs := src/common.o src/test_lpcnet.o src/lpcnet.o src/nnet.o src/nnet_data.o src/freq.o src/kiss_fft.o src/pitch.o src/celt_lpc.o src/lpcnet_dec.o  src/ceps_codebooks.o

-test_lpcnet_deps := $(test_lpcnet_objs:.o=.d)

-test_lpcnet: download $(test_lpcnet_objs)

-	gcc -o $@ $(CFLAGS) $(test_lpcnet_objs) -lm

--include $(test_lpcnet_deps)

-lpcnet_demo_objs := src/common.o src/lpcnet_demo.o src/lpcnet.o src/nnet.o src/nnet_data.o src/freq.o src/kiss_fft.o src/pitch.o src/celt_lpc.o src/lpcnet_dec.o  src/ceps_codebooks.o src/lpcnet_enc.o

-lpcnet_demo_deps := $(lpcnet_demo_objs:.o=.d)

-lpcnet_demo: download $(lpcnet_demo_objs)

-	gcc -o $@ $(CFLAGS) $(lpcnet_demo_objs) -lm

--include $(lpcnet_demo_deps)

-test_vec_objs := src/test_vec.o

-test_vec_deps := $(test_vec_objs:.o=.d)

-test_vec: $(test_vec_objs)

-	gcc -o $@ $(CFLAGS) $(test_vec_objs) -lm

--include $(test_vec_deps)

-test: test_vec

-	./test_vec

-clean:

-	rm -f dump_data test_lpcnet test_vec

-	rm -f $(dump_data_objs) $(dump_data_deps)

-	rm -f $(test_lpcnet_objs) $(test_lpcnet_deps)

-	rm -f $(test_vec_objs) $(test_vec_deps)

--- a/dnn/Makefile.am

+++ b/dnn/Makefile.am

@@ -4,9 +4,9 @@

 dist_doc_DATA = COPYING AUTHORS README

-include_HEADERS = include/rnnoise.h

+include_HEADERS = include/lpcnet.h

-lib_LTLIBRARIES = librnnoise.la

+lib_LTLIBRARIES = liblpcnet.la

 noinst_HEADERS = arch.h  \

 		 celt_lpc.h  \

 		 common.h  \

@@ -18,42 +18,47 @@

 		 rnn.h  \

 		 tansig_table.h

-librnnoise_la_SOURCES = \

-	denoise.c \

-	rnn.c \

-	rnn_data.c \

+liblpcnet_la_SOURCES = \

+	common.c \

+	lpcnet.c \

+	lpcnet_dec.c \

+	lpcnet_enc.c \

+	nnet.c \

+	nnet_data.c \

+	ceps_codebooks.c \

 	pitch.c \

+	freq.c \

 	kiss_fft.c \

 	celt_lpc.c

-librnnoise_la_LIBADD = $(DEPS_LIBS) $(lrintf_lib) $(LIBM)

-librnnoise_la_LDFLAGS = -no-undefined \

+liblpcnet_la_LIBADD = $(DEPS_LIBS) $(lrintf_lib) $(LIBM)

+liblpcnet_la_LDFLAGS = -no-undefined \

  -version-info @OP_LT_CURRENT@:@OP_LT_REVISION@:@OP_LT_AGE@

 if OP_ENABLE_EXAMPLES

-noinst_PROGRAMS = examples/rnnoise_demo

+noinst_PROGRAMS = lpcnet_demo

 endif

-examples_rnnoise_demo_SOURCES = examples/rnnoise_demo.c

-examples_rnnoise_demo_LDADD = librnnoise.la

+src_lpcnet_demo_SOURCES = examples/lpcnet_demo.c

+src_lpcnet_demo_LDADD = liblpcnet.la

 pkgconfigdir = $(libdir)/pkgconfig

-pkgconfig_DATA = rnnoise.pc

+pkgconfig_DATA = lpcnet.pc

 debug:

 	$(MAKE) CFLAGS="${CFLAGS} -O0 -ggdb -DOP_ENABLE_ASSERTIONS" all

 EXTRA_DIST = \

- rnnoise.pc.in \

- rnnoise-uninstalled.pc.in \

+ lpcnet.pc.in \

+ lpcnet-uninstalled.pc.in \

  doc/Doxyfile.in \

  doc/Makefile

 # Targets to build and install just the library without the docs

-librnnoise install-librnnoise: NO_DOXYGEN = 1

+liblpcnet install-liblpcnet: NO_DOXYGEN = 1

-rnnoise: all

-install-rnnoise: install

+lpcnet: all

+install-lpcnet: install

 # Or just the docs

 docs: doc/doxygen-build.stamp

@@ -126,4 +131,4 @@

 	echo 'PACKAGE_VERSION="$(PACKAGE_VERSION)"' > $(top_distdir)/package_version

-.PHONY: rnnoise install-rnnoise docs install-docs

+.PHONY: lpcnet install-lpcnet docs install-docs

--- a/dnn/autogen.sh

+++ b/dnn/autogen.sh

@@ -5,6 +5,6 @@

 srcdir=`dirname $0`

 test -n "$srcdir" && cd "$srcdir"

-echo "Updating build configuration files for rnnoise, please wait...."

+echo "Updating build configuration files for lpcnet, please wait...."

 autoreconf -isf

--- a/dnn/configure.ac

+++ b/dnn/configure.ac

@@ -12,7 +12,7 @@

                            printf "unknown"

                        fi ]))

-AC_INIT([rnnoise],[CURRENT_VERSION],[jmvalin@jmvalin.ca])

+AC_INIT([lpcnet],[CURRENT_VERSION],[jmvalin@jmvalin.ca])

 AC_CONFIG_SRCDIR([denoise.c])

 AC_CONFIG_MACRO_DIR([m4])

@@ -28,7 +28,7 @@

 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

-AC_DEFINE([RNNOISE_BUILD], [], [This is a build of the library])

+AC_DEFINE([LPCNET_BUILD], [], [This is a build of the library])

 dnl Library versioning for libtool.

 dnl Please update these for releases.

@@ -108,8 +108,8 @@

 AC_CONFIG_FILES([

   Makefile

-  rnnoise.pc

-  rnnoise-uninstalled.pc

+  lpcnet.pc

+  lpcnet-uninstalled.pc

   doc/Doxyfile

])

 AC_CONFIG_HEADERS([config.h])

--- a/dnn/doc/Doxyfile.in

+++ b/dnn/doc/Doxyfile.in

@@ -2,8 +2,8 @@

 PROJECT_NAME           = @PACKAGE_NAME@

 PROJECT_NUMBER         = @PACKAGE_VERSION@

-PROJECT_BRIEF          = "RNN-based noise suppressor."

-INPUT                  = @top_srcdir@/include/rnnoise.h

+PROJECT_BRIEF          = "Neural Vocoder."

+INPUT                  = @top_srcdir@/include/lpcnet.h

 OPTIMIZE_OUTPUT_FOR_C  = YES

 QUIET                  = YES

--- /dev/null

+++ b/dnn/doc/Makefile

@@ -1,0 +1,68 @@

+# Makefile for LPCNet

+CC=gcc

+CFLAGS+=-Wall -W -Wextra -Wno-unused-function -O3 -g -I../include

+AVX2:=$(shell cat /proc/cpuinfo | grep -c avx2)

+AVX:=$(shell cat /proc/cpuinfo | grep -c avx)

+NEON:=$(shell cat /proc/cpuinfo | grep -c neon)

+ifneq ($(AVX2),0)

+CFLAGS+=-mavx2 -mfma

+else

+# AVX2 machines will also match on AVX

+ifneq ($(AVX),0)

+CFLAGS+=-mavx

+endif

+endif

+ifneq ($(NEON),0)

+CFLAGS+=-mfpu=neon -march=armv8-a -mtune=cortex-a53

+endif

+all: dump_data lpcnet_demo test_lpcnet test_vec

+lpcnet_data-8ea8396.tar.gz:

+	wget https://media.xiph.org/lpcnet/data/lpcnet_data-8ea8396.tar.gz

+download: src/ceps_codebooks.c src/nnet_data.c

+src/ceps_codebooks.c: lpcnet_data-8ea8396.tar.gz

+	tar xvf lpcnet_data-8ea8396.tar.gz

+dump_data_objs := src/common.o src/dump_data.o src/freq.o src/kiss_fft.o src/pitch.o src/celt_lpc.o src/lpcnet_dec.o src/lpcnet_enc.o src/ceps_codebooks.o

+dump_data_deps := $(dump_data_objs:.o=.d)

+dump_data: download $(dump_data_objs)

+	gcc -o $@ $(CFLAGS) $(dump_data_objs) -lm

+-include $dump_data_deps(_deps)

+test_lpcnet_objs := src/common.o src/test_lpcnet.o src/lpcnet.o src/nnet.o src/nnet_data.o src/freq.o src/kiss_fft.o src/pitch.o src/celt_lpc.o src/lpcnet_dec.o  src/ceps_codebooks.o

+test_lpcnet_deps := $(test_lpcnet_objs:.o=.d)

+test_lpcnet: download $(test_lpcnet_objs)

+	gcc -o $@ $(CFLAGS) $(test_lpcnet_objs) -lm

+-include $(test_lpcnet_deps)

+lpcnet_demo_objs := src/common.o src/lpcnet_demo.o src/lpcnet.o src/nnet.o src/nnet_data.o src/freq.o src/kiss_fft.o src/pitch.o src/celt_lpc.o src/lpcnet_dec.o  src/ceps_codebooks.o src/lpcnet_enc.o

+lpcnet_demo_deps := $(lpcnet_demo_objs:.o=.d)

+lpcnet_demo: download $(lpcnet_demo_objs)

+	gcc -o $@ $(CFLAGS) $(lpcnet_demo_objs) -lm

+-include $(lpcnet_demo_deps)

+test_vec_objs := src/test_vec.o

+test_vec_deps := $(test_vec_objs:.o=.d)

+test_vec: $(test_vec_objs)

+	gcc -o $@ $(CFLAGS) $(test_vec_objs) -lm

+-include $(test_vec_deps)

+test: test_vec

+	./test_vec

+clean:

+	rm -f dump_data test_lpcnet test_vec

+	rm -f $(dump_data_objs) $(dump_data_deps)

+	rm -f $(test_lpcnet_objs) $(test_lpcnet_deps)

+	rm -f $(test_vec_objs) $(test_vec_deps)

--- a/dnn/lpcnet-uninstalled.pc.in

+++ b/dnn/lpcnet-uninstalled.pc.in

@@ -1,4 +1,4 @@

-# rnnoise uninstalled pkg-config file

+# lpcnet uninstalled pkg-config file

 prefix=

 exec_prefix=

@@ -5,9 +5,9 @@

 libdir=${pcfiledir}/.libs

 includedir=${pcfiledir}/@top_srcdir@/include

-Name: rnnoise uninstalled

+Name: lpcnet uninstalled

 Description: RNN-based noise suppression (not installed)

 Version: @PACKAGE_VERSION@

 Conflicts:

-Libs: ${libdir}/librnnoise.la @lrintf_lib@

+Libs: ${libdir}/liblpcnet.la @lrintf_lib@

 Cflags: -I${includedir}

--- a/dnn/lpcnet.pc.in

+++ b/dnn/lpcnet.pc.in

@@ -1,4 +1,4 @@

-# rnnoise installed pkg-config file

+# lpcnet installed pkg-config file

 prefix=@prefix@

 exec_prefix=@exec_prefix@

@@ -5,10 +5,10 @@

 libdir=@libdir@

 includedir=@includedir@

-Name: rnnoise

+Name: lpcnet

 Description: RNN-based noise suppression

 Version: @PACKAGE_VERSION@

 Conflicts:

-Libs: -L${libdir} -lrnnoise

+Libs: -L${libdir} -llpcnet

 Libs.private: @lrintf_lib@

 Cflags: -I${includedir}/

--

⑨