From dff6541f93fdfccdcdff835de7a0b27467835d08 Mon Sep 17 00:00:00 2001
From: Geoffrey McRae <geoff@hostfission.com>
Date: Thu, 21 Mar 2019 11:01:17 +1100
Subject: [PATCH] Alter library to support streaming from a ringbuffer

---
 include/rnnoise.h |  6 +++++-
 src/denoise.c     | 34 ++++++++++++++++++++++++++++------
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/include/rnnoise.h b/include/rnnoise.h
index 562b34cb..b89045f4 100644
--- a/include/rnnoise.h
+++ b/include/rnnoise.h
@@ -49,4 +49,8 @@ RNNOISE_EXPORT DenoiseState *rnnoise_create();
 
 RNNOISE_EXPORT void rnnoise_destroy(DenoiseState *st);
 
-RNNOISE_EXPORT float rnnoise_process_frame(DenoiseState *st, float *out, const float *in);
+RNNOISE_EXPORT size_t rnnoise_need_samples(DenoiseState *st);
+
+RNNOISE_EXPORT size_t rnnoise_add_samples(DenoiseState *st, const float *in, size_t samples);
+
+RNNOISE_EXPORT float rnnoise_process_frame(DenoiseState *st, float *out);
diff --git a/src/denoise.c b/src/denoise.c
index 128cd999..2e184483 100644
--- a/src/denoise.c
+++ b/src/denoise.c
@@ -84,6 +84,9 @@ typedef struct {
 } CommonState;
 
 struct DenoiseState {
+  float input[FRAME_SIZE];
+  size_t input_pos;
+
   float analysis_mem[FRAME_SIZE];
   float cepstral_mem[CEPS_MEM][NB_BANDS];
   int memid;
@@ -468,11 +471,30 @@ void pitch_filter(kiss_fft_cpx *X, const kiss_fft_cpx *P, const float *Ex, const
   }
 }
 
-float rnnoise_process_frame(DenoiseState *st, float *out, const float *in) {
+size_t rnnoise_need_samples(DenoiseState *st) {
+  return FRAME_SIZE - st->input_pos;
+}
+
+size_t rnnoise_add_samples(DenoiseState *st, const float *in, size_t samples) {
+  static const float a_hp[2] = {-1.99599, 0.99600};
+  static const float b_hp[2] = {-2, 1};
+
+  if (FRAME_SIZE - st->input_pos < samples)
+    samples = FRAME_SIZE - st->input_pos;
+
+  if (!samples)
+    return 0;
+
+  biquad(st->input + st->input_pos, st->mem_hp_x, in, b_hp, a_hp, samples);
+  st->input_pos += samples;
+
+  return samples;
+}
+
+float rnnoise_process_frame(DenoiseState *st, float *out) {
   int i;
   kiss_fft_cpx X[FREQ_SIZE];
   kiss_fft_cpx P[WINDOW_SIZE];
-  float x[FRAME_SIZE];
   float Ex[NB_BANDS], Ep[NB_BANDS];
   float Exp[NB_BANDS];
   float features[NB_FEATURES];
@@ -480,10 +502,10 @@ float rnnoise_process_frame(DenoiseState *st, float *out, const float *in) {
   float gf[FREQ_SIZE]={1};
   float vad_prob = 0;
   int silence;
-  static const float a_hp[2] = {-1.99599, 0.99600};
-  static const float b_hp[2] = {-2, 1};
-  biquad(x, st->mem_hp_x, in, b_hp, a_hp, FRAME_SIZE);
-  silence = compute_frame_features(st, X, P, Ex, Ep, Exp, features, x);
+
+  celt_assert(st->input_pos == FRAME_SIZE);
+  silence = compute_frame_features(st, X, P, Ex, Ep, Exp, features, st->input);
+  st->input_pos = 0;
 
   if (!silence) {
     compute_rnn(&st->rnn, g, &vad_prob, features);