merge glitch-free branch back into trunk

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2445 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2008-05-15 23:34:41 +00:00
parent 91f092eadc
commit 045c1d602d
189 changed files with 12559 additions and 4959 deletions

View file

@ -31,22 +31,48 @@
#include <pulsecore/memblockq.h>
#include <pulsecore/log.h>
static void dump(pa_memblockq *bq) {
printf(">");
for (;;) {
pa_memchunk out;
char *e;
size_t n;
void *q;
if (pa_memblockq_peek(bq, &out) < 0)
break;
q = pa_memblock_acquire(out.memblock);
for (e = (char*) q + out.index, n = 0; n < out.length; n++)
printf("%c", *e);
pa_memblock_release(out.memblock);
pa_memblock_unref(out.memblock);
pa_memblockq_drop(bq, out.length);
}
printf("<\n");
}
int main(int argc, char *argv[]) {
int ret;
pa_mempool *p;
pa_memblockq *bq;
pa_memchunk chunk1, chunk2, chunk3, chunk4;
pa_memblock *silence;
pa_memchunk silence;
pa_log_set_maximal_level(PA_LOG_DEBUG);
p = pa_mempool_new(0);
silence = pa_memblock_new_fixed(p, (char*) "__", 2, 1);
assert(silence);
silence.memblock = pa_memblock_new_fixed(p, (char*) "__", 2, 1);
assert(silence.memblock);
silence.index = 0;
silence.length = pa_memblock_get_length(silence.memblock);
bq = pa_memblockq_new(0, 40, 10, 2, 4, 4, silence);
bq = pa_memblockq_new(0, 40, 10, 2, 4, 4, 40, &silence);
assert(bq);
chunk1.memblock = pa_memblock_new_fixed(p, (char*) "11", 2, 1);
@ -72,13 +98,13 @@ int main(int argc, char *argv[]) {
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);
ret = pa_memblockq_push(bq, &chunk3);
assert(ret == 0);
ret = pa_memblockq_push(bq, &chunk4);
assert(ret == 0);
pa_memblockq_seek(bq, -6, 0);
@ -86,7 +112,7 @@ int main(int argc, char *argv[]) {
assert(ret == 0);
pa_memblockq_seek(bq, -2, 0);
ret = pa_memblockq_push(bq, &chunk3);
ret = pa_memblockq_push(bq, &chunk1);
assert(ret == 0);
pa_memblockq_seek(bq, -10, 0);
@ -119,35 +145,22 @@ int main(int argc, char *argv[]) {
ret = pa_memblockq_push(bq, &chunk3);
assert(ret == 0);
pa_memblockq_shorten(bq, pa_memblockq_get_length(bq)-2);
pa_memblockq_seek(bq, 30, PA_SEEK_RELATIVE);
printf(">");
dump(bq);
for (;;) {
pa_memchunk out;
char *e;
size_t n;
pa_memblockq_rewind(bq, 52);
if (pa_memblockq_peek(bq, &out) < 0)
break;
p = pa_memblock_acquire(out.memblock);
for (e = (char*) p + out.index, n = 0; n < out.length; n++)
printf("%c", *e);
pa_memblock_release(out.memblock);
pa_memblock_unref(out.memblock);
pa_memblockq_drop(bq, out.length);
}
printf("<\n");
dump(bq);
pa_memblockq_free(bq);
pa_memblock_unref(silence);
pa_memblock_unref(silence.memblock);
pa_memblock_unref(chunk1.memblock);
pa_memblock_unref(chunk2.memblock);
pa_memblock_unref(chunk3.memblock);
pa_memblock_unref(chunk4.memblock);
pa_mempool_free(p);
return 0;
}