shithub: opus

Info  •  Files  •  Log  •  Branches

Slightly more continuous analysis

--- a/dnn/lpcnet_plc.c

+++ b/dnn/lpcnet_plc.c

@@ -49,6 +49,7 @@

   OPUS_CLEAR(st->pcm, PLC_BUF_SIZE);

   st->blend = 0;

   st->loss_count = 0;

+  st->analysis_gap = 1;

 }

 int lpcnet_plc_init(LPCNetPLCState *st) {

@@ -140,10 +141,8 @@

 int lpcnet_plc_update(LPCNetPLCState *st, opus_int16 *pcm) {

   int i;

-  if (st->blend) {

-    st->analysis_pos = PLC_BUF_SIZE-FRAME_SIZE;

-  }

   if (st->analysis_pos - FRAME_SIZE >= 0) st->analysis_pos -= FRAME_SIZE;

+  else st->analysis_gap = 1;

   OPUS_MOVE(st->pcm, &st->pcm[FRAME_SIZE], PLC_BUF_SIZE-FRAME_SIZE);

   for (i=0;i<FRAME_SIZE;i++) st->pcm[PLC_BUF_SIZE-FRAME_SIZE+i] = (1.f/32768.f)*pcm[i];

   st->loss_count = 0;

@@ -162,9 +161,8 @@

       for (i=0;i<FRAME_SIZE;i++) x[i] = 32768.f*st->pcm[st->analysis_pos+i];

       burg_cepstral_analysis(plc_features, x);

       lpcnet_compute_single_frame_features_float(&st->enc, x, st->features);

-      if (count > 0) {

-        if (count == 1) replace_features(st, st->features);

-        else queue_features(st, st->features);

+      if ((st->analysis_gap && count > 0) || count > 1) {

+        queue_features(st, st->features);

         OPUS_COPY(&plc_features[2*NB_BANDS], st->features, NB_FEATURES);

         plc_features[2*NB_BANDS+NB_FEATURES] = 1;

         compute_plc_pred(st, st->features, plc_features);

@@ -177,6 +175,7 @@

     get_fec_or_pred(st, st->features);

     queue_features(st, st->features);

     fargan_cont(&st->fargan, &st->pcm[PLC_BUF_SIZE-FARGAN_CONT_SAMPLES], st->cont_features);

+    st->analysis_gap = 0;

   }

   if (get_fec_or_pred(st, st->features)) st->loss_count = 0;

   else st->loss_count++;

@@ -184,6 +183,8 @@

   else st->features[0] = MAX16(-10, st->features[0]+att_table[st->loss_count]);

   fargan_synthesize_int(&st->fargan, pcm, &st->features[0]);

   queue_features(st, st->features);

+  if (st->analysis_pos - FRAME_SIZE >= 0) st->analysis_pos -= FRAME_SIZE;

+  else st->analysis_gap = 1;

   OPUS_MOVE(st->pcm, &st->pcm[FRAME_SIZE], PLC_BUF_SIZE-FRAME_SIZE);

   for (i=0;i<FRAME_SIZE;i++) st->pcm[PLC_BUF_SIZE-FRAME_SIZE+i] = (1.f/32768.f)*pcm[i];

   st->blend = 1;

--- a/dnn/lpcnet_private.h

+++ b/dnn/lpcnet_private.h

@@ -55,6 +55,7 @@

 #define LPCNET_PLC_RESET_START fec

   float fec[PLC_MAX_FEC][NB_FEATURES];

+  int analysis_gap;

   int fec_read_pos;

   int fec_fill_pos;

   int fec_skip;

-- 

⑨