From 025389693d292b7a1c5f2c6e0ce96efa14062274 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 10 Jul 2004 19:23:45 +0000
Subject: make memblockq merge chunks

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@58 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 src/memblockq.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src/memblockq.c')

diff --git a/src/memblockq.c b/src/memblockq.c
index fb4cbc7e..6d4d712a 100644
--- a/src/memblockq.c
+++ b/src/memblockq.c
@@ -82,6 +82,18 @@ void pa_memblockq_push(struct pa_memblockq* bq, const struct pa_memchunk *chunk,
     struct memblock_list *q;
     assert(bq && chunk && chunk->memblock && chunk->length && (chunk->length % bq->base) == 0);
 
+    if (bq->blocks_tail && bq->blocks_tail->chunk.memblock == chunk->memblock) {
+        /* Try to merge memory chunks */
+
+        if (bq->blocks_tail->chunk.index+bq->blocks_tail->chunk.length == chunk->index) {
+            bq->blocks_tail->chunk.length += chunk->length;
+            bq->current_length += chunk->length;
+
+    /*        fprintf(stderr, __FILE__": merge succeeded: %u\n", chunk->length);*/
+            return;
+        }
+    }
+    
     q = malloc(sizeof(struct memblock_list));
     assert(q);
 
-- 
cgit