Changeset 1425:e86a2cee8d4e in mediastreamer2

Timestamp:

Oct 14, 2011 6:10:00 PM (20 months ago)

Author:

Nikita Kozlov <nikita@…>

Branch:

default

Parents:

1424:443b67039206 (diff), 1423:a1f364f0fd13 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Tags:

android_beta

Message:

merge

Files:

• src/msandroid.cpp (modified) (1 diff)
• src/msandroid.cpp (modified) (16 diffs)

src/msandroid.cpp

@@ -28 +28 @@
 #include <jni.h>
 
-
-static const float sndwrite_flush_threshold=0.050;      //ms
+static const float sndwrite_flush_threshold=0.120;      //ms
 
 static void sound_read_setup(MSFilter *f);

src/msandroid.cpp

@@ -20 +20 @@
  */
 
+#include <sys/times.h>
+#include <sys/resource.h>
 #include "mediastreamer2/mssndcard.h"
 #include "mediastreamer2/msfilter.h"
@@ -31 +33 @@
 
 static void set_high_prio(void){
-        struct sched_param param;
         int result=0;
+/*      struct sched_param param;
         memset(&param,0,sizeof(param));
         int policy=SCHED_OTHER;
-        param.sched_priority=sched_get_priority_max(policy);
-        if((result=pthread_setschedparam(pthread_self(),policy, &param))) {
+        param.sched_priority=sched_get_priority_max(policy);*/
+        if((result=setpriority(PRIO_PROCESS, gettid(), -19))) {
                 ms_warning("Set sched param failed with error code(%i)\n",result);
         } else {
-                ms_message("msandroid thread priority set to max");
+                ms_error("msandroid thread priority set to max %x\n", -19);
         }
 }
@@ -189 +191 @@
         jmethodID read_id=0;
         jmethodID record_id=0;
+        jbyte* buf;
+
 
         set_high_prio();
 
         JNIEnv *jni_env = ms_get_jni_env();
+
+        ms_debug("read thread cb");
         record_id = jni_env->GetMethodID(d->audio_record_class,"startRecording", "()V");
         if(record_id==0) {
@@ -208 +214 @@
         }
 
-        while (d->started && (nread=jni_env->CallIntMethod(d->audio_record,read_id,d->read_buff,0, d->read_chunk_size))>0) {
+        buf = jni_env->GetByteArrayElements(d->read_buff, 0);
+
+        while (d->started){ 
+                bzero(buf, d->read_chunk_size);
+                nread=jni_env->CallIntMethod(d->audio_record,read_id,d->read_buff,0, d->read_chunk_size);
+                if (nread <= 0 || nread != d->read_chunk_size) {
+                        ms_error("read failed with %d", nread);
+                        continue;
+                }
                 m = allocb(nread,0);
-                jni_env->GetByteArrayRegion(d->read_buff, 0,nread, (jbyte*)m->b_wptr);
-                //ms_error("%i octets read",nread);
+                //jni_env->GetByteArrayRegion(d->read_buff, 0,nread, (jbyte*)m->b_wptr);
+                memcpy((jbyte*)m->b_wptr, buf, nread);
+        //      ms_error("%i octets read\n begin %x",nread, *m->b_wptr);
                 m->b_wptr += nread;
                 ms_mutex_lock(&d->mutex);
@@ -220 +235 @@
         goto end;
         end: {
+        ms_debug("record thread finished");
         ms_thread_exit(NULL);
         return 0;
@@ -252 +268 @@
         }
         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->buff_size/2;
+        if (d->buff_size <= 4096) d->buff_size = 4096*3/2;
+        d->read_chunk_size = 0.02*(float)d->rate*2.0*(float)d->nchannels;
+
 
         if (d->buff_size > 0) {
@@ -280 +298 @@
         d->audio_record =  jni_env->NewObject(d->audio_record_class
                         ,constructor_id
-                        ,1/*MIC*/
+                        ,7/*MIC*/
                         ,d->rate
                         ,2/*CHANNEL_CONFIGURATION_MONO*/
@@ -287 +305 @@
 
 
-        d->audio_record = jni_env->NewGlobalRef(d->audio_record);
+        jmethodID  state_method_id = jni_env->GetMethodID(d->audio_record_class,"getState", "()I");
+        int state = jni_env->CallIntMethod(d->audio_record, state_method_id);
+        if(state == 0){ /* STATE_UNINITIALIZED */
+                
+                jmethodID release_method_id = jni_env->GetMethodID(d->audio_record_class,"release", "()V");
+                jni_env->CallIntMethod(d->audio_record, release_method_id);
+                d->audio_record =  jni_env->NewObject(d->audio_record_class
+                                ,constructor_id
+                                ,1/*MIC*/
+                                ,d->rate
+                                ,2/*CHANNEL_CONFIGURATION_MONO*/
+                                ,2/*  ENCODING_PCM_16BIT */
+                                ,d->buff_size);
+
+                state = jni_env->CallIntMethod(d->audio_record, state_method_id);
+
+                if (state == 0){
+                        jni_env->CallIntMethod(d->audio_record, release_method_id);
+                        ms_error("cannot instanciate audio record");
+                        return;
+                }
+                ms_debug("audio record ok with dev %d bis", 1);
+
+        }else
+                ms_debug("audio record ok with dev %d", 1);
+
+
+
         if (d->audio_record == 0) {
                 ms_error("cannot instanciate AudioRecord");
                 return;
         }
+        d->audio_record = jni_env->NewGlobalRef(d->audio_record);
 
         d->started=true;
-        // start reader thread
-        rc = ms_thread_create(&d->thread_id, 0, (void*(*)(void*))msandroid_read_cb, d);
-        if (rc){
-                ms_error("cannot create read thread return code  is [%i]", rc);
-                d->started=false;
-        }
 }
 
@@ -316 +356 @@
         JNIEnv *jni_env = ms_get_jni_env();
 
+        d->started = false;
+        if (d->thread_id !=0) ms_thread_join(d->thread_id,0);
+
         //stop recording
         stop_id = jni_env->GetMethodID(d->audio_record_class,"stop", "()V");
@@ -323 +366 @@
         }
 
-        d->started = false;
-        if (d->thread_id !=0) ms_thread_join(d->thread_id,0);
-
         if (d->audio_record) {
                 jni_env->CallVoidMethod(d->audio_record,stop_id);
@@ -350 +390 @@
         int nbytes=0.02*(float)d->rate*2.0*(float)d->nchannels;
 
+        if (d->thread_id == 0) {
+                int rc = ms_thread_create(&d->thread_id, 0, (void*(*)(void*))msandroid_read_cb, d);
+                if (rc){
+                        ms_error("cannot create read thread return code  is [%i]", rc);
+                        d->started=false;
+                }
+        }
+
         // output a buffer only every 2 ticks + alpha
         if ((f->ticker->time % 20)==0 || (f->ticker->time % 510)==0){
+                int err;
                 mblk_t *om=allocb(nbytes,0);
-                int err;
                 ms_mutex_lock(&d->mutex);
                 err=ms_bufferizer_read(&d->rb,om->b_wptr,nbytes);
@@ -465 +513 @@
         int buff_size = d->getWriteBuffSize();
         JNIEnv *jni_env = ms_get_jni_env();
+        ms_debug("write thread cb");
 
         // int write  (byte[] audioData, int offsetInBytes, int sizeInBytes)
@@ -520 +569 @@
         goto end;
         end: {
+                ms_debug("finishing writer thread");
                 ms_thread_exit(NULL);
                 return 0;
@@ -526 +576 @@
 
 void msandroid_sound_write_preprocess(MSFilter *f){
-        ms_debug("andsnd_write_preprocess");
+        ms_debug("write preprocess started");
         msandroid_sound_write_data *d=(msandroid_sound_write_data*)f->data;
         jmethodID constructor_id=0;
 
-        int rc;
         jmethodID min_buff_size_id;
 
@@ -584 +633 @@
         }
 
-
-        // start reader thread
         d->started = true;
-        rc = ms_thread_create(&d->thread_id, 0, (void*(*)(void*))msandroid_write_cb, d);
-        if (rc){
-                ms_error("cannot create write thread return code  is [%i]", rc);
-                d->started = false;
-                return;
-        }
 }
 
@@ -647 +688 @@
 void msandroid_sound_write_process(MSFilter *f){
         msandroid_sound_write_data *d=(msandroid_sound_write_data*)f->data;
+        mblk_t *m;
         
-        mblk_t *m;
+        if (d->thread_id == 0) {
+                int rc = ms_thread_create(&d->thread_id, 0, (void*(*)(void*))msandroid_write_cb, d);
+                if (rc){
+                        ms_error("cannot create write thread return code  is [%i]", rc);
+                        d->started = false;
+                        return;
+                }
+        }
         while((m=ms_queue_get(f->inputs[0]))!=NULL){
                 if (d->started){