Snap to commit 34b45df0f10d1a0043274d367ef643e80457950bupstream-master

Test: N/A

5 files changed, 15 insertions, 4 deletions

diff --git a/LoopbackApp/app/src/main/Android.mk b/LoopbackApp/app/src/main/Android.mk_
index 1c4e0f0..78b835a 100644
--- a/LoopbackApp/app/src/main/Android.mk
+++ b/LoopbackApp/app/src/main/Android.mk_
@@ -19,6 +19,8 @@ LOCAL_USE_AAPT2 := true
 LOCAL_STATIC_ANDROID_LIBRARIES := \
     androidx.legacy_legacy-support-v4
 
+LOCAL_SDK_VERSION := current
+
 include $(BUILD_PACKAGE)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/LoopbackApp/app/src/main/cpp/Android.mk b/LoopbackApp/app/src/main/cpp/Android.mk
index b5f989a..c2cef77 100644
--- a/LoopbackApp/app/src/main/cpp/Android.mk
+++ b/LoopbackApp/app/src/main/cpp/Android.mk
@@ -22,6 +22,9 @@ LOCAL_SRC_FILES   := \
 LOCAL_C_INCLUDES := \
     frameworks/wilhelm/include
 
+LOCAL_C_INCLUDES += \
+    frameworks/av/media/libaaudio/include
+
 LOCAL_LDLIBS += -lOpenSLES -ldl -llog -landroid
 
 #LOCAL_LDFLAGS += -Wl,--hash-style=sysv
diff --git a/LoopbackApp/app/src/main/cpp/lb2/loopback_test.cpp b/LoopbackApp/app/src/main/cpp/lb2/loopback_test.cpp
index 8447442..9e9b1a7 100644
--- a/LoopbackApp/app/src/main/cpp/lb2/loopback_test.cpp
+++ b/LoopbackApp/app/src/main/cpp/lb2/loopback_test.cpp
@@ -85,7 +85,7 @@ void LoopbackTest::receiveRecording(size_t framesRead) {
 
 LatencyTest::LatencyTest(SoundSystem* soundSys, LatencyTestContext* testCtx)
         : LoopbackTest(soundSys, testCtx),
-          mTestCtx(testCtx),
+          //mTestCtx(testCtx),
           mDrainInput(true),
           mInputFramesToDiscard(testCtx->getInputFramesToDiscard()),
           mInitialSilenceFrameCount(wholeMultiplier(
diff --git a/LoopbackApp/app/src/main/cpp/lb2/loopback_test.h b/LoopbackApp/app/src/main/cpp/lb2/loopback_test.h
index 2ab3112..06a25ae 100644
--- a/LoopbackApp/app/src/main/cpp/lb2/loopback_test.h
+++ b/LoopbackApp/app/src/main/cpp/lb2/loopback_test.h
@@ -74,7 +74,7 @@ class LatencyTest : public LoopbackTest {
 
     AudioBufferView<sample_t> writeCallback(size_t expectedFrames);
 
-    LatencyTestContext* mTestCtx;
+    //LatencyTestContext* mTestCtx;
     int mDrainInput;
     int mInputFramesToDiscard;
     int mInitialSilenceFrameCount;
diff --git a/LoopbackApp/app/src/main/cpp/sles.cpp b/LoopbackApp/app/src/main/cpp/sles.cpp
index 0f2d5b3..9a07a44 100644
--- a/LoopbackApp/app/src/main/cpp/sles.cpp
+++ b/LoopbackApp/app/src/main/cpp/sles.cpp
@@ -496,6 +496,7 @@ static int slesCreateServer(sles_data *pSles, int samplingRate, int frameCount,
         //        char **freeBuffers;
 
         // Buffer indices
+#if 0
         pSles->rxFront;    // oldest recording
         pSles->rxRear;     // next to be recorded
         pSles->txFront;    // oldest playing
@@ -504,9 +505,12 @@ static int slesCreateServer(sles_data *pSles, int samplingRate, int frameCount,
         pSles->freeRear;   // next to be freed
 
         pSles->fifo; //(*)
+#endif
         pSles->fifo2Buffer = NULL;  //this fifo is for sending data to java code (to plot it)
+#if 0
         pSles->recorderBufferQueue;
         pSles->playerBufferQueue;
+#endif
 
 
 
@@ -606,7 +610,9 @@ static int slesCreateServer(sles_data *pSles, int samplingRate, int frameCount,
         SLresult result;
 
         // create engine
+#if 0
         pSles->engineObject;
+#endif
         result = slCreateEngine(&(pSles->engineObject), 0, NULL, 0, NULL, NULL);
         ASSERT_EQ(SL_RESULT_SUCCESS, result);
         result = (*(pSles->engineObject))->Realize(pSles->engineObject, SL_BOOLEAN_FALSE);
@@ -617,7 +623,9 @@ static int slesCreateServer(sles_data *pSles, int samplingRate, int frameCount,
         ASSERT_EQ(SL_RESULT_SUCCESS, result);
 
         // create output mix
+#if 0
         pSles->outputmixObject;
+#endif
         result = (*engineEngine)->CreateOutputMix(engineEngine, &(pSles->outputmixObject), 0, NULL,
                 NULL);
         ASSERT_EQ(SL_RESULT_SUCCESS, result);
@@ -826,8 +834,6 @@ static int slesCreateServer(sles_data *pSles, int samplingRate, int frameCount,
 
         SLES_PRINTF("Finished initialization with status: %d", status);
 
-        int xx = 1;
-
     }
     return status;
 }