shithub: opus

--- a/celt/celt_decoder.c

+++ b/celt/celt_decoder.c

@@ -51,7 +51,7 @@

 #include "celt_lpc.h"

 #include "vq.h"

 #include "lpcnet.h"

-#include "dnn/lpcnet_private.h"

+#include "lpcnet_private.h"

 /* The maximum pitch lag to allow in the pitch-based PLC. It's possible to save

    CPU time in the PLC pitch search by making this smaller than MAX_PERIOD. The

--- a/dnn/lpcnet.h

+++ b/dnn/lpcnet.h

@@ -32,10 +32,6 @@

 #define NB_FEATURES 20

 #define NB_TOTAL_FEATURES 36

-/** Number of bytes in a compressed packet. */

-#define LPCNET_COMPRESSED_SIZE 8

-/** Number of audio samples in a packet. */

-#define LPCNET_PACKET_SAMPLES (4*160)

 /** Number of audio samples in a feature frame (not for encoding/decoding). */

 #define LPCNET_FRAME_SIZE (160)

--- a/silk/API.h

+++ b/silk/API.h

@@ -33,7 +33,7 @@

 #include "errors.h"

 #include "entenc.h"

 #include "entdec.h"

-#include "dnn/lpcnet_private.h"

+#include "lpcnet_private.h"

 #ifdef __cplusplus

 extern "C"

--- a/silk/dred_encoder.h

+++ b/silk/dred_encoder.h

@@ -32,9 +32,9 @@

 #include "dred_config.h"

 #include "dred_rdovae.h"

 #include "entcode.h"

-#include "dnn/lpcnet_private.h"

-#include "dnn/dred_rdovae_enc.h"

-#include "dnn/dred_rdovae_enc_data.h"

+#include "lpcnet_private.h"

+#include "dred_rdovae_enc.h"

+#include "dred_rdovae_enc_data.h"

 #define RESAMPLING_ORDER 8

--- a/silk/structs.h

+++ b/silk/structs.h

@@ -36,7 +36,7 @@

 #ifdef NEURAL_PLC

 #include "lpcnet.h"

-#include "dnn/lpcnet_private.h"

+#include "lpcnet_private.h"

 #endif

 #ifdef ENABLE_NEURAL_FEC

--- a/src/opus_decoder.c

+++ b/src/opus_decoder.c

@@ -51,7 +51,7 @@

 #include "define.h"

 #include "mathops.h"

 #include "cpu_support.h"

-#include "dnn/dred_rdovae_dec_data.h"

+#include "dred_rdovae_dec_data.h"

 struct OpusDecoder {

    int          celt_dec_offset;

--

⑨