Changeset 336:771f7c371e0c in mediastreamer2

Timestamp:

Mar 13, 2009 5:03:10 PM (4 years ago)

Author:

aymeric <aymeric@…>

Branch:

default

Message:

send output with all block of the same size

git-svn-id: ​svn+ssh://svn.savannah.nongnu.org/linphone/trunk@339 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

File:

• linphone/mediastreamer2/src/speexec.c (modified) (2 diffs)

linphone/mediastreamer2/src/speexec.c

@@ -105 +105 @@
                 md = copyb(m);
                 s->size_delay = s->size_delay + size;
-                        ms_queue_put(f->outputs[0],md);
+                        ms_bufferizer_put(&s->speak_delay,md);
                 ms_bufferizer_put(&s->in[0],m);
                 }
 
-                while((m=ms_queue_get(f->inputs[1]))!=NULL){
-                ms_queue_put(f->outputs[1],m);
+                /* make sure we always send block with same size */
+                while (ms_bufferizer_get_avail(&s->speak_delay)>=nbytes)
+                {
+                        om0=allocb(nbytes,0);
+                        ms_bufferizer_read(&s->speak_delay,(uint8_t*)om0->b_wptr,nbytes);
+                        om0->b_wptr+=nbytes;
+                        ms_queue_put(f->outputs[0],om0);
+                }
+
+                /* make sure we always send block with same size */
+                ms_bufferizer_put_from_queue(&s->in[1],f->inputs[1]);
+                while (ms_bufferizer_get_avail(&s->in[1])>=nbytes)
+                {
+                        om0=allocb(nbytes,0);
+                        ms_bufferizer_read(&s->in[1],(uint8_t*)om0->b_wptr,nbytes);
+                        om0->b_wptr+=nbytes;
+                ms_queue_put(f->outputs[1],om0);
                 }
                 /* we are now equal and speaker is delayed */
@@ -164 +179 @@
                 }               
 #endif
-    freeb(om0);
+                freeb(om0);
         }