From 9921363b2c2f31bf3c6ae5e9686aff6055235be6 Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Tue, 19 Apr 2016 15:08:28 -0700 Subject: Version 12 Snap to commit commit 2d59bff14a5a98dd1f3a829d29d1a69fe3b91815 --- LoopbackApp/app/src/main/AndroidManifest.xml | 4 ++-- .../java/org/drrickorang/loopback/CaptureHolder.java | 2 +- .../org/drrickorang/loopback/LoopbackApplication.java | 17 +++++++++++++++++ LoopbackApp/app/src/main/jni/sles.cpp | 6 +----- LoopbackApp/app/src/main/jni/sles.h | 4 +--- LoopbackApp/app/src/main/res/values/strings.xml | 3 ++- 6 files changed, 24 insertions(+), 12 deletions(-) (limited to 'LoopbackApp/app/src/main') diff --git a/LoopbackApp/app/src/main/AndroidManifest.xml b/LoopbackApp/app/src/main/AndroidManifest.xml index 3879c74..1608a12 100644 --- a/LoopbackApp/app/src/main/AndroidManifest.xml +++ b/LoopbackApp/app/src/main/AndroidManifest.xml @@ -23,8 +23,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" package="org.drrickorang.loopback" - android:versionCode="11" - android:versionName="0.9.6"> + android:versionCode="12" + android:versionName="0.9.7"> diff --git a/LoopbackApp/app/src/main/java/org/drrickorang/loopback/CaptureHolder.java b/LoopbackApp/app/src/main/java/org/drrickorang/loopback/CaptureHolder.java index d5e38dd..fecacfe 100644 --- a/LoopbackApp/app/src/main/java/org/drrickorang/loopback/CaptureHolder.java +++ b/LoopbackApp/app/src/main/java/org/drrickorang/loopback/CaptureHolder.java @@ -202,7 +202,7 @@ public class CaptureHolder { private int mIndexToPlace; /** - * Create new thread with capture state sturct for captured systrace, bugreport and wav + * Create new thread with capture state struct for captured systrace, bugreport and wav **/ public CaptureThread(CapturedState cs, int indexToPlace) { mNewCapturedState = cs; diff --git a/LoopbackApp/app/src/main/java/org/drrickorang/loopback/LoopbackApplication.java b/LoopbackApp/app/src/main/java/org/drrickorang/loopback/LoopbackApplication.java index 7844c70..e779777 100644 --- a/LoopbackApp/app/src/main/java/org/drrickorang/loopback/LoopbackApplication.java +++ b/LoopbackApp/app/src/main/java/org/drrickorang/loopback/LoopbackApplication.java @@ -118,6 +118,13 @@ public class LoopbackApplication extends Application { case 5: //REMOTE_SUBMIX (JAVA ONLY) mappedSource = MediaRecorder.AudioSource.REMOTE_SUBMIX; break; + case 6: //UNPROCESSED + if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M) { + mappedSource = 9 /*MediaRecorder.AudioSource.UNPROCESSED*/; + } else { + mappedSource = MediaRecorder.AudioSource.DEFAULT; + } + break; } } else if (threadType == Constant.AUDIO_THREAD_TYPE_NATIVE) { //taken form OpenSLES_AndroidConfiguration.h @@ -138,6 +145,16 @@ public class LoopbackApplication extends Application { case 4: //VOICE_COMMUNICATION mappedSource = 0x04; //SL_ANDROID_RECORDING_PRESET_VOICE_COMMUNICATION break; + case 5: //REMOTE_SUBMIX (JAVA ONLY) + mappedSource = 0x00; //SL_ANDROID_RECORDING_PRESET_NONE; + break; + case 6: //UNPROCESSED + if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M) { + mappedSource = 0x05; //SL_ANDROID_RECORDING_PRESET_UNPROCESSED; + } else { + mappedSource = 0x00; //SL_ANDROID_RECORDING_PRESET_NONE + } + break; } } diff --git a/LoopbackApp/app/src/main/jni/sles.cpp b/LoopbackApp/app/src/main/jni/sles.cpp index 387aa4e..9b822a6 100644 --- a/LoopbackApp/app/src/main/jni/sles.cpp +++ b/LoopbackApp/app/src/main/jni/sles.cpp @@ -84,10 +84,9 @@ static void recorderCallback(SLAndroidSimpleBufferQueueItf caller __unused, void if (pSles != NULL) { collectRecorderBufferPeriod(pSles); - //__android_log_print(ANDROID_LOG_INFO, "sles_jni", "in the recordercallback"); + //__android_log_print(ANDROID_LOG_INFO, "sles_jni", "in recorderCallback"); SLresult result; - pthread_mutex_lock(&(pSles->mutex)); //ee SLES_PRINTF(""); - pthread_mutex_unlock(&(pSles->mutex)); } //pSles not null } @@ -300,7 +298,6 @@ static void playerCallback(SLBufferQueueItf caller __unused, void *context) { collectPlayerBufferPeriod(pSles); SLresult result; - pthread_mutex_lock(&(pSles->mutex)); //ee SLES_PRINTF("txBuffers[pSles->txRear] = buffer; pSles->txRear = txRearNext; - pthread_mutex_unlock(&(pSles->mutex)); } //pSles not null } diff --git a/LoopbackApp/app/src/main/jni/sles.h b/LoopbackApp/app/src/main/jni/sles.h index 0c5d709..ebf0342 100644 --- a/LoopbackApp/app/src/main/jni/sles.h +++ b/LoopbackApp/app/src/main/jni/sles.h @@ -74,8 +74,6 @@ typedef struct { SLAndroidSimpleBufferQueueItf recorderBufferQueue; SLBufferQueueItf playerBufferQueue; - pthread_mutex_t mutex;// = PTHREAD_MUTEX_INITIALIZER; - //other things that belong here SLObjectItf playerObject; SLObjectItf recorderObject; @@ -136,7 +134,7 @@ int slesDestroy(sles_data ** ppSles); int slesFull(sles_data *pSles); int slesCreateServer(sles_data *pSles, int samplingRate, int frameCount, int micSource, - int testType, double frequency1, char* qbyteBufferPtr, int byteBufferLength, + int testType, double frequency1, char* byteBufferPtr, int byteBufferLength, short* loopbackTone, int maxRecordedLateCallbacks, jobject captureHolder, const struct JNIInvokeInterface* *jvm); int slesProcessNext(sles_data *pSles, double *pSamples, long maxSamples); diff --git a/LoopbackApp/app/src/main/res/values/strings.xml b/LoopbackApp/app/src/main/res/values/strings.xml index 279181a..49fe37d 100644 --- a/LoopbackApp/app/src/main/res/values/strings.xml +++ b/LoopbackApp/app/src/main/res/values/strings.xml @@ -48,7 +48,8 @@ CAMCORDER VOICE_RECOGNITION VOICE_COMMUNICATION - REMOTE_SUBMIX_java_only + REMOTE_SUBMIX (Java only) + UNPROCESSED (N or later) Info... -- cgit v1.2.3