audio/filter: switch remaining in-place filters to refcounting

Adds about 7 lines of boilerplate per filter. This could be avoided by
providing a different entrypoint (something like af->filter_inplace),
which would basically mirror the old interface exactly for this kind of
filter. But I feel like it would just be a hack to support all those
old, useless filters better. (The ideal solution would be using a
language that can do closures to provide a compat. wrapper, but
whatever.)

af_bs2b has terribly repetitious code for setting up filter functions
for each format (most of them useless, in addition to bs2b being
useless), so I did something terrible with macros.

af_sinesuppress had commented code for float filtering (maybe it was
broken; it has been commented every since it was added in 2006). Remove
this code.

1 files changed, 9 insertions, 4 deletions

diff --git a/audio/filter/af_delay.c b/audio/filter/af_delay.c
index 56013b3270..8de26ece77 100644
--- a/audio/filter/af_delay.c
+++ b/audio/filter/af_delay.c
@@ -96,15 +96,19 @@ static void uninit(struct af_instance* af)
       free(((af_delay_t*)(af->priv))->q[i]);
 }
 
-// Filter data through filter
-static int filter(struct af_instance* af, struct mp_audio* data, int flags)
+static int filter_frame(struct af_instance *af, struct mp_audio *c)
 {
-  struct mp_audio*      c   = data;      // Current working data
+  if (!c)
+    return 0;
   af_delay_t*   s   = af->priv; // Setup for this instance
   int           nch = c->nch;    // Number of channels
   int           len = mp_audio_psize(c)/c->bps; // Number of sample in data chunk
   int           ri  = 0;
   int           ch,i;
+  if (af_make_writeable(af, c) < 0) {
+    talloc_free(c);
+    return -1;
+  }
   for(ch=0;ch<nch;ch++){
     switch(c->bps){
     case 1:{
@@ -152,6 +156,7 @@ static int filter(struct af_instance* af, struct mp_audio* data, int flags)
     }
   }
   s->ri = ri;
+  af_add_output_frame(af, c);
   return 0;
 }
 
@@ -159,7 +164,7 @@ static int filter(struct af_instance* af, struct mp_audio* data, int flags)
 static int af_open(struct af_instance* af){
     af->control=control;
     af->uninit=uninit;
-    af->filter=filter;
+    af->filter_frame = filter_frame;
     af_delay_t *s = af->priv;
     int n = 1;
     int i = 0;