diff options
| author | Jean-Marc Valin <jmvalin@amazon.com> | 2023-01-11 03:58:28 -0500 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@amazon.com> | 2023-01-11 03:58:28 -0500 |
| commit | ad1f94d2a4c121c3b732e6988095cafa39ea9c4d (patch) | |
| tree | 8d25deb5406baeddb38ac16403dd203edb0c03ca | |
| parent | 40f7ec5164e3285346b4cbc3988f0154a90bf6ae (diff) | |
| download | opus-ad1f94d2a4c121c3b732e6988095cafa39ea9c4d.tar.gz | |
Fixes build when ENABLE_NEURAL_FEC is off
| -rw-r--r-- | src/opus_decoder.c | 3 | ||||
| -rw-r--r-- | src/opus_encoder.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/opus_decoder.c b/src/opus_decoder.c index 670a898d..555eed28 100644 --- a/src/opus_decoder.c +++ b/src/opus_decoder.c @@ -904,7 +904,6 @@ int opus_decoder_ctl(OpusDecoder *st, int request, ...) break; case OPUS_RESET_STATE: { - dred_deinit_decoder(&st->dred_decoder); OPUS_CLEAR((char*)&st->OPUS_DECODER_RESET_START, sizeof(OpusDecoder)- ((char*)&st->OPUS_DECODER_RESET_START - (char*)st)); @@ -1075,6 +1074,7 @@ int opus_decoder_get_nb_samples(const OpusDecoder *dec, int opus_decoder_dred_input(OpusDecoder *st, const unsigned char *data, opus_int32 len, int offset) { +#ifdef ENABLE_NEURAL_FEC const unsigned char *data0; int len0; const unsigned char *payload = NULL; @@ -1128,5 +1128,6 @@ int opus_decoder_dred_input(OpusDecoder *st, const unsigned char *data, lpcnet_plc_fec_clear(silk_dec->sPLC.lpcnet); return st->nb_fec_frames; } +#endif return 0; } diff --git a/src/opus_encoder.c b/src/opus_encoder.c index f05b3829..67200da8 100644 --- a/src/opus_encoder.c +++ b/src/opus_encoder.c @@ -1884,10 +1884,12 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_ st->silk_bw_switch = 1; } } else { +#ifdef ENABLE_NEURAL_FEC /* If we're not in SILK mode, delete all the processed DRED. TODO: Remove this if/when DRED gets encoded for CELT. */ DREDEnc *dred = &((silk_encoder*)silk_enc)->state_Fxx[0].sCmn.dred_encoder; dred->latents_buffer_fill = 0; +#endif } /* CELT processing */ |