From d1b48b716a881970d3b17d6bb58a85cd3983b245 Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jmvalin@amazon.com>
Date: Wed, 7 Dec 2022 12:56:14 -0500
Subject: [PATCH] DRED: better naming
---
silk/dred_decoder.c | 4 ++--
silk/dred_decoder.h | 2 +-
src/opus_decoder.c | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/silk/dred_decoder.c b/silk/dred_decoder.c
index 21509c445..54a479265 100644
--- a/silk/dred_decoder.c
+++ b/silk/dred_decoder.c
@@ -47,7 +47,7 @@ void dred_deinit_decoder(DREDDec *dec)
DRED_rdovae_destroy_decoder(dec->rdovae_dec);
}
-int dred_decode_redundancy_package(DREDDec *dec, float *features, const opus_uint8 *bytes, int num_bytes, int max_fec_frames)
+int dred_decode_redundancy_package(DREDDec *dec, float *features, const opus_uint8 *bytes, int num_bytes, int min_feature_frames)
{
const opus_uint16 *p0 = DRED_rdovae_get_p0_pointer();
const opus_uint16 *quant_scales = DRED_rdovae_get_quant_scales_pointer();
@@ -70,7 +70,7 @@ int dred_decode_redundancy_package(DREDDec *dec, float *features, const opus_uin
DRED_rdovae_dec_init_states(dec->rdovae_dec, state);
/* decode newest to oldest and store oldest to newest */
- for (i = 0; i < IMIN(DRED_NUM_REDUNDANCY_FRAMES, (max_fec_frames+1)/2); i += 2)
+ for (i = 0; i < IMIN(DRED_NUM_REDUNDANCY_FRAMES, (min_feature_frames+1)/2); i += 2)
{
/* FIXME: Figure out how to avoid missing a last frame that would take up < 8 bits. */
if (8*num_bytes - ec_tell(&ec) <= 7)
diff --git a/silk/dred_decoder.h b/silk/dred_decoder.h
index 2754a3fe2..633e4c83b 100644
--- a/silk/dred_decoder.h
+++ b/silk/dred_decoder.h
@@ -38,4 +38,4 @@ void init_dred_decoder(DREDDec *dec);
void dred_deinit_decoder(DREDDec *dec);
-int dred_decode_redundancy_package(DREDDec *dec, float *features, const opus_uint8 *bytes, int num_bytes, int max_fec_frames);
+int dred_decode_redundancy_package(DREDDec *dec, float *features, const opus_uint8 *bytes, int num_bytes, int min_feature_frames);
diff --git a/src/opus_decoder.c b/src/opus_decoder.c
index c7ae597a8..d4595a677 100644
--- a/src/opus_decoder.c
+++ b/src/opus_decoder.c
@@ -1090,12 +1090,12 @@ int opus_decoder_dred_input(OpusDecoder *st, const unsigned char *data,
}
if (payload != NULL)
{
- int max_fec_frames;
+ int min_feature_frames;
silk_decoder_state *silk_dec;
silk_dec = (silk_decoder_state*)((char*)st+st->silk_dec_offset);
/*printf("Found: %p of size %d\n", payload, payload_len);*/
- max_fec_frames = IMIN(2 + offset, 2*DRED_NUM_REDUNDANCY_FRAMES);
- silk_dec->sPLC.nb_fec_frames = dred_decode_redundancy_package(&silk_dec->sPLC.dred_decoder, silk_dec->sPLC.fec_features, payload, payload_len, max_fec_frames);
+ min_feature_frames = IMIN(2 + offset, 2*DRED_NUM_REDUNDANCY_FRAMES);
+ silk_dec->sPLC.nb_fec_frames = dred_decode_redundancy_package(&silk_dec->sPLC.dred_decoder, silk_dec->sPLC.fec_features, payload, payload_len, min_feature_frames);
/*printf("%d\n", silk_dec->sPLC.nb_fec_frames);*/
return 1;
}
--
GitLab