ref: 89b2e064a08788158794ba6a636217bb77c33427
parent: 55a15a93e0077427635b575d3b087c4348e4521d
author: Jean-Marc Valin <jmvalin@jmvalin.ca>
date: Mon Mar 18 16:09:10 EDT 2019
Fixes
--- a/dnn/Makefile.am
+++ b/dnn/Makefile.am
@@ -14,8 +14,8 @@
kiss_fft.h \
opus_types.h \
pitch.h \
- rnn_data.h \
- rnn.h \
+ nnet_data.h \
+ nnet.h \
tansig_table.h
liblpcnet_la_SOURCES = \
@@ -39,7 +39,7 @@
noinst_PROGRAMS = lpcnet_demo
endif
-src_lpcnet_demo_SOURCES = examples/lpcnet_demo.c
+src_lpcnet_demo_SOURCES = lpcnet_demo.c
src_lpcnet_demo_LDADD = liblpcnet.la
pkgconfigdir = $(libdir)/pkgconfig
--- a/dnn/configure.ac
+++ b/dnn/configure.ac
@@ -13,7 +13,7 @@
fi ]))
AC_INIT([lpcnet],[CURRENT_VERSION],[jmvalin@jmvalin.ca])
-AC_CONFIG_SRCDIR([denoise.c])
+AC_CONFIG_SRCDIR([lpcnet.c])
AC_CONFIG_MACRO_DIR([m4])
AC_USE_SYSTEM_EXTENSIONS
--- /dev/null
+++ b/dnn/include/lpcnet.h
@@ -1,0 +1,74 @@
+/* Copyright (c) 2018 Mozilla */
+/*
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef _LPCNET_H_
+#define _LPCNET_H_
+
+#define NB_FEATURES 38
+#define NB_TOTAL_FEATURES 55
+
+typedef struct LPCNetState LPCNetState;
+
+typedef struct LPCNetDecState LPCNetDecState;
+
+typedef struct LPCNetEncState LPCNetEncState;
+
+
+int lpcnet_decoder_get_size();
+
+int lpcnet_decoder_init(LPCNetDecState *st);
+
+LPCNetDecState *lpcnet_decoder_create();
+
+void lpcnet_decoder_destroy(LPCNetDecState *st);
+
+int lpcnet_decode(LPCNetDecState *st, const unsigned char *buf, short *pcm);
+
+
+
+int lpcnet_encoder_get_size();
+
+int lpcnet_encoder_init(LPCNetEncState *st);
+
+LPCNetEncState *lpcnet_encoder_create();
+
+void lpcnet_encoder_destroy(LPCNetEncState *st);
+
+int lpcnet_encode(LPCNetEncState *st, const short *pcm, unsigned char *buf);
+
+
+
+int lpcnet_get_size();
+
+int lpcnet_init(LPCNetState *lpcnet);
+
+LPCNetState *lpcnet_create();
+
+void lpcnet_destroy(LPCNetState *lpcnet);
+
+void lpcnet_synthesize(LPCNetState *lpcnet, short *output, const float *features, int N);
+
+#endif
--- a/dnn/lpcnet.h
+++ /dev/null
@@ -1,74 +1,0 @@
-/* Copyright (c) 2018 Mozilla */
-/*
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- - Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifndef _LPCNET_H_
-#define _LPCNET_H_
-
-#define NB_FEATURES 38
-#define NB_TOTAL_FEATURES 55
-
-typedef struct LPCNetState LPCNetState;
-
-typedef struct LPCNetDecState LPCNetDecState;
-
-typedef struct LPCNetEncState LPCNetEncState;
-
-
-int lpcnet_decoder_get_size();
-
-int lpcnet_decoder_init(LPCNetDecState *st);
-
-LPCNetDecState *lpcnet_decoder_create();
-
-void lpcnet_decoder_destroy(LPCNetDecState *st);
-
-int lpcnet_decode(LPCNetDecState *st, const unsigned char *buf, short *pcm);
-
-
-
-int lpcnet_encoder_get_size();
-
-int lpcnet_encoder_init(LPCNetEncState *st);
-
-LPCNetEncState *lpcnet_encoder_create();
-
-void lpcnet_encoder_destroy(LPCNetEncState *st);
-
-int lpcnet_encode(LPCNetEncState *st, const short *pcm, unsigned char *buf);
-
-
-
-int lpcnet_get_size();
-
-int lpcnet_init(LPCNetState *lpcnet);
-
-LPCNetState *lpcnet_create();
-
-void lpcnet_destroy(LPCNetState *lpcnet);
-
-void lpcnet_synthesize(LPCNetState *lpcnet, short *output, const float *features, int N);
-
-#endif
--
⑨