shithub: opus

Info  •  Files  •  Log  •  Branches

Cleanup, remove "old" DRED API

--- a/include/opus.h

+++ b/include/opus.h

@@ -520,12 +520,9 @@

 OPUS_EXPORT void opus_dred_destroy(OpusDRED *dec);

-OPUS_EXPORT int opus_dred_parse(OpusDRED *dred, const unsigned char *data, opus_int32 len, opus_int32 max_dred_samples, opus_int32 sampling_rate, int defer_processing);

+OPUS_EXPORT int opus_dred_parse(OpusDRED *dred, const unsigned char *data, opus_int32 len, opus_int32 max_dred_samples, opus_int32 sampling_rate, int defer_processing) OPUS_ARG_NONNULL(1);

 OPUS_EXPORT int opus_dred_process(OpusDRED *dred);

-

-OPUS_EXPORT int opus_decoder_dred_parse(OpusDecoder *st, const unsigned char *data,

-      opus_int32 len, int offset) OPUS_ARG_NONNULL(1);

 OPUS_EXPORT int opus_decoder_dred_output(OpusDecoder *st, OpusDRED *dred, int dred_offset, opus_int16 *pcm, int frame_size);

 OPUS_EXPORT int opus_decoder_dred_output_float(OpusDecoder *st, OpusDRED *dred, int dred_offset, float *pcm, int frame_size);

--- a/silk/dred_decoder.c

+++ b/silk/dred_decoder.c

@@ -58,6 +58,7 @@

 void opus_dred_destroy(OpusDRED *dec)

 {

+  free(dec);

 }

 int dred_ec_decode(OpusDRED *dec, const opus_uint8 *bytes, int num_bytes, int min_feature_frames)

--- a/src/opus_decoder.c

+++ b/src/opus_decoder.c

@@ -74,11 +74,6 @@

 #ifndef FIXED_POINT

    opus_val16   softclip_mem[2];

 #endif

-#ifdef ENABLE_NEURAL_FEC

-   OpusDRED      dred_decoder;

-   float        fec_features[2*DRED_NUM_REDUNDANCY_FRAMES*DRED_NUM_FEATURES];

-   int          nb_fec_frames;

-#endif

    opus_uint32  rangeFinal;

 };

@@ -656,7 +651,7 @@

    if ((decode_fec || len==0 || data==NULL) && frame_size%(st->Fs/400)!=0)

       return OPUS_BAD_ARG;

 #ifdef ENABLE_NEURAL_FEC

-   if (dred != NULL) {

+   if (dred != NULL && dred->process_stage == 2) {

       int features_per_frame;

       int needed_feature_frames;

       lpcnet_plc_fec_clear(silk_dec->sPLC.lpcnet);

@@ -1146,27 +1141,6 @@

    return 0;

 }

 #endif

-

-int opus_decoder_dred_parse(OpusDecoder *st, const unsigned char *data, opus_int32 len, int offset)

-{

-#ifdef ENABLE_NEURAL_FEC

-   const unsigned char *payload;

-   opus_int32 payload_len;

-   payload_len = dred_find_payload(data, len, &payload);

-   if (payload != NULL)

-   {

-      int min_feature_frames;

-      /*printf("Found: %p of size %d\n", payload, payload_len);*/

-      min_feature_frames = IMIN(2 + offset, 2*DRED_NUM_REDUNDANCY_FRAMES);

-      dred_ec_decode(&st->dred_decoder, payload, payload_len, min_feature_frames);

-      opus_dred_process(&st->dred_decoder);

-      OPUS_COPY(st->fec_features, st->dred_decoder.fec_features, 4*st->dred_decoder.nb_latents*DRED_NUM_FEATURES);

-      st->nb_fec_frames = 4*st->dred_decoder.nb_latents;

-      return st->nb_fec_frames;

-   }

-#endif

-   return 0;

-}

 int opus_dred_parse(OpusDRED *dred, const unsigned char *data, opus_int32 len, opus_int32 max_dred_samples, opus_int32 sampling_rate, int defer_processing)

 {

-- 

⑨