From bcd8afc2ad086b07b1cad8379581bbbae5e67a6e Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Wed, 4 Dec 2013 22:18:18 +0100
Subject: af_delay: change option parsing, fix bugs, use option parser

Similar situation to af_channels.
---
 DOCS/man/en/af.rst      |  6 ++---
 audio/filter/af_delay.c | 63 ++++++++++++++++++++++++++++---------------------
 2 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/DOCS/man/en/af.rst b/DOCS/man/en/af.rst
index bb7f34cf62..a0332c1327 100644
--- a/DOCS/man/en/af.rst
+++ b/DOCS/man/en/af.rst
@@ -390,12 +390,12 @@ Available filters are:
             Would add surround sound decoding with 15ms delay for the sound to
             the rear speakers.
 
-``delay[=ch1:ch2:...]``
+``delay[=[ch1,ch2,...]]``
     Delays the sound to the loudspeakers such that the sound from the
     different channels arrives at the listening position simultaneously. It is
     only useful if you have more than 2 loudspeakers.
 
-    ``ch1,ch2,...``
+    ``[ch1,ch2,...]``
         The delay in ms that should be imposed on each channel (floating point
         number between 0 and 1000).
 
@@ -414,7 +414,7 @@ Available filters are:
 
     .. admonition:: Example
 
-        ``mpv --af=delay=10.5:10.5:0:0:7:0 media.avi``
+        ``mpv --af=delay=[10.5,10.5,0,0,7,0] media.avi``
             Would delay front left and right by 10.5ms, the two rear channels
             and the subwoofer by 0ms and the center channel by 7ms.
 
diff --git a/audio/filter/af_delay.c b/audio/filter/af_delay.c
index e605ca71f4..6dac83a74f 100644
--- a/audio/filter/af_delay.c
+++ b/audio/filter/af_delay.c
@@ -41,22 +41,29 @@ typedef struct af_delay_s
   int 	wi[AF_NCH];  	// Write index
   int 	ri;		// Read index
   float	d[AF_NCH];   	// Delay [ms]
+  char *delaystr;
 }af_delay_t;
 
 // Initialization and runtime control
 static int control(struct af_instance* af, int cmd, void* arg)
 {
-  af_delay_t* s = af->setup;
+  af_delay_t* s = af->priv;
   switch(cmd){
   case AF_CONTROL_REINIT:{
     int i;
+    struct mp_audio *in = arg;
+
+    if (in->bps != 1 && in->bps != 2 && in->bps != 4) {
+      mp_msg(MSGT_AFILTER, MSGL_FATAL, "[delay] Sample format not supported\n");
+      return AF_ERROR;
+    }
 
     // Free prevous delay queues
     for(i=0;i<af->data->nch;i++)
       free(s->q[i]);
 
-    mp_audio_copy_config(af->data, (struct mp_audio*)arg);
-    mp_audio_force_interleaved_format(af->data);
+    mp_audio_force_interleaved_format(in);
+    mp_audio_copy_config(af->data, in);
 
     // Allocate new delay queues
     for(i=0;i<af->data->nch;i++){
@@ -76,19 +83,6 @@ static int control(struct af_instance* af, int cmd, void* arg)
     }
     return AF_OK;
   }
-  case AF_CONTROL_COMMAND_LINE:{
-    int n = 1;
-    int i = 0;
-    char* cl = arg;
-    while(n && i < AF_NCH ){
-      sscanf(cl,"%f:%n",&s->d[i],&n);
-      if(n==0 || cl[n-1] == '\0')
-	break;
-      cl=&cl[n];
-      i++;
-    }
-    return AF_OK;
-  }
   }
   return AF_UNKNOWN;
 }
@@ -99,15 +93,14 @@ static void uninit(struct af_instance* af)
   int i;
 
   for(i=0;i<AF_NCH;i++)
-      free(((af_delay_t*)(af->setup))->q[i]);
-  free(af->setup);
+      free(((af_delay_t*)(af->priv))->q[i]);
 }
 
 // Filter data through filter
 static struct mp_audio* play(struct af_instance* af, struct mp_audio* data)
 {
   struct mp_audio*   	c   = data;	 // Current working data
-  af_delay_t*  	s   = af->setup; // Setup for this instance
+  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;
@@ -164,18 +157,34 @@ static struct mp_audio* play(struct af_instance* af, struct mp_audio* data)
 
 // Allocate memory and set function pointers
 static int af_open(struct af_instance* af){
-  af->control=control;
-  af->uninit=uninit;
-  af->play=play;
-  af->setup=calloc(1,sizeof(af_delay_t));
-  if(af->setup == NULL)
-    return AF_ERROR;
-  return AF_OK;
+    af->control=control;
+    af->uninit=uninit;
+    af->play=play;
+    af_delay_t *s = af->priv;
+    int n = 1;
+    int i = 0;
+    char* cl = s->delaystr;
+    while(cl && n && i < AF_NCH ){
+      sscanf(cl,"%f%n",&s->d[i],&n);
+      if(n==0 || cl[n-1] == '\0')
+        break;
+      cl=&cl[n];
+      if (*cl != ',')
+          break;
+      cl++;
+      i++;
+    }
+    return AF_OK;
 }
 
-// Description of this filter
+#define OPT_BASE_STRUCT af_delay_t
 struct af_info af_info_delay = {
     .info = "Delay audio filter",
     .name = "delay",
     .open = af_open,
+    .priv_size = sizeof(af_delay_t),
+    .options = (const struct m_option[]) {
+        OPT_STRING("delays", delaystr, 0),
+        {0}
+    },
 };
-- 
cgit v1.2.3