From 24caa9e32cbbfb6471568d8b45aaf64a64f4b207 Mon Sep 17 00:00:00 2001 From: Robert Wu <85952307+robertwu1@users.noreply.github.com> Date: Wed, 12 Jul 2023 16:20:17 -0700 Subject: [PATCH 1/3] update to android 14 --- apps/OboeTester/app/build.gradle | 4 ++-- apps/fxlab/app/build.gradle | 4 ++-- samples/LiveEffect/build.gradle | 4 ++-- samples/MegaDrone/build.gradle | 4 ++-- samples/RhythmGame/build.gradle | 4 ++-- samples/SoundBoard/build.gradle | 4 ++-- samples/audio-device/build.gradle | 4 ++-- samples/drumthumper/build.gradle | 4 ++-- samples/hello-oboe/build.gradle | 4 ++-- samples/iolib/build.gradle | 4 ++-- samples/parselib/build.gradle | 4 ++-- tests/UnitTestRunner/app/build.gradle | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/apps/OboeTester/app/build.gradle b/apps/OboeTester/app/build.gradle index 27ecc0071..34ca23d45 100644 --- a/apps/OboeTester/app/build.gradle +++ b/apps/OboeTester/app/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 33 + compileSdkVersion 34 defaultConfig { applicationId = "com.mobileer.oboetester" minSdkVersion 23 - targetSdkVersion 33 + targetSdkVersion 34 versionCode 73 versionName "2.5.2" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/apps/fxlab/app/build.gradle b/apps/fxlab/app/build.gradle index 0dbca6339..52c34d813 100644 --- a/apps/fxlab/app/build.gradle +++ b/apps/fxlab/app/build.gradle @@ -23,7 +23,7 @@ apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 33 + compileSdkVersion 34 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -31,7 +31,7 @@ android { defaultConfig { applicationId "com.mobileer.androidfxlab" minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/samples/LiveEffect/build.gradle b/samples/LiveEffect/build.gradle index f336d2e25..50fb09535 100644 --- a/samples/LiveEffect/build.gradle +++ b/samples/LiveEffect/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 33 + compileSdkVersion 34 defaultConfig { applicationId 'com.google.oboe.samples.liveeffect' minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 versionCode 1 versionName '1.0' ndk { diff --git a/samples/MegaDrone/build.gradle b/samples/MegaDrone/build.gradle index 93c372c0a..1096b1116 100644 --- a/samples/MegaDrone/build.gradle +++ b/samples/MegaDrone/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 33 + compileSdkVersion 34 defaultConfig { applicationId "com.google.oboe.samples.megadrone" minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/samples/RhythmGame/build.gradle b/samples/RhythmGame/build.gradle index 88681f434..c453fcb58 100644 --- a/samples/RhythmGame/build.gradle +++ b/samples/RhythmGame/build.gradle @@ -1,10 +1,10 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 33 + compileSdkVersion 34 defaultConfig { applicationId "com.google.oboe.samples.rhythmgame" - targetSdkVersion 33 + targetSdkVersion 34 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/samples/SoundBoard/build.gradle b/samples/SoundBoard/build.gradle index ed4040270..fdfe8a72b 100644 --- a/samples/SoundBoard/build.gradle +++ b/samples/SoundBoard/build.gradle @@ -4,11 +4,11 @@ plugins { } android { - compileSdkVersion 33 + compileSdkVersion 34 defaultConfig { applicationId "com.google.oboe.samples.soundboard" minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/samples/audio-device/build.gradle b/samples/audio-device/build.gradle index 4f52c4e32..320888bf2 100644 --- a/samples/audio-device/build.gradle +++ b/samples/audio-device/build.gradle @@ -1,10 +1,10 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 33 + compileSdkVersion 34 defaultConfig { minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 } buildTypes { release { diff --git a/samples/drumthumper/build.gradle b/samples/drumthumper/build.gradle index 17a119901..7a19c632d 100644 --- a/samples/drumthumper/build.gradle +++ b/samples/drumthumper/build.gradle @@ -3,7 +3,7 @@ plugins { id 'org.jetbrains.kotlin.android' } android { - compileSdkVersion 33 + compileSdkVersion 34 defaultConfig { // Usually the applicationId follows the same scheme as the application package name, @@ -13,7 +13,7 @@ android { // who publishes using the application Id prefix of "com.plausiblesoftware". applicationId "com.plausiblesoftware.drumthumper" minSdkVersion 23 - targetSdkVersion 33 + targetSdkVersion 34 versionCode 2 versionName "1.01" diff --git a/samples/hello-oboe/build.gradle b/samples/hello-oboe/build.gradle index 29b6fc26b..59b0b188a 100644 --- a/samples/hello-oboe/build.gradle +++ b/samples/hello-oboe/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 33 + compileSdkVersion 34 defaultConfig { applicationId 'com.google.oboe.samples.hellooboe' minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 versionCode 1 versionName '1.0' externalNativeBuild { diff --git a/samples/iolib/build.gradle b/samples/iolib/build.gradle index d0571a92e..266c97892 100644 --- a/samples/iolib/build.gradle +++ b/samples/iolib/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 33 + compileSdkVersion 34 defaultConfig { minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' diff --git a/samples/parselib/build.gradle b/samples/parselib/build.gradle index 58b2190dc..c593a5deb 100644 --- a/samples/parselib/build.gradle +++ b/samples/parselib/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 33 + compileSdkVersion 34 defaultConfig { minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/tests/UnitTestRunner/app/build.gradle b/tests/UnitTestRunner/app/build.gradle index 8547843f9..58bf4aaa8 100644 --- a/tests/UnitTestRunner/app/build.gradle +++ b/tests/UnitTestRunner/app/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 33 + compileSdkVersion 34 defaultConfig { applicationId "com.google.oboe.tests.unittestrunner" minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 versionCode 1 versionName "1.0" } From 04f49b4e357f3f8339cd2368c6b9f985f49a916d Mon Sep 17 00:00:00 2001 From: Robert Wu <85952307+robertwu1@users.noreply.github.com> Date: Fri, 6 Oct 2023 14:58:20 -0700 Subject: [PATCH 2/3] update device id --- apps/OboeTester/app/src/main/cpp/jni-bridge.cpp | 2 +- .../com/mobileer/oboetester/TestColdStartLatencyActivity.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/OboeTester/app/src/main/cpp/jni-bridge.cpp b/apps/OboeTester/app/src/main/cpp/jni-bridge.cpp index 08e12129f..eea8f5fa5 100644 --- a/apps/OboeTester/app/src/main/cpp/jni-bridge.cpp +++ b/apps/OboeTester/app/src/main/cpp/jni-bridge.cpp @@ -931,7 +931,7 @@ Java_com_mobileer_oboetester_TestColdStartLatencyActivity_getColdStartTimeMicros } JNIEXPORT jint JNICALL -Java_com_mobileer_oboetester_TestColdStartLatencyActivity_getDeviceId( +Java_com_mobileer_oboetester_TestColdStartLatencyActivity_getStreamDeviceId( JNIEnv *env, jobject instance) { return sColdStartLatency.getDeviceId(); } diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestColdStartLatencyActivity.java b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestColdStartLatencyActivity.java index b16bcd4ac..8984a77ad 100644 --- a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestColdStartLatencyActivity.java +++ b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestColdStartLatencyActivity.java @@ -135,7 +135,7 @@ public void run() { try { sleep(closedSleepTimeMillis); openStream(useInput, useLowLatency, useMmap, useExclusive); - log("-------#" + loopCount + " Device Id: " + getDeviceId()); + log("-------#" + loopCount + " Device Id: " + getStreamDeviceId()); log("open() Latency: " + getOpenTimeMicros() / 1000 + " msec"); sleep(openSleepTimeMillis); startStream(); @@ -185,7 +185,7 @@ private native int openStream(boolean useInput, boolean useLowLatency, boolean u private native int getOpenTimeMicros(); private native int getStartTimeMicros(); private native int getColdStartTimeMicros(); - private native int getDeviceId(); + private native int getStreamDeviceId(); @Override public void onPause() { From 1646744d0b6a5573de20325647724153c0178670 Mon Sep 17 00:00:00 2001 From: Robert Wu <85952307+robertwu1@users.noreply.github.com> Date: Fri, 6 Oct 2023 15:01:12 -0700 Subject: [PATCH 3/3] rename device id --- apps/OboeTester/app/src/main/cpp/jni-bridge.cpp | 2 +- .../com/mobileer/oboetester/TestColdStartLatencyActivity.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/OboeTester/app/src/main/cpp/jni-bridge.cpp b/apps/OboeTester/app/src/main/cpp/jni-bridge.cpp index eea8f5fa5..674255ce8 100644 --- a/apps/OboeTester/app/src/main/cpp/jni-bridge.cpp +++ b/apps/OboeTester/app/src/main/cpp/jni-bridge.cpp @@ -931,7 +931,7 @@ Java_com_mobileer_oboetester_TestColdStartLatencyActivity_getColdStartTimeMicros } JNIEXPORT jint JNICALL -Java_com_mobileer_oboetester_TestColdStartLatencyActivity_getStreamDeviceId( +Java_com_mobileer_oboetester_TestColdStartLatencyActivity_getAudioDeviceId( JNIEnv *env, jobject instance) { return sColdStartLatency.getDeviceId(); } diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestColdStartLatencyActivity.java b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestColdStartLatencyActivity.java index 8984a77ad..b88b611c8 100644 --- a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestColdStartLatencyActivity.java +++ b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestColdStartLatencyActivity.java @@ -135,7 +135,7 @@ public void run() { try { sleep(closedSleepTimeMillis); openStream(useInput, useLowLatency, useMmap, useExclusive); - log("-------#" + loopCount + " Device Id: " + getStreamDeviceId()); + log("-------#" + loopCount + " Device Id: " + getAudioDeviceId()); log("open() Latency: " + getOpenTimeMicros() / 1000 + " msec"); sleep(openSleepTimeMillis); startStream(); @@ -185,7 +185,7 @@ private native int openStream(boolean useInput, boolean useLowLatency, boolean u private native int getOpenTimeMicros(); private native int getStartTimeMicros(); private native int getColdStartTimeMicros(); - private native int getStreamDeviceId(); + private native int getAudioDeviceId(); @Override public void onPause() {