shithub: opus

Download patch

ref: 02f352c75e0de18933fe9c495fda9dcab00f63ba
parent: 3e6a736cbb981e266a67a3978bd1acd42d0976a8
author: Jean-Marc Valin <jmvalin@amazon.com>
date: Mon Jun 12 20:24:17 EDT 2023

Fix non-DRED build

--- a/lpcnet_sources.mk
+++ b/lpcnet_sources.mk
@@ -17,4 +17,7 @@
 lpcnet/src/dred_rdovae_enc_data.c \
 lpcnet/src/dred_rdovae_dec.c \
 lpcnet/src/dred_rdovae_dec_data.c \
-lpcnet/src/dred_rdovae_stats_data.c
+lpcnet/src/dred_rdovae_stats_data.c \
+silk/dred_encoder.c \
+silk/dred_coding.c \
+silk/dred_decoder.c
--- a/silk_sources.mk
+++ b/silk_sources.mk
@@ -75,10 +75,7 @@
 silk/stereo_encode_pred.c \
 silk/stereo_find_predictor.c \
 silk/stereo_quant_pred.c \
-silk/LPC_fit.c \
-silk/dred_encoder.c \
-silk/dred_coding.c \
-silk/dred_decoder.c
+silk/LPC_fit.c
 
 SILK_SOURCES_X86_RTCD = \
 silk/x86/x86_silk_map.c
--- a/src/opus_decoder.c
+++ b/src/opus_decoder.c
@@ -1141,6 +1141,7 @@
   return sizeof(OpusDREDDecoder);
 }
 
+#ifdef ENABLE_NEURAL_FEC
 int dred_decoder_load_model(OpusDREDDecoder *dec, const unsigned char *data, int len)
 {
     WeightArray *list;
@@ -1150,10 +1151,11 @@
     free(list);
     return (ret == 0) ? OPUS_OK : OPUS_BAD_ARG;
 }
+#endif
 
 int opus_dred_decoder_init(OpusDREDDecoder *dec)
 {
-#ifndef USE_WEIGHTS_FILE
+#if defined(ENABLE_NEURAL_FEC) && !defined(USE_WEIGHTS_FILE)
    init_rdovaedec(&dec->model, rdovae_dec_arrays);
 #endif
    dec->arch = opus_select_arch();
--