Changeset 404:10ead63371eb in mediastreamer2

Timestamp:

Apr 7, 2009 3:02:18 PM (4 years ago)

Author:

aymeric <aymeric@…>

Branch:

default

Message:

5 buffer is needed for irregular sound cards

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

File:

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

linphone/mediastreamer2/src/speexec.c

@@ -109 +109 @@
                 }
 
-                /* make sure we always send block with same size */
-                while (ms_bufferizer_get_avail(&s->speak_delay)>=nbytes)
+                if (s->size_delay<s->playback_delay)
                 {
-                        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 */
+                        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 */
+                        return;
                 }
-
-                /* 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 */
-                return;
     }
 
@@ -182 +185 @@
         }
 
-        if (ms_bufferizer_get_avail(&s->speak_delay)> 4*320*(s->samplerate/8000)) /* above 4*20ms -> useless */
+        if (ms_bufferizer_get_avail(&s->speak_delay)> 5*320*(s->samplerate/8000)) /* above 4*20ms -> useless */
           {
             /* reset evrything */
@@ -196 +199 @@
           }
 
-        while (ms_bufferizer_get_avail(&s->in[1])> 4*320*(s->samplerate/8000)){
+        while (ms_bufferizer_get_avail(&s->in[1])> 5*320*(s->samplerate/8000)){
                 om1=allocb(nbytes,0);
                 ms_bufferizer_read(&s->in[1],(uint8_t*)om1->b_wptr,nbytes);