Skip to contentSkip to conversation

external plugin for adding delay to channels

PATCH In review Alex 2 participants 2 messages Sep 30, 2008 – Oct 2, 2008 Kbuild

lore
Share & tools
lore

Alex

author
#0 lore raw

PATCH 1/1 external plugin for adding delay to channels

This should be interesting for home theater installations, as I was personnally missing a "per channel delay configuration".

Feel free to tell me what should be modified, I am not really used to proposing a patch.

Thx

configure.in +4 -0
diff -x libtool -x stamp-h1 -x .vimrc -x rate -x Makefile.in -x Makefile -x .deps -x configure -x config.status -x config.h -x config.log -x a52 -x '*cache*' -x '*aclocal*' -Naur alsa-plugins-1.0.17/configure.in alsa-plugins-1.0.17+delay/configure.in
@@ -89,6 +89,9 @@
 fi
 
 AM_CONDITIONAL(HAVE_PPH, test "$PPH" = "builtin" -o "$PPH" = "lib")
+
+AM_CONDITIONAL(HAVE_DELAY, test x$HAVE_DELAY = xyes)
+
 AM_CONDITIONAL(USE_LIBSPEEX, test "$PPH" = "lib")
 
 dnl ALSA plugin directory
@@ -124,6 +127,7 @@
 	a52/Makefile
 	rate-lavc/Makefile
 	maemo/Makefile
+    delay/Makefile
 	doc/Makefile
 ])
 
delay/Makefile.am +9 -0
diff -x libtool -x stamp-h1 -x .vimrc -x rate -x Makefile.in -x Makefile -x .deps -x configure -x config.status -x config.h -x config.log -x a52 -x '*cache*' -x '*aclocal*' -Naur alsa-plugins-1.0.17/delay/Makefile.am alsa-plugins-1.0.17+delay/delay/Makefile.am
@@ -0,0 +1,9 @@
+asound_module_pcm_delay_LTLIBRARIES = libasound_module_pcm_delay.la
+
+asound_module_pcm_delaydir = @ALSA_PLUGIN_DIR@
+
+AM_CFLAGS = -Wall -g @ALSA_CFLAGS@
+AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined
+
+libasound_module_pcm_delay_la_SOURCES = pcm_delay.c
+libasound_module_pcm_delay_la_LIBADD = @ALSA_LIBS@
delay/pcm_delay.c +335 -0

335 lines not on this page · raw message

doc/delay.txt +22 -0
diff -x libtool -x stamp-h1 -x .vimrc -x rate -x Makefile.in -x Makefile -x .deps -x configure -x config.status -x config.h -x config.log -x a52 -x '*cache*' -x '*aclocal*' -Naur alsa-plugins-1.0.17/doc/delay.txt alsa-plugins-1.0.17+delay/doc/delay.txt
@@ -0,0 +1,22 @@
+DELAY PLUGIN
+============
+
+The delay plugin is an easy-to-use plugin for delaying 1 to 6 channels
+stream.  The number of channels to be delayed is determined by the
+slave PCM.  For example, the following PCM defines 3 delays but only 2
+will be applied:
+
+    pcm.delay3 {
+        type delay
+        delay_ms.0 10
+        delay_ms.1 10
+        delay_ms.2 20
+        slave.pcm "default"
+    }
+
+You can give the delay to be applied by using one of the following
+option:
+
+delay_ms
+delay_meter
+delay_feet
doc/Makefile.am +2 -2
diff -x libtool -x stamp-h1 -x .vimrc -x rate -x Makefile.in -x Makefile -x .deps -x configure -x config.status -x config.h -x config.log -x a52 -x '*cache*' -x '*aclocal*' -Naur alsa-plugins-1.0.17/doc/Makefile.am alsa-plugins-1.0.17+delay/doc/Makefile.am
@@ -1,3 +1,3 @@
-EXTRA_DIST = README-pcm-oss README-jack README-pulse README-maemo \
+EXTRA_DIST = README-pcm-oss README-jack README-pulse README-maemo README-delay\
 	upmix.txt vdownmix.txt samplerate.txt a52.txt lavcrate.txt \
-	speexrate.txt
+	speexrate.txt delay.txt
Makefile.am +1 -1
diff -x libtool -x stamp-h1 -x .vimrc -x rate -x Makefile.in -x Makefile -x .deps -x configure -x config.status -x config.h -x config.log -x a52 -x '*cache*' -x '*aclocal*' -Naur alsa-plugins-1.0.17/Makefile.am alsa-plugins-1.0.17+delay/Makefile.am
@@ -18,7 +18,7 @@
 PPHDIR = pph
 endif
 
-SUBDIRS = oss mix $(PPHDIR) $(JACKDIR) $(PULSEDIR) $(SAMPLERATEDIR) $(A52DIR) $(LAVCRATEDIR) $(MAEMODIR) doc
+SUBDIRS = oss mix delay $(PPHDIR) $(JACKDIR) $(PULSEDIR) $(SAMPLERATEDIR) $(A52DIR) $(LAVCRATEDIR) $(MAEMODIR) doc
 EXTRA_DIST = gitcompile version COPYING.GPL
 AUTOMAKE_OPTIONS = foreign
 

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

#1 lore raw

At Tue, 30 Sep 2008 22:51:23 +0200,

Quoted 6 lines · Alex

This should be interesting for home theater installations, as I was personnally missing a "per channel delay configuration".

Feel free to tell me what should be modified, I am not really used to proposing a patch.

Thanks for the patch.
Just looking quickly at it, some comments below.

Quoted 1 line

diff -x libtool -x stamp-h1 -x .vimrc -x rate -x Makefile.in -x Makefile -x .deps -x configure -x config.status -x config.h -x config.log -x a52 -x '*cache*' -x '*aclocal*' -Naur alsa-plugins-1.0.17/configure.in alsa-plugins-1.0.17+delay/configure.in

Maybe it's a good chance to learn git now :)

Quoted 13 lines
configure.in +3 -0
@@ -89,6 +89,9 @@
 fi
 
 AM_CONDITIONAL(HAVE_PPH, test "$PPH" = "builtin" -o "$PPH" = "lib")
+
+AM_CONDITIONAL(HAVE_DELAY, test x$HAVE_DELAY = xyes)
+
 AM_CONDITIONAL(USE_LIBSPEEX, test "$PPH" = "lib")
 
 dnl ALSA plugin directory

configure.in line 130

Quoted 4 lines
configure.in +1 -0
@@ -124,6 +127,7 @@
 	a52/Makefile
 	rate-lavc/Makefile
 	maemo/Makefile
+    delay/Makefile

Try to keep the same indent.

Quoted 2 lines
delay/pcm_delay.c +0 -0

(snip)

Quoted 1 line

+/* Ambient temperature is 20� celsius */

Use ASCII as much as possible. If inevitably necessary, use UTF-8.

delay/pcm_delay.c line 48

Quoted 12 lines
delay/pcm_delay.c +12 -0
+typedef struct {
+    snd_pcm_extplug_t   ext;
+    
+    double          *delay_ms;
+    unsigned int    *delay_sample;
+
+    snd_pcm_channel_area_t  *dly_areas;
+    snd_pcm_uframes_t       *dly_offset;
+
+    unsigned int    channels;
+    unsigned int    mode;
+} snd_pcm_delay_t;

Could you keep the indent level like other codes?
Not mandatory, but would be better for us...

Quoted 10 lines
delay/pcm_delay.c +10 -0
+static int  snd_pcm_delay_parse_delay(snd_pcm_delay_t *pcm_delay,
+                                    snd_config_t    *conf_delay,
+                                    unsigned char   mode)
+{
+    snd_config_iterator_t i, next;
+    double  *delays;
+    double  delay = 0.0;
+    unsigned int    cnt = 0;
+    unsigned int    channel;
+    double  val;

delay/pcm_delay.c line 69

Quoted 10 lines
delay/pcm_delay.c +10 -0
+    
+    pcm_delay->mode = mode;
+    if (conf_delay) {
+        snd_config_for_each(i, next, conf_delay) {
+            snd_config_t *n = snd_config_iterator_entry(i);
+            const char *id;
+            if (snd_config_get_id(n, &id) < 0)
+                continue;
+            cnt++;
+        }

This means cnt includes comments, etc? Then the number is inaccurate (although a bigger doesn't matter much).

delay/pcm_delay.c line 73

Quoted 4 lines
delay/pcm_delay.c +4 -0
+        pcm_delay->delay_ms = delays = calloc(cnt, sizeof(double));
+        if (delays == NULL)
+            return -ENOMEM;
+        pcm_delay->channels = cnt;

Now you have two "channels", one in this definition and another as pcm_delay->ext.channels. As far as I see, these are used sometimes wrongly, possibly resulting in a segfault.

Quoted 10 lines
delay/pcm_delay.c +10 -0
+static snd_pcm_sframes_t    snd_pcm_delay_transfer(snd_pcm_extplug_t    *ext,
+                                                const snd_pcm_channel_area_t    *dst_areas,
+                                                snd_pcm_uframes_t   dst_offset,
+                                                const snd_pcm_channel_area_t    *src_areas,
+                                                snd_pcm_uframes_t   src_offset,
+                                                snd_pcm_uframes_t   size)
+{
+    snd_pcm_delay_t *pcm_delay = (snd_pcm_delay_t *)ext;
+    unsigned int i;
+    snd_pcm_uframes_t   left;

delay/pcm_delay.c line 185

Quoted 10 lines
delay/pcm_delay.c +10 -0
+
+    for (i = 0; i < pcm_delay->ext.channels; i++) {
+        if (! pcm_delay->delay_sample[i]) {
+            snd_pcm_area_copy(dst_areas + i, dst_offset,
+                            src_areas + i, src_offset,
+                            size, pcm_delay->ext.format);
+            continue;
+        }
+        if (pcm_delay->delay_sample[i] <= size) {
+            assert(! pcm_delay->dly_offset[i]);

I'm not sure whether this condition is assured...
The size in this callback isn't guaranteed to be a period size.

Quoted 31 lines
delay/pcm_delay.c +31 -0
+            left = size - pcm_delay->delay_sample[i];
+            /* delay to dst */
+            snd_pcm_area_copy(dst_areas + i, dst_offset,
+                            pcm_delay->dly_areas + i, 0,
+                            pcm_delay->delay_sample[i], pcm_delay->ext.format);
+            if (left) {
+                /* src to dst left */
+                snd_pcm_area_copy(dst_areas + i, dst_offset + pcm_delay->delay_sample[i],
+                                src_areas + i, src_offset,
+                                left, pcm_delay->ext.format);
+            }
+            /* src left to delay */
+            snd_pcm_area_copy(pcm_delay->dly_areas + i, 0,
+                            src_areas + i, src_offset + left,
+                            pcm_delay->delay_sample[i], pcm_delay->ext.format);
+            continue;
+        }
+        /* usual (small) delays wont reach this part of the code */
+        left = pcm_delay->dly_offset[i] + size > pcm_delay->delay_sample[i]
+            ? (pcm_delay->dly_offset[i] + size) % pcm_delay->delay_sample[i] : 0;
+        /* copy dly to dst */
+        snd_pcm_area_copy(dst_areas + i, dst_offset,
+                pcm_delay->dly_areas + i, pcm_delay->dly_offset[i],
+                size - left, pcm_delay->ext.format);
+        /* copy src to dly */
+        snd_pcm_area_copy(pcm_delay->dly_areas + i, pcm_delay->dly_offset[i],
+                src_areas + i, src_offset,
+                size - left, pcm_delay->ext.format);
+        if (left) {
+            /* copy dly to dst */
+            snd_pcm_area_copy(dst_areas + i, dst_offset + size - left,

delay/pcm_delay.c line 226

Quoted 10 lines
delay/pcm_delay.c +10 -0
+                    pcm_delay->dly_areas + i, 0,
+                    left, pcm_delay->ext.format);
+            /* copy src to dly */
+            snd_pcm_area_copy(pcm_delay->dly_areas + i, 0,
+                    src_areas + i, src_offset + size - left,
+                    left, pcm_delay->ext.format);
+            pcm_delay->dly_offset[i] = left;
+            continue;
+        }
+        pcm_delay->dly_offset[i] += size;

Hmm, the whole copy mechanism is a bit too hard.
I guess this could be simplified more.

Quoted 4 lines
delay/pcm_delay.c +4 -0
+/*
+ * Main entry point
+ */
+SND_PCM_PLUGIN_DEFINE_FUNC(delay)

...

delay/pcm_delay.c line 325

Quoted 6 lines
delay/pcm_delay.c +6 -0
+    snd_pcm_extplug_set_param_minmax(&pcm_delay->ext,
+                                    SND_PCM_EXTPLUG_HW_CHANNELS,
+                                    1, 6);
+    snd_pcm_extplug_set_param_list(&pcm_delay->ext,
+                                SND_PCM_EXTPLUG_HW_CHANNELS,
+                                6, chlist);

You don't need both of them. Both do the same job.

delay/pcm_delay.c line 329

Quoted 4 lines
delay/pcm_delay.c +4 -0
+    snd_pcm_extplug_set_param(&pcm_delay->ext, SND_PCM_EXTPLUG_HW_FORMAT,
+                            SND_PCM_FORMAT_S16);
+    snd_pcm_extplug_set_slave_param(&pcm_delay->ext, SND_PCM_EXTPLUG_HW_FORMAT,
+                                SND_PCM_FORMAT_S16);

Any reason to restrict to S16? Just for copying samples, the sample format doesn't matter much.

thanks,

Takashi

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel