Changeset 1031:6b63434d94e0 in mediastreamer2

Timestamp:

Jun 29, 2010 2:53:10 PM (3 years ago)

Author:

Simon Morlat <simon.morlat@…>

Branch:

default

Children:

1032:bcd6c2c5c9ff, 1037:436043572e47

Message:

bypass reference signal when no echo signal is yet received.
msandroid improvements in progress

Location:

src

Files:

• msandroid.cpp (modified) (5 diffs)
• speexec.c (modified) (6 diffs)

src/msandroid.cpp

@@ -155 +155 @@
 public:
         msandroid_sound_read_data() : audio_record(0),audio_record_class(0),read_buff(0),read_chunk_size(0),ticker_count(0) {
-                qinit(&rq);
+                ms_bufferizer_init(&rb);
                 ms_mutex_init(&mutex,NULL);
-        };
-~msandroid_sound_read_data() {
-                ms_mutex_lock(&mutex);
-                flushq(&rq,0);
-                ms_mutex_unlock(&mutex);
-                ms_mutex_destroy(&mutex);
-        }
-        jobject                 audio_record;
-        jclass                  audio_record_class;
-        jbyteArray              read_buff;
-        ms_mutex_t              mutex;
-        queue_t                 rq;
-        int                             read_chunk_size;
-        unsigned long   ticker_count;
-
-
-
+        }
+        ~msandroid_sound_read_data() {
+                        ms_bufferizer_uninit (&rb);
+                        ms_mutex_destroy(&mutex);
+                }
+                jobject                 audio_record;
+                jclass                  audio_record_class;
+                jbyteArray              read_buff;
+                MSBufferizer rb;
+                int                             read_chunk_size;
+        }
 };
 
@@ -210 +204 @@
                 m->b_wptr += nread;
                 ms_mutex_lock(&d->mutex);
-                putq(&d->rq,m);
+                ms_bufferizer_put (&d->rb,m);
                 ms_mutex_unlock(&d->mutex);
         };
@@ -252 +246 @@
         }
         d->buff_size = jni_env->CallStaticIntMethod(d->audio_record_class,min_buff_size_id,d->rate,2/*CHANNEL_CONFIGURATION_MONO*/,2/*  ENCODING_PCM_16BIT */);
-        d->read_chunk_size = (d->rate*(d->bits/8)*d->nchannels)*0.02;
+        d->read_chunk_size = d->buff_size;
 
         if (d->buff_size > 0) {
@@ -357 +351 @@
         msandroid_sound_read_data *d=(msandroid_sound_read_data*)f->data;
         mblk_t *m;
-        
-        ms_mutex_lock(&d->mutex);
-        m=peekq(&d->rq);
-        
-        if (d->ticker_count!=0 || m!=NULL){
-                //start incrementing the first time we have a packet
-                d->ticker_count++;
-        }
-        // get buffer only every 2 ticks + alpha
-        if (m != NULL && ((d->ticker_count % 2)==1 ||   (d->ticker_count % 50)==0 ) ) {
-                m=getq(&d->rq);
-                ms_queue_put(f->outputs[0],m);
-        }
-        ms_mutex_unlock(&d->mutex);
-
+        int nbytes=0.02*(float)d->rate*2.0*(float)d->nchannels;
+
+        // output a buffer only every 2 ticks + alpha
+        if ((f->ticker->time % 20)==0 || (f->ticker->time % 510)==0){
+                mblk_t *om=allocb(nbytes,0);
+                int err;
+                ms_mutex_lock(&d->mutex);
+                err=ms_bufferizer_read(&d->rb,om->b_wptr,nbytes);
+                if (err==nbytes){
+                        ms_mutex_unlock(&d->mutex);
+                        om->b_wptr+=nbytes;
+                        ms_queue_put(f->outputs[0],om);
+                }else freemsg(om);
+        }
 }
 
@@ -656 +649 @@
 void msandroid_sound_write_process(MSFilter *f){
         msandroid_sound_write_data *d=(msandroid_sound_write_data*)f->data;
-        if (d->started == false) return;
+        
         mblk_t *m;
         while((m=ms_queue_get(f->inputs[0]))!=NULL){
-                ms_mutex_lock(&d->mutex);
-                ms_bufferizer_put(d->bufferizer,m);
-                ms_cond_signal(&d->cond);
-                ms_mutex_unlock(&d->mutex);
+                if (d->started){
+                        ms_mutex_lock(&d->mutex);
+                        ms_bufferizer_put(d->bufferizer,m);
+                        ms_cond_signal(&d->cond);
+                        ms_mutex_unlock(&d->mutex);
+                }else freemsg(m);
         }
 }

src/speexec.c

@@ -59 +59 @@
         int tail_length_ms;
         bool_t using_silence;
+        bool_t echostarted;
 }SpeexECState;
 
@@ -74 +75 @@
         s->den = NULL;
         s->using_silence=FALSE;
+        s->echostarted=FALSE;
 
         f->data=s;
@@ -91 +93 @@
         mblk_t *m;
 
+        s->echostarted=FALSE;
         s->filterlength=(s->tail_length_ms*s->samplerate)/1000;
         delay_samples=s->delay_ms*s->samplerate/1000;
@@ -116 +119 @@
         int size;
         
+        if (f->inputs[1]!=NULL){
+                int maxsize;
+                ms_bufferizer_put_from_queue (&s->echo,f->inputs[1]);
+                maxsize=ms_bufferizer_get_avail(&s->echo);
+                if (s->echostarted==FALSE && maxsize>0){
+                        s->echostarted=TRUE;
+                }
+                if (maxsize>=s->ref_bytes_limit){
+                        ms_message("ref_bytes_limit adjusted from %i to %i",s->ref_bytes_limit,maxsize);
+                        s->ref_bytes_limit=maxsize;
+                }
+        }
+        
         if (f->inputs[0]!=NULL){
                 while((refm=ms_queue_get(f->inputs[0]))!=NULL){
@@ -123 +139 @@
                 }
         }
-        if (f->inputs[1]!=NULL){
-                int maxsize;
-                ms_bufferizer_put_from_queue (&s->echo,f->inputs[1]);
-                if ((maxsize=ms_bufferizer_get_avail(&s->echo))>=s->ref_bytes_limit){
-                        ms_message("ref_bytes_limit adjusted from %i to %i",s->ref_bytes_limit,maxsize);
-                        s->ref_bytes_limit=maxsize;
-                }
-        }
+        
 /*
         ms_message("echo bytes=%i, ref bytes=%i",ms_bufferizer_get_avail(&s->echo),
@@ -162 +171 @@
                 ms_queue_put(f->outputs[1],oecho);
         }
+        if (!s->echostarted){
+                /*if we have not yet receive anything from the soundcard, bypass the reference signal*/
+                while (ms_bufferizer_get_avail(&s->ref)>=nbytes){
+                        mblk_t *oref=allocb(nbytes,0);
+                        ms_bufferizer_read(&s->ref,oref->b_wptr,nbytes);
+                        oref->b_wptr+=nbytes;
+                        ms_bufferizer_skip_bytes(&s->delayed_ref,nbytes);
+                        ms_queue_put(f->outputs[0],oref);
+                }
+        }
+
         /* do not accumulate too much reference signal */
         if ((size=ms_bufferizer_get_avail(&s->ref))> (s->ref_bytes_limit+nbytes)) {