Version 12

Snap to commit commit 2d59bff14a5a98dd1f3a829d29d1a69fe3b91815

7 files changed, 34 insertions, 13 deletions

diff --git a/LoopbackApp/app/app.iml b/LoopbackApp/app/app.iml
index d77f215..7583f27 100644
--- a/LoopbackApp/app/app.iml
+++ b/LoopbackApp/app/app.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="LoopbackApp" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$USER_HOME$/n/vendor/box/user/rago/studio/LoopbackApp" external.system.id="GRADLE" external.system.module.group="LoopbackApp" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -65,15 +65,24 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/renderscript" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/binaries" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/debug" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/objectFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/release" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
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">
 
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
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("<R");
 
         // We should only be called when a recording buffer is done
@@ -152,7 +151,6 @@ static void recorderCallback(SLAndroidSimpleBufferQueueItf caller __unused, void
 
 
       //ee  SLES_PRINTF("r>");
-        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("<P");
 
         // Get the buffer that just finished playing
@@ -387,7 +384,6 @@ static void playerCallback(SLBufferQueueItf caller __unused, void *context) {
         pSles->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 @@
         <item>CAMCORDER</item>
         <item>VOICE_RECOGNITION</item>
         <item>VOICE_COMMUNICATION</item>
-        <item>REMOTE_SUBMIX_java_only</item>
+        <item>REMOTE_SUBMIX (Java only)</item>
+        <item>UNPROCESSED (N or later)</item>
     </string-array>
 
     <string name="labelInfo">Info...</string>