diff options
| author | Jean-Marc Valin <jmvalin@amazon.com> | 2023-06-22 20:55:04 +0300 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@amazon.com> | 2023-06-22 20:55:04 +0300 |
| commit | bde43ed7cf5e75355ff4a895c946141f62572ac2 (patch) | |
| tree | 6241a62dc4bf5631eef7caecd54dd3c04ba76a69 | |
| parent | 41700b9ac641561237f28bbfae0c961a15724680 (diff) | |
misc fixes
| -rw-r--r-- | celt/celt_decoder.c | 2 | ||||
| -rw-r--r-- | dnn/lpcnet.h | 4 | ||||
| -rw-r--r-- | silk/API.h | 2 | ||||
| -rw-r--r-- | silk/dred_encoder.h | 6 | ||||
| -rw-r--r-- | silk/structs.h | 2 | ||||
| -rw-r--r-- | src/opus_decoder.c | 2 |
6 files changed, 7 insertions, 11 deletions
diff --git a/celt/celt_decoder.c b/celt/celt_decoder.c index ada5938e..d83d68a5 100644 --- 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 diff --git a/dnn/lpcnet.h b/dnn/lpcnet.h index 3c1870b3..52813c21 100644 --- 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) @@ -33,7 +33,7 @@ POSSIBILITY OF SUCH DAMAGE. #include "errors.h" #include "entenc.h" #include "entdec.h" -#include "dnn/lpcnet_private.h" +#include "lpcnet_private.h" #ifdef __cplusplus extern "C" diff --git a/silk/dred_encoder.h b/silk/dred_encoder.h index 0e220848..4c7c8b67 100644 --- 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 diff --git a/silk/structs.h b/silk/structs.h index 01f733b7..0882696c 100644 --- a/silk/structs.h +++ b/silk/structs.h @@ -36,7 +36,7 @@ POSSIBILITY OF SUCH DAMAGE. #ifdef NEURAL_PLC #include "lpcnet.h" -#include "dnn/lpcnet_private.h" +#include "lpcnet_private.h" #endif #ifdef ENABLE_NEURAL_FEC diff --git a/src/opus_decoder.c b/src/opus_decoder.c index e0949f8c..88571157 100644 --- 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; |