1) Add flexible seeking support (including absolute) for memory block queues and playback streams

2) Add support to synchronize multiple playback streams
3) add two tests for 1) and 2)
4) s/PA_ERROR/PA_ERR/
5) s/PA_ERROR_OK/PA_OK/
6) update simple API to deal properly with new peek/drop recording API
7) add beginnings of proper validity checking on API calls in client libs (needs to be extended)
8) report playback buffer overflows/underflows to the client
9) move client side recording mcalign stuff into the memblockq 
10) create typedefs for a bunch of API callback prototypes
11) simplify handling of HUP poll() events

Yes, i know, it's usually better to commit a lot of small patches instead of a
single big one. In this case however, this would have contradicted the other
rule: never commit broken or incomplete stuff.

*** This stuff needs a lot of additional testing! ***


git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@511 fefdeb5f-60dc-0310-8127-8f9354f1896f

1 files changed, 147 insertions, 0 deletions

diff --git a/src/tests/memblockq-test.c b/src/tests/memblockq-test.c
new file mode 100644
index 00000000..b01084da
--- /dev/null
+++ b/src/tests/memblockq-test.c
@@ -0,0 +1,147 @@
+/* $Id$ */
+
+/***
+  This file is part of polypaudio.
+ 
+  polypaudio is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published
+  by the Free Software Foundation; either version 2 of the License,
+  or (at your option) any later version.
+ 
+  polypaudio is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+ 
+  You should have received a copy of the GNU Lesser General Public License
+  along with polypaudio; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdlib.h>
+#include <assert.h>
+#include <stdio.h>
+
+#include <polypcore/memblockq.h>
+#include <polypcore/log.h>
+
+int main(int argc, char *argv[]) {
+    int ret;
+    pa_memblockq *bq;
+    pa_memchunk chunk1, chunk2, chunk3, chunk4;
+    pa_memblock *silence;
+
+    pa_log_set_maximal_level(PA_LOG_DEBUG);
+    
+    silence = pa_memblock_new_fixed("__", 2, 1, NULL);
+    assert(silence);
+
+    bq = pa_memblockq_new(0, 40, 10, 2, 4, 4, silence, NULL);
+    assert(bq);
+
+    chunk1.memblock = pa_memblock_new_fixed("AA", 2, 1, NULL);
+    chunk1.index = 0;
+    chunk1.length = 2;
+    assert(chunk1.memblock);
+    
+    chunk2.memblock = pa_memblock_new_fixed("TTBB", 4, 1, NULL);
+    chunk2.index = 2;
+    chunk2.length = 2;
+    assert(chunk2.memblock);
+
+    chunk3.memblock = pa_memblock_new_fixed("ZZZZ", 4, 1, NULL);
+    chunk3.index = 0;
+    chunk3.length = 4;
+    assert(chunk3.memblock);
+
+    chunk4.memblock = pa_memblock_new_fixed("KKKKKKKK", 8, 1, NULL);
+    chunk4.index = 0;
+    chunk4.length = 8;
+    assert(chunk4.memblock);
+
+    ret = pa_memblockq_push(bq, &chunk1);
+    assert(ret == 0);
+    
+    ret = pa_memblockq_push(bq, &chunk1);
+    assert(ret == 0);
+    
+    ret = pa_memblockq_push(bq, &chunk2);
+    assert(ret == 0);
+    
+    ret = pa_memblockq_push(bq, &chunk2);
+    assert(ret == 0);
+
+    pa_memblockq_seek(bq, -6, 0);
+    ret = pa_memblockq_push(bq, &chunk3);
+    assert(ret == 0);
+
+    pa_memblockq_seek(bq, -2, 0);
+    ret = pa_memblockq_push(bq, &chunk3);
+    assert(ret == 0);
+
+    pa_memblockq_seek(bq, -10, 0);
+    ret = pa_memblockq_push(bq, &chunk4);
+    assert(ret == 0);
+
+    pa_memblockq_seek(bq, 10, 0);
+
+    ret = pa_memblockq_push(bq, &chunk1);
+    assert(ret == 0);
+
+    pa_memblockq_seek(bq, -6, 0);
+    ret = pa_memblockq_push(bq, &chunk2);
+    assert(ret == 0);
+
+    /* Test splitting */
+    pa_memblockq_seek(bq, -12, 0);
+    ret = pa_memblockq_push(bq, &chunk1);
+    assert(ret == 0);
+
+    pa_memblockq_seek(bq, 20, 0);
+
+    /* Test merging */
+    ret = pa_memblockq_push(bq, &chunk3);
+    assert(ret == 0);
+    pa_memblockq_seek(bq, -2, 0);
+
+    chunk3.index += 2;
+    chunk3.length -= 2;
+    
+    ret = pa_memblockq_push(bq, &chunk3);
+    assert(ret == 0);
+    
+    printf(">");
+
+    pa_memblockq_shorten(bq, 6);
+    
+    for (;;) {
+        pa_memchunk out;
+        char *e;
+        size_t n;
+        
+        if (pa_memblockq_peek(bq, &out) < 0)
+            break;
+
+        for (e = (char*) out.memblock->data + out.index, n = 0; n < out.length; n++)
+            printf("%c", *e);
+
+        pa_memblock_unref(out.memblock);
+        pa_memblockq_drop(bq, &out, out.length);
+    }
+    
+    printf("<\n");
+    
+    pa_memblockq_free(bq);
+    pa_memblock_unref(silence);
+    pa_memblock_unref(chunk1.memblock);
+    pa_memblock_unref(chunk2.memblock);
+    pa_memblock_unref(chunk3.memblock);
+    pa_memblock_unref(chunk4.memblock);
+    
+    return 0;
+}