From 9801dbde01e95cbe7ee66993dfb6c5f74a6cdbfd Mon Sep 17 00:00:00 2001 From: Harold Thetiot Date: Sat, 14 Sep 2024 16:47:32 +0200 Subject: [PATCH 01/33] add arm64-v8a to APP_ABI to support arm64 --- libuvccamera/src/main/jni/Application.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libuvccamera/src/main/jni/Application.mk b/libuvccamera/src/main/jni/Application.mk index c6f7c2e1b..afa51630d 100644 --- a/libuvccamera/src/main/jni/Application.mk +++ b/libuvccamera/src/main/jni/Application.mk @@ -26,7 +26,7 @@ # Note: Supporting GCC on NDK is already deprecated and GCC will be removed from NDK soon. #NDK_TOOLCHAIN_VERSION := 4.9 -APP_PLATFORM := android-14 -APP_ABI := armeabi armeabi-v7a x86 mips +APP_PLATFORM := android-16 +APP_ABI := armeabi armeabi-v7a arm64-v8a x86 mips #APP_OPTIM := debug APP_OPTIM := release From 7b9bba47fe09186089a23ee41aa308a5a4fa599a Mon Sep 17 00:00:00 2001 From: Harold Thetiot Date: Sat, 14 Sep 2024 16:48:05 +0200 Subject: [PATCH 02/33] remove '-XX:MaxPermSize=512m' from gradle.properties that can cause error on JAVA version above 20 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 2c1f15099..f30eb8d10 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. # Default value: -Xmx10248m -XX:MaxPermSize=256m -org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit From aa5efa33cdbd0a694908e61de2dec065d2289d84 Mon Sep 17 00:00:00 2001 From: Harold Thetiot Date: Sat, 14 Sep 2024 17:05:55 +0200 Subject: [PATCH 03/33] migrate to gradlew 7.2.1 --- build.gradle | 17 +++++++---------- gradle/wrapper/gradle-wrapper.properties | 3 +-- gradlew | 10 +++------- libuvccamera/build.gradle | 3 +-- usbCameraCommon/build.gradle | 3 +-- usbCameraTest/build.gradle | 3 +-- usbCameraTest0/build.gradle | 1 - usbCameraTest2/build.gradle | 3 +-- usbCameraTest3/build.gradle | 3 +-- usbCameraTest4/build.gradle | 3 +-- usbCameraTest5/build.gradle | 3 +-- usbCameraTest6/build.gradle | 3 +-- usbCameraTest7/build.gradle | 3 +-- usbCameraTest8/build.gradle | 3 +-- 14 files changed, 21 insertions(+), 40 deletions(-) diff --git a/build.gradle b/build.gradle index 3287a8720..aa48c84f0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,21 +1,19 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { repositories { -// google() - maven { url 'https://maven.google.com' } jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' + classpath 'com.android.tools.build:gradle:7.2.1' } } allprojects { repositories { -// google() - maven { url 'https://maven.google.com' } - jcenter() - maven { url 'http://raw.github.com/saki4510t/libcommon/master/repository/' } + maven { url 'https://raw.github.com/saki4510t/libcommon/master/repository/' } + jcenter() + google() } } @@ -26,9 +24,8 @@ task clean(type: Delete) { ext { supportLibVersion = '27.1.1' // variable that can be referenced to keep support libs consistent commonLibVersion= '2.12.4' - versionBuildTool = '27.0.3' - versionCompiler = 27 - versionTarget = 27 + versionCompiler = 34 + versionTarget = 34 versionNameString = '1.0.0' javaSourceCompatibility = JavaVersion.VERSION_1_8 javaTargetCompatibility = JavaVersion.VERSION_1_8 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 17daf5c34..aa991fcea 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Tue Oct 02 16:16:11 JST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/gradlew b/gradlew index 91a7e269e..9d82f7891 100755 --- a/gradlew +++ b/gradlew @@ -42,11 +42,6 @@ case "`uname`" in ;; esac -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - # Attempt to set APP_HOME # Resolve links: $0 may be a link PRG="$0" @@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do fi done SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- +cd "`dirname \"$PRG\"`/" >/dev/null APP_HOME="`pwd -P`" -cd "$SAVED" >&- +cd "$SAVED" >/dev/null CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -114,6 +109,7 @@ fi if $cygwin ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` diff --git a/libuvccamera/build.gradle b/libuvccamera/build.gradle index 6025fe8c2..f02877336 100644 --- a/libuvccamera/build.gradle +++ b/libuvccamera/build.gradle @@ -26,7 +26,6 @@ import org.apache.tools.ant.taskdefs.condition.Os android { compileSdkVersion versionCompiler - buildToolsVersion versionBuildTool compileOptions { sourceCompatibility javaSourceCompatibility @@ -34,7 +33,7 @@ android { } defaultConfig { - minSdkVersion 14 + minSdkVersion minSdkVersion targetSdkVersion versionTarget } diff --git a/usbCameraCommon/build.gradle b/usbCameraCommon/build.gradle index 92ed5a9d9..ff21286fe 100644 --- a/usbCameraCommon/build.gradle +++ b/usbCameraCommon/build.gradle @@ -24,8 +24,7 @@ apply plugin: 'com.android.library' android { - compileSdkVersion versionCompiler - buildToolsVersion versionBuildTool + compileSdk versionCompiler compileOptions { sourceCompatibility javaSourceCompatibility diff --git a/usbCameraTest/build.gradle b/usbCameraTest/build.gradle index da5a1c139..409d7a529 100644 --- a/usbCameraTest/build.gradle +++ b/usbCameraTest/build.gradle @@ -25,7 +25,6 @@ apply plugin: 'com.android.application' android { compileSdkVersion versionCompiler - buildToolsVersion versionBuildTool compileOptions { sourceCompatibility javaSourceCompatibility @@ -34,7 +33,7 @@ android { defaultConfig { applicationId "com.serenegiant.usbcameratest" - minSdkVersion 14 + minSdkVersion minSdkVersion // 14 targetSdkVersion versionTarget versionCode 8 versionName "3.00" diff --git a/usbCameraTest0/build.gradle b/usbCameraTest0/build.gradle index cc233b045..7b5ff87f0 100644 --- a/usbCameraTest0/build.gradle +++ b/usbCameraTest0/build.gradle @@ -25,7 +25,6 @@ apply plugin: 'com.android.application' android { compileSdkVersion versionCompiler - buildToolsVersion versionBuildTool compileOptions { sourceCompatibility javaSourceCompatibility diff --git a/usbCameraTest2/build.gradle b/usbCameraTest2/build.gradle index 6d7160fa7..b88116d15 100644 --- a/usbCameraTest2/build.gradle +++ b/usbCameraTest2/build.gradle @@ -25,7 +25,6 @@ apply plugin: 'com.android.application' android { compileSdkVersion versionCompiler - buildToolsVersion versionBuildTool compileOptions { sourceCompatibility javaSourceCompatibility @@ -34,7 +33,7 @@ android { defaultConfig { applicationId "com.serenegiant.usbcameratest2" - minSdkVersion 18 + minSdkVersion minSdkVersion // 18 targetSdkVersion versionTarget versionCode 8 versionName "3.00" diff --git a/usbCameraTest3/build.gradle b/usbCameraTest3/build.gradle index 71d65ef70..494533701 100644 --- a/usbCameraTest3/build.gradle +++ b/usbCameraTest3/build.gradle @@ -25,7 +25,6 @@ apply plugin: 'com.android.application' android { compileSdkVersion versionCompiler - buildToolsVersion versionBuildTool compileOptions { sourceCompatibility javaSourceCompatibility @@ -34,7 +33,7 @@ android { defaultConfig { applicationId "com.serenegiant.usbcameratest3" - minSdkVersion 18 + minSdkVersion minSdkVersion // 18 targetSdkVersion versionTarget versionCode 8 versionName "3.00" diff --git a/usbCameraTest4/build.gradle b/usbCameraTest4/build.gradle index 8b9f98b7f..4fd3d6757 100644 --- a/usbCameraTest4/build.gradle +++ b/usbCameraTest4/build.gradle @@ -25,7 +25,6 @@ apply plugin: 'com.android.application' android { compileSdkVersion versionCompiler - buildToolsVersion versionBuildTool compileOptions { sourceCompatibility javaSourceCompatibility @@ -34,7 +33,7 @@ android { defaultConfig { applicationId "com.serenegiant.usbcameratest4" - minSdkVersion 18 + minSdkVersion minSdkVersion // 18 targetSdkVersion versionTarget versionCode 9 versionName "3.00" diff --git a/usbCameraTest5/build.gradle b/usbCameraTest5/build.gradle index b51c7260e..e1f257bba 100644 --- a/usbCameraTest5/build.gradle +++ b/usbCameraTest5/build.gradle @@ -25,7 +25,6 @@ apply plugin: 'com.android.application' android { compileSdkVersion versionCompiler - buildToolsVersion versionBuildTool compileOptions { sourceCompatibility javaSourceCompatibility @@ -34,7 +33,7 @@ android { defaultConfig { applicationId "com.serenegiant.usbcameratest5" - minSdkVersion 18 + minSdkVersion minSdkVersion // 18 targetSdkVersion versionTarget versionCode 8 versionName "3.00" diff --git a/usbCameraTest6/build.gradle b/usbCameraTest6/build.gradle index d24f32692..792e906d9 100644 --- a/usbCameraTest6/build.gradle +++ b/usbCameraTest6/build.gradle @@ -25,7 +25,6 @@ apply plugin: 'com.android.application' android { compileSdkVersion versionCompiler - buildToolsVersion versionBuildTool compileOptions { sourceCompatibility javaSourceCompatibility @@ -34,7 +33,7 @@ android { defaultConfig { applicationId "com.serenegiant.usbcameratest6" - minSdkVersion 18 + minSdkVersion minSdkVersion // 18 targetSdkVersion versionTarget versionCode 8 versionName "3.00" diff --git a/usbCameraTest7/build.gradle b/usbCameraTest7/build.gradle index eba53a822..e6c16ff7b 100644 --- a/usbCameraTest7/build.gradle +++ b/usbCameraTest7/build.gradle @@ -25,7 +25,6 @@ apply plugin: 'com.android.application' android { compileSdkVersion versionCompiler - buildToolsVersion versionBuildTool compileOptions { sourceCompatibility javaSourceCompatibility @@ -34,7 +33,7 @@ android { defaultConfig { applicationId "com.serenegiant.usbcameratest7" - minSdkVersion 18 + minSdkVersion minSdkVersion // 18 targetSdkVersion versionTarget versionCode 9 versionName "3.00" diff --git a/usbCameraTest8/build.gradle b/usbCameraTest8/build.gradle index 94d049ff5..32b7c2d0a 100644 --- a/usbCameraTest8/build.gradle +++ b/usbCameraTest8/build.gradle @@ -25,7 +25,6 @@ apply plugin: 'com.android.application' android { compileSdkVersion versionCompiler - buildToolsVersion versionBuildTool compileOptions { sourceCompatibility javaSourceCompatibility @@ -34,7 +33,7 @@ android { defaultConfig { applicationId "com.serenegiant.usbcameratest8" - minSdkVersion 18 + minSdkVersion minSdkVersion // 18 targetSdkVersion versionTarget versionCode 1 versionName "1.0" From c14656a19301c2002db5f581a3feb60b6def64ef Mon Sep 17 00:00:00 2001 From: Harold Thetiot Date: Sat, 14 Sep 2024 17:06:18 +0200 Subject: [PATCH 04/33] fix ndk error for armeabi, mips and x86 --- libuvccamera/src/main/jni/Application.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libuvccamera/src/main/jni/Application.mk b/libuvccamera/src/main/jni/Application.mk index afa51630d..01b07c4b4 100644 --- a/libuvccamera/src/main/jni/Application.mk +++ b/libuvccamera/src/main/jni/Application.mk @@ -26,7 +26,7 @@ # Note: Supporting GCC on NDK is already deprecated and GCC will be removed from NDK soon. #NDK_TOOLCHAIN_VERSION := 4.9 -APP_PLATFORM := android-16 -APP_ABI := armeabi armeabi-v7a arm64-v8a x86 mips +APP_PLATFORM := android-21 +APP_ABI := armeabi-v7a arm64-v8a #APP_OPTIM := debug APP_OPTIM := release From dd3068d14b469658ae51037a8e38794c0231d841 Mon Sep 17 00:00:00 2001 From: Harold Thetiot Date: Sat, 14 Sep 2024 17:06:30 +0200 Subject: [PATCH 05/33] fix libuvccamera/src/main/AndroidManifest.xml --- libuvccamera/src/main/AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libuvccamera/src/main/AndroidManifest.xml b/libuvccamera/src/main/AndroidManifest.xml index 8a2f33f49..c04d5ca4e 100644 --- a/libuvccamera/src/main/AndroidManifest.xml +++ b/libuvccamera/src/main/AndroidManifest.xml @@ -27,7 +27,7 @@ android:versionName="1.1" > + android:minSdkVersion="21" + android:targetSdkVersion="33" /> From 5b26a6d2d5c2eade1bd031e42032b77a9db9a438 Mon Sep 17 00:00:00 2001 From: Harold Thetiot Date: Sat, 14 Sep 2024 17:08:44 +0200 Subject: [PATCH 06/33] add '.DS_Store' to .gitignore --- .idea/compiler.xml | 18 +---- .idea/gradle.xml | 4 +- .idea/modules.xml | 55 ++++++++++++--- .../UVCCamera.libuvccamera.androidTest.iml | 56 +++++++++++++++ .../libuvccamera/UVCCamera.libuvccamera.iml | 32 +++++++++ .../UVCCamera.libuvccamera.main.iml | 59 ++++++++++++++++ .../UVCCamera.libuvccamera.unitTest.iml | 47 +++++++++++++ .../UVCCamera.usbCameraCommon.androidTest.iml | 59 ++++++++++++++++ .../UVCCamera.usbCameraCommon.main.iml | 60 ++++++++++++++++ .../UVCCamera.usbCameraCommon.unitTest.iml | 48 +++++++++++++ .../UVCCamera.usbCameraTest.androidTest.iml | 54 ++++++++++++++ .../UVCCamera.usbCameraTest.main.iml | 57 +++++++++++++++ .../UVCCamera.usbCameraTest.unitTest.iml | 47 +++++++++++++ .../UVCCamera.usbCameraTest0.androidTest.iml | 54 ++++++++++++++ .../UVCCamera.usbCameraTest0.main.iml | 57 +++++++++++++++ .../UVCCamera.usbCameraTest0.unitTest.iml | 47 +++++++++++++ .../UVCCamera.usbCameraTest2.androidTest.iml | 54 ++++++++++++++ .../UVCCamera.usbCameraTest2.main.iml | 57 +++++++++++++++ .../UVCCamera.usbCameraTest2.unitTest.iml | 47 +++++++++++++ .../UVCCamera.usbCameraTest3.androidTest.iml | 55 +++++++++++++++ .../UVCCamera.usbCameraTest3.main.iml | 58 +++++++++++++++ .../UVCCamera.usbCameraTest3.unitTest.iml | 48 +++++++++++++ .../UVCCamera.usbCameraTest4.androidTest.iml | 55 +++++++++++++++ .../UVCCamera.usbCameraTest4.main.iml | 61 ++++++++++++++++ .../UVCCamera.usbCameraTest4.unitTest.iml | 48 +++++++++++++ .../UVCCamera.usbCameraTest5.androidTest.iml | 55 +++++++++++++++ .../UVCCamera.usbCameraTest5.iml | 31 ++++++++ .../UVCCamera.usbCameraTest5.main.iml | 58 +++++++++++++++ .../UVCCamera.usbCameraTest5.unitTest.iml | 48 +++++++++++++ .../UVCCamera.usbCameraTest6.androidTest.iml | 55 +++++++++++++++ .../UVCCamera.usbCameraTest6.main.iml | 58 +++++++++++++++ .../UVCCamera.usbCameraTest6.unitTest.iml | 48 +++++++++++++ .../UVCCamera.usbCameraTest7.androidTest.iml | 55 +++++++++++++++ .../UVCCamera.usbCameraTest7.main.iml | 58 +++++++++++++++ .../UVCCamera.usbCameraTest7.unitTest.iml | 48 +++++++++++++ .../UVCCamera.usbCameraTest8.androidTest.iml | 70 +++++++++++++++++++ .../UVCCamera.usbCameraTest8.main.iml | 58 +++++++++++++++ .../UVCCamera.usbCameraTest8.unitTest.iml | 52 ++++++++++++++ UVCCamera.iml | 15 ++-- 39 files changed, 1905 insertions(+), 41 deletions(-) create mode 100644 .idea/modules/libuvccamera/UVCCamera.libuvccamera.androidTest.iml create mode 100644 .idea/modules/libuvccamera/UVCCamera.libuvccamera.iml create mode 100644 .idea/modules/libuvccamera/UVCCamera.libuvccamera.main.iml create mode 100644 .idea/modules/libuvccamera/UVCCamera.libuvccamera.unitTest.iml create mode 100644 .idea/modules/usbCameraCommon/UVCCamera.usbCameraCommon.androidTest.iml create mode 100644 .idea/modules/usbCameraCommon/UVCCamera.usbCameraCommon.main.iml create mode 100644 .idea/modules/usbCameraCommon/UVCCamera.usbCameraCommon.unitTest.iml create mode 100644 .idea/modules/usbCameraTest/UVCCamera.usbCameraTest.androidTest.iml create mode 100644 .idea/modules/usbCameraTest/UVCCamera.usbCameraTest.main.iml create mode 100644 .idea/modules/usbCameraTest/UVCCamera.usbCameraTest.unitTest.iml create mode 100644 .idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.androidTest.iml create mode 100644 .idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.main.iml create mode 100644 .idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.unitTest.iml create mode 100644 .idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.androidTest.iml create mode 100644 .idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.main.iml create mode 100644 .idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.unitTest.iml create mode 100644 .idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.androidTest.iml create mode 100644 .idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.main.iml create mode 100644 .idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.unitTest.iml create mode 100644 .idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.androidTest.iml create mode 100644 .idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.main.iml create mode 100644 .idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.unitTest.iml create mode 100644 .idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.androidTest.iml create mode 100644 .idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.iml create mode 100644 .idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.main.iml create mode 100644 .idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.unitTest.iml create mode 100644 .idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.androidTest.iml create mode 100644 .idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.main.iml create mode 100644 .idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.unitTest.iml create mode 100644 .idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.androidTest.iml create mode 100644 .idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.main.iml create mode 100644 .idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.unitTest.iml create mode 100644 .idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.androidTest.iml create mode 100644 .idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.main.iml create mode 100644 .idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.unitTest.iml diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 96cc43efa..b589d56e9 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,22 +1,6 @@ - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index da16de338..493d293d4 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,9 +1,9 @@ + diff --git a/.idea/modules.xml b/.idea/modules.xml index 0fbe4b750..1492c4dfd 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,17 +3,50 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/libuvccamera/UVCCamera.libuvccamera.androidTest.iml b/.idea/modules/libuvccamera/UVCCamera.libuvccamera.androidTest.iml new file mode 100644 index 000000000..b81fd7bc6 --- /dev/null +++ b/.idea/modules/libuvccamera/UVCCamera.libuvccamera.androidTest.iml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/libuvccamera/UVCCamera.libuvccamera.iml b/.idea/modules/libuvccamera/UVCCamera.libuvccamera.iml new file mode 100644 index 000000000..df06f1511 --- /dev/null +++ b/.idea/modules/libuvccamera/UVCCamera.libuvccamera.iml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/libuvccamera/UVCCamera.libuvccamera.main.iml b/.idea/modules/libuvccamera/UVCCamera.libuvccamera.main.iml new file mode 100644 index 000000000..dc0c5095b --- /dev/null +++ b/.idea/modules/libuvccamera/UVCCamera.libuvccamera.main.iml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/libuvccamera/UVCCamera.libuvccamera.unitTest.iml b/.idea/modules/libuvccamera/UVCCamera.libuvccamera.unitTest.iml new file mode 100644 index 000000000..7258bdf4f --- /dev/null +++ b/.idea/modules/libuvccamera/UVCCamera.libuvccamera.unitTest.iml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraCommon/UVCCamera.usbCameraCommon.androidTest.iml b/.idea/modules/usbCameraCommon/UVCCamera.usbCameraCommon.androidTest.iml new file mode 100644 index 000000000..8e1aa5887 --- /dev/null +++ b/.idea/modules/usbCameraCommon/UVCCamera.usbCameraCommon.androidTest.iml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraCommon/UVCCamera.usbCameraCommon.main.iml b/.idea/modules/usbCameraCommon/UVCCamera.usbCameraCommon.main.iml new file mode 100644 index 000000000..ba0e17cad --- /dev/null +++ b/.idea/modules/usbCameraCommon/UVCCamera.usbCameraCommon.main.iml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraCommon/UVCCamera.usbCameraCommon.unitTest.iml b/.idea/modules/usbCameraCommon/UVCCamera.usbCameraCommon.unitTest.iml new file mode 100644 index 000000000..cc5cf8105 --- /dev/null +++ b/.idea/modules/usbCameraCommon/UVCCamera.usbCameraCommon.unitTest.iml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.androidTest.iml b/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.androidTest.iml new file mode 100644 index 000000000..c220006d7 --- /dev/null +++ b/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.androidTest.iml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.main.iml b/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.main.iml new file mode 100644 index 000000000..5b4ab5589 --- /dev/null +++ b/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.main.iml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.unitTest.iml b/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.unitTest.iml new file mode 100644 index 000000000..e3df29d36 --- /dev/null +++ b/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.unitTest.iml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.androidTest.iml b/.idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.androidTest.iml new file mode 100644 index 000000000..22557b12a --- /dev/null +++ b/.idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.androidTest.iml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.main.iml b/.idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.main.iml new file mode 100644 index 000000000..ef398a673 --- /dev/null +++ b/.idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.main.iml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.unitTest.iml b/.idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.unitTest.iml new file mode 100644 index 000000000..7d08e476e --- /dev/null +++ b/.idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.unitTest.iml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.androidTest.iml b/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.androidTest.iml new file mode 100644 index 000000000..509ce7cb0 --- /dev/null +++ b/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.androidTest.iml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.main.iml b/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.main.iml new file mode 100644 index 000000000..25bdcbc00 --- /dev/null +++ b/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.main.iml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.unitTest.iml b/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.unitTest.iml new file mode 100644 index 000000000..59671a2d9 --- /dev/null +++ b/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.unitTest.iml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.androidTest.iml b/.idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.androidTest.iml new file mode 100644 index 000000000..a258ffb5b --- /dev/null +++ b/.idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.androidTest.iml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.main.iml b/.idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.main.iml new file mode 100644 index 000000000..d432c1275 --- /dev/null +++ b/.idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.main.iml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.unitTest.iml b/.idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.unitTest.iml new file mode 100644 index 000000000..2968bcca2 --- /dev/null +++ b/.idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.unitTest.iml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.androidTest.iml b/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.androidTest.iml new file mode 100644 index 000000000..c7198e9ff --- /dev/null +++ b/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.androidTest.iml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.main.iml b/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.main.iml new file mode 100644 index 000000000..8bcd93874 --- /dev/null +++ b/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.main.iml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.unitTest.iml b/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.unitTest.iml new file mode 100644 index 000000000..8d6fd6e0f --- /dev/null +++ b/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.unitTest.iml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.androidTest.iml b/.idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.androidTest.iml new file mode 100644 index 000000000..bab6c8416 --- /dev/null +++ b/.idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.androidTest.iml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.iml b/.idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.iml new file mode 100644 index 000000000..b4ea28a31 --- /dev/null +++ b/.idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.iml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.main.iml b/.idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.main.iml new file mode 100644 index 000000000..cb0dffceb --- /dev/null +++ b/.idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.main.iml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.unitTest.iml b/.idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.unitTest.iml new file mode 100644 index 000000000..1e5f340c2 --- /dev/null +++ b/.idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.unitTest.iml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.androidTest.iml b/.idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.androidTest.iml new file mode 100644 index 000000000..d85b22f9f --- /dev/null +++ b/.idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.androidTest.iml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.main.iml b/.idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.main.iml new file mode 100644 index 000000000..dd9d351ca --- /dev/null +++ b/.idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.main.iml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.unitTest.iml b/.idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.unitTest.iml new file mode 100644 index 000000000..57938af5d --- /dev/null +++ b/.idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.unitTest.iml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.androidTest.iml b/.idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.androidTest.iml new file mode 100644 index 000000000..78e15f3f5 --- /dev/null +++ b/.idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.androidTest.iml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.main.iml b/.idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.main.iml new file mode 100644 index 000000000..847fa6b19 --- /dev/null +++ b/.idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.main.iml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.unitTest.iml b/.idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.unitTest.iml new file mode 100644 index 000000000..701dcaab0 --- /dev/null +++ b/.idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.unitTest.iml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.androidTest.iml b/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.androidTest.iml new file mode 100644 index 000000000..46b6890a4 --- /dev/null +++ b/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.androidTest.iml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.main.iml b/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.main.iml new file mode 100644 index 000000000..dc41492a3 --- /dev/null +++ b/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.main.iml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.unitTest.iml b/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.unitTest.iml new file mode 100644 index 000000000..556275361 --- /dev/null +++ b/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.unitTest.iml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/UVCCamera.iml b/UVCCamera.iml index e9836a27d..757acfb3b 100644 --- a/UVCCamera.iml +++ b/UVCCamera.iml @@ -1,19 +1,12 @@ - - - - - - - - + + + - + \ No newline at end of file From 6bb47196c6b5963665ff18a00b1a7dc8b12d1086 Mon Sep 17 00:00:00 2001 From: Harold Thetiot Date: Sat, 14 Sep 2024 17:08:52 +0200 Subject: [PATCH 07/33] add '.DS_Store' to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b219993c2..be507050d 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,7 @@ bin/classes bin/res bin/jarlist.cache *.cache +.DS_Store # Local configuration file (sdk path, etc) local.properties From 4a8e271ffda79a949fd90cf9408a7214cad0c047 Mon Sep 17 00:00:00 2001 From: Harold Thetiot Date: Sat, 14 Sep 2024 17:19:12 +0200 Subject: [PATCH 08/33] add Github build --- .github/workflows/main.yml | 43 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 000000000..ee99b4574 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,43 @@ +name: Run Gradle Build on PRs +# Controls when the workflow will run +on: + # Triggers the workflow on push or pull request events but only for the master branch + push: + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +jobs: + build: + strategy: + matrix: + os: [ubuntu-latest, macos-latest, windows-latest] + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-java@v2 + with: + distribution: temurin + java-version: 11 + + - name: Setup Gradle + uses: gradle/gradle-build-action@v2 + with: + gradle-version: 7.4.2 + + - uses: nttld/setup-ndk@v1 + with: + ndk-version: r21e + + - name: Execute Gradle Build Release + run: ./gradlew clean build assembleRelease --parallel -x lint + + - name: List APK files + run: ls app/build/outputs/apk/**/*.apk + + - name: Upload + if: github.ref_name == 'release' + uses: actions/upload-artifact@v4 + with: + name: Build Artifacts (${{ matrix.os }}) + path: app/build/outputs/apk/release/ From 6c80fe40163c719f010254234685af97689f53a6 Mon Sep 17 00:00:00 2001 From: Harold Thetiot Date: Sat, 14 Sep 2024 18:06:17 +0200 Subject: [PATCH 09/33] upgrade to SDKVersion 34 and minSDKVersion 30 --- build.gradle | 1 + libuvccamera/build.gradle | 6 +-- libuvccamera/src/main/AndroidManifest.xml | 4 -- .../com/serenegiant/common/BaseActivity.java | 13 ++--- usbCameraCommon/build.gradle | 3 +- usbCameraCommon/src/main/AndroidManifest.xml | 3 +- usbCameraTest/build.gradle | 3 +- usbCameraTest/src/main/AndroidManifest.xml | 3 +- usbCameraTest0/build.gradle | 3 +- usbCameraTest0/src/main/AndroidManifest.xml | 3 +- usbCameraTest2/build.gradle | 3 +- usbCameraTest2/src/main/AndroidManifest.xml | 3 +- usbCameraTest3/build.gradle | 3 +- usbCameraTest3/src/main/AndroidManifest.xml | 3 +- usbCameraTest4/build.gradle | 7 +-- usbCameraTest4/src/main/AndroidManifest.xml | 6 ++- usbCameraTest5/build.gradle | 3 +- usbCameraTest5/src/main/AndroidManifest.xml | 3 +- usbCameraTest6/build.gradle | 3 +- usbCameraTest6/src/main/AndroidManifest.xml | 3 +- usbCameraTest7/build.gradle | 3 +- usbCameraTest7/src/main/AndroidManifest.xml | 3 +- usbCameraTest8/build.gradle | 7 +-- usbCameraTest8/src/main/AndroidManifest.xml | 49 ++++++++++--------- 24 files changed, 69 insertions(+), 72 deletions(-) diff --git a/build.gradle b/build.gradle index aa48c84f0..1951ad1bd 100644 --- a/build.gradle +++ b/build.gradle @@ -26,6 +26,7 @@ ext { commonLibVersion= '2.12.4' versionCompiler = 34 versionTarget = 34 + minTargetVersion = 30 versionNameString = '1.0.0' javaSourceCompatibility = JavaVersion.VERSION_1_8 javaTargetCompatibility = JavaVersion.VERSION_1_8 diff --git a/libuvccamera/build.gradle b/libuvccamera/build.gradle index f02877336..05a7a9ab2 100644 --- a/libuvccamera/build.gradle +++ b/libuvccamera/build.gradle @@ -25,7 +25,7 @@ apply plugin: 'com.android.library' import org.apache.tools.ant.taskdefs.condition.Os android { - compileSdkVersion versionCompiler + compileSdk versionCompiler compileOptions { sourceCompatibility javaSourceCompatibility @@ -33,7 +33,7 @@ android { } defaultConfig { - minSdkVersion minSdkVersion + minSdkVersion minTargetVersion targetSdkVersion versionTarget } @@ -85,7 +85,7 @@ clean.dependsOn 'ndkClean' dependencies { implementation fileTree(dir: new File(buildDir, 'libs'), include: '*.jar') - implementation "com.android.support:support-v4:${supportLibVersion}" + //implementation "com.android.support:support-v4:${supportLibVersion}" implementation "com.android.support:support-annotations:${supportLibVersion}" implementation("com.serenegiant:common:${commonLibVersion}") { diff --git a/libuvccamera/src/main/AndroidManifest.xml b/libuvccamera/src/main/AndroidManifest.xml index c04d5ca4e..730106ed7 100644 --- a/libuvccamera/src/main/AndroidManifest.xml +++ b/libuvccamera/src/main/AndroidManifest.xml @@ -26,8 +26,4 @@ android:versionCode="2" android:versionName="1.1" > - - diff --git a/libuvccamera/src/main/java/com/serenegiant/common/BaseActivity.java b/libuvccamera/src/main/java/com/serenegiant/common/BaseActivity.java index 89262ca26..33257fa06 100644 --- a/libuvccamera/src/main/java/com/serenegiant/common/BaseActivity.java +++ b/libuvccamera/src/main/java/com/serenegiant/common/BaseActivity.java @@ -31,10 +31,11 @@ import android.os.Looper; import android.support.annotation.NonNull; import android.support.annotation.StringRes; -import android.support.v7.app.AppCompatActivity; +import android.app.Activity; import android.util.Log; import android.widget.Toast; +import com.serenegiant.dialog.MessageDialogFragment; import com.serenegiant.dialog.MessageDialogFragmentV4; import com.serenegiant.utils.BuildCheck; import com.serenegiant.utils.HandlerThreadHandler; @@ -44,7 +45,7 @@ * Created by saki on 2016/11/18. * */ -public class BaseActivity extends AppCompatActivity +public class BaseActivity extends Activity implements MessageDialogFragmentV4.MessageDialogListener { private static boolean DEBUG = false; // FIXME 実働時はfalseにセットすること @@ -278,7 +279,7 @@ protected void checkPermissionResult(final int requestCode, final String permiss */ protected boolean checkPermissionWriteExternalStorage() { if (!PermissionCheck.hasWriteExternalStorage(this)) { - MessageDialogFragmentV4.showDialog(this, REQUEST_PERMISSION_WRITE_EXTERNAL_STORAGE, + MessageDialogFragment.showDialog(this, REQUEST_PERMISSION_WRITE_EXTERNAL_STORAGE, R.string.permission_title, R.string.permission_ext_storage_request, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}); return false; @@ -293,7 +294,7 @@ protected boolean checkPermissionWriteExternalStorage() { */ protected boolean checkPermissionAudio() { if (!PermissionCheck.hasAudio(this)) { - MessageDialogFragmentV4.showDialog(this, REQUEST_PERMISSION_AUDIO_RECORDING, + MessageDialogFragment.showDialog(this, REQUEST_PERMISSION_AUDIO_RECORDING, R.string.permission_title, R.string.permission_audio_recording_request, new String[]{Manifest.permission.RECORD_AUDIO}); return false; @@ -308,7 +309,7 @@ protected boolean checkPermissionAudio() { */ protected boolean checkPermissionNetwork() { if (!PermissionCheck.hasNetwork(this)) { - MessageDialogFragmentV4.showDialog(this, REQUEST_PERMISSION_NETWORK, + MessageDialogFragment.showDialog(this, REQUEST_PERMISSION_NETWORK, R.string.permission_title, R.string.permission_network_request, new String[]{Manifest.permission.INTERNET}); return false; @@ -323,7 +324,7 @@ protected boolean checkPermissionNetwork() { */ protected boolean checkPermissionCamera() { if (!PermissionCheck.hasCamera(this)) { - MessageDialogFragmentV4.showDialog(this, REQUEST_PERMISSION_CAMERA, + MessageDialogFragment.showDialog(this, REQUEST_PERMISSION_CAMERA, R.string.permission_title, R.string.permission_camera_request, new String[]{Manifest.permission.CAMERA}); return false; diff --git a/usbCameraCommon/build.gradle b/usbCameraCommon/build.gradle index ff21286fe..243d56c74 100644 --- a/usbCameraCommon/build.gradle +++ b/usbCameraCommon/build.gradle @@ -32,7 +32,7 @@ android { } defaultConfig { - minSdkVersion 18 + minSdkVersion minTargetVersion targetSdkVersion versionTarget } @@ -47,7 +47,6 @@ android { dependencies { api fileTree(dir: 'libs', include: ['*.jar']) - implementation "com.android.support:support-v4:${supportLibVersion}" implementation "com.android.support:support-annotations:${supportLibVersion}" implementation("com.serenegiant:common:${commonLibVersion}") { diff --git a/usbCameraCommon/src/main/AndroidManifest.xml b/usbCameraCommon/src/main/AndroidManifest.xml index 67c59eab7..95180b680 100644 --- a/usbCameraCommon/src/main/AndroidManifest.xml +++ b/usbCameraCommon/src/main/AndroidManifest.xml @@ -21,4 +21,5 @@ ~ may have a different license, see the respective files. --> - + + diff --git a/usbCameraTest/build.gradle b/usbCameraTest/build.gradle index 409d7a529..55d8e8008 100644 --- a/usbCameraTest/build.gradle +++ b/usbCameraTest/build.gradle @@ -33,7 +33,7 @@ android { defaultConfig { applicationId "com.serenegiant.usbcameratest" - minSdkVersion minSdkVersion // 14 + minSdkVersion minTargetVersion targetSdkVersion versionTarget versionCode 8 versionName "3.00" @@ -50,7 +50,6 @@ android { dependencies { api fileTree(dir: 'libs', include: ['*.jar']) - implementation "com.android.support:support-v4:${supportLibVersion}" implementation "com.android.support:support-annotations:${supportLibVersion}" implementation("com.serenegiant:common:${commonLibVersion}") { diff --git a/usbCameraTest/src/main/AndroidManifest.xml b/usbCameraTest/src/main/AndroidManifest.xml index a2abf49a9..dcc18c307 100644 --- a/usbCameraTest/src/main/AndroidManifest.xml +++ b/usbCameraTest/src/main/AndroidManifest.xml @@ -31,7 +31,8 @@ android:theme="@style/AppTheme" > + android:label="@string/app_name" + android:exported="true"> diff --git a/usbCameraTest0/build.gradle b/usbCameraTest0/build.gradle index 7b5ff87f0..ee17236c9 100644 --- a/usbCameraTest0/build.gradle +++ b/usbCameraTest0/build.gradle @@ -33,7 +33,7 @@ android { defaultConfig { applicationId "com.serenegiant.usbcameratest0" - minSdkVersion 14 + minSdkVersion minTargetVersion targetSdkVersion versionTarget versionCode 8 versionName "3.00" @@ -50,7 +50,6 @@ android { dependencies { api fileTree(dir: 'libs', include: ['*.jar']) - implementation "com.android.support:support-v4:${supportLibVersion}" implementation "com.android.support:support-annotations:${supportLibVersion}" implementation("com.serenegiant:common:${commonLibVersion}") { diff --git a/usbCameraTest0/src/main/AndroidManifest.xml b/usbCameraTest0/src/main/AndroidManifest.xml index 015e549fc..ab263c4dc 100644 --- a/usbCameraTest0/src/main/AndroidManifest.xml +++ b/usbCameraTest0/src/main/AndroidManifest.xml @@ -31,7 +31,8 @@ android:theme="@style/AppTheme" > + android:label="@string/app_name" + android:exported="true"> diff --git a/usbCameraTest2/build.gradle b/usbCameraTest2/build.gradle index b88116d15..a75390083 100644 --- a/usbCameraTest2/build.gradle +++ b/usbCameraTest2/build.gradle @@ -33,7 +33,7 @@ android { defaultConfig { applicationId "com.serenegiant.usbcameratest2" - minSdkVersion minSdkVersion // 18 + minSdkVersion minTargetVersion targetSdkVersion versionTarget versionCode 8 versionName "3.00" @@ -50,7 +50,6 @@ android { dependencies { api fileTree(dir: 'libs', include: ['*.jar']) - implementation "com.android.support:support-v4:${supportLibVersion}" implementation "com.android.support:support-annotations:${supportLibVersion}" implementation("com.serenegiant:common:${commonLibVersion}") { diff --git a/usbCameraTest2/src/main/AndroidManifest.xml b/usbCameraTest2/src/main/AndroidManifest.xml index 34e65a862..13d8b9bab 100644 --- a/usbCameraTest2/src/main/AndroidManifest.xml +++ b/usbCameraTest2/src/main/AndroidManifest.xml @@ -33,7 +33,8 @@ android:theme="@style/AppTheme" > + android:label="@string/app_name" + android:exported="true"> diff --git a/usbCameraTest3/build.gradle b/usbCameraTest3/build.gradle index 494533701..34f1e9ad0 100644 --- a/usbCameraTest3/build.gradle +++ b/usbCameraTest3/build.gradle @@ -33,7 +33,7 @@ android { defaultConfig { applicationId "com.serenegiant.usbcameratest3" - minSdkVersion minSdkVersion // 18 + minSdkVersion minTargetVersion targetSdkVersion versionTarget versionCode 8 versionName "3.00" @@ -50,7 +50,6 @@ android { dependencies { api fileTree(dir: 'libs', include: ['*.jar']) - implementation "com.android.support:support-v4:${supportLibVersion}" implementation "com.android.support:support-annotations:${supportLibVersion}" implementation("com.serenegiant:common:${commonLibVersion}") { diff --git a/usbCameraTest3/src/main/AndroidManifest.xml b/usbCameraTest3/src/main/AndroidManifest.xml index 7b60fda08..c93c69464 100644 --- a/usbCameraTest3/src/main/AndroidManifest.xml +++ b/usbCameraTest3/src/main/AndroidManifest.xml @@ -37,7 +37,8 @@ + android:label="@string/app_name" + android:exported="true"> diff --git a/usbCameraTest4/build.gradle b/usbCameraTest4/build.gradle index 4fd3d6757..aedb6d838 100644 --- a/usbCameraTest4/build.gradle +++ b/usbCameraTest4/build.gradle @@ -33,7 +33,7 @@ android { defaultConfig { applicationId "com.serenegiant.usbcameratest4" - minSdkVersion minSdkVersion // 18 + minSdkVersion minTargetVersion targetSdkVersion versionTarget versionCode 9 versionName "3.00" @@ -50,12 +50,9 @@ android { dependencies { api fileTree(dir: 'libs', include: ['*.jar']) - implementation "com.android.support:support-v4:${supportLibVersion}" implementation "com.android.support:support-annotations:${supportLibVersion}" - implementation("com.serenegiant:common:${commonLibVersion}") { - exclude module: 'support-v4' - } + implementation("com.serenegiant:common:${commonLibVersion}") implementation project(':libuvccamera') implementation project(':usbCameraCommon') } diff --git a/usbCameraTest4/src/main/AndroidManifest.xml b/usbCameraTest4/src/main/AndroidManifest.xml index 9fc8b5aa3..76ba38790 100644 --- a/usbCameraTest4/src/main/AndroidManifest.xml +++ b/usbCameraTest4/src/main/AndroidManifest.xml @@ -39,7 +39,8 @@ + android:launchMode="singleTask" + android:exported="true"> @@ -57,7 +58,8 @@ + android:process=":uvcservice" + android:exported="true"> diff --git a/usbCameraTest5/build.gradle b/usbCameraTest5/build.gradle index e1f257bba..fc51fef58 100644 --- a/usbCameraTest5/build.gradle +++ b/usbCameraTest5/build.gradle @@ -33,7 +33,7 @@ android { defaultConfig { applicationId "com.serenegiant.usbcameratest5" - minSdkVersion minSdkVersion // 18 + minSdkVersion minTargetVersion targetSdkVersion versionTarget versionCode 8 versionName "3.00" @@ -50,7 +50,6 @@ android { dependencies { api fileTree(dir: 'libs', include: ['*.jar']) - implementation "com.android.support:support-v4:${supportLibVersion}" implementation "com.android.support:support-annotations:${supportLibVersion}" implementation("com.serenegiant:common:${commonLibVersion}") { diff --git a/usbCameraTest5/src/main/AndroidManifest.xml b/usbCameraTest5/src/main/AndroidManifest.xml index 9d8ca8dc9..60087082f 100644 --- a/usbCameraTest5/src/main/AndroidManifest.xml +++ b/usbCameraTest5/src/main/AndroidManifest.xml @@ -36,7 +36,8 @@ android:theme="@style/AppTheme" > + android:label="@string/app_name" + android:exported="true"> diff --git a/usbCameraTest6/build.gradle b/usbCameraTest6/build.gradle index 792e906d9..630bfaeb2 100644 --- a/usbCameraTest6/build.gradle +++ b/usbCameraTest6/build.gradle @@ -33,7 +33,7 @@ android { defaultConfig { applicationId "com.serenegiant.usbcameratest6" - minSdkVersion minSdkVersion // 18 + minSdkVersion minTargetVersion targetSdkVersion versionTarget versionCode 8 versionName "3.00" @@ -50,7 +50,6 @@ android { dependencies { api fileTree(dir: 'libs', include: ['*.jar']) - implementation "com.android.support:support-v4:${supportLibVersion}" implementation "com.android.support:support-annotations:${supportLibVersion}" implementation("com.serenegiant:common:${commonLibVersion}") { diff --git a/usbCameraTest6/src/main/AndroidManifest.xml b/usbCameraTest6/src/main/AndroidManifest.xml index 7bdc7d8aa..d6ee4b1da 100644 --- a/usbCameraTest6/src/main/AndroidManifest.xml +++ b/usbCameraTest6/src/main/AndroidManifest.xml @@ -37,7 +37,8 @@ + android:screenOrientation="sensorLandscape" + android:exported="true"> diff --git a/usbCameraTest7/build.gradle b/usbCameraTest7/build.gradle index e6c16ff7b..acde75357 100644 --- a/usbCameraTest7/build.gradle +++ b/usbCameraTest7/build.gradle @@ -33,7 +33,7 @@ android { defaultConfig { applicationId "com.serenegiant.usbcameratest7" - minSdkVersion minSdkVersion // 18 + minSdkVersion minTargetVersion targetSdkVersion versionTarget versionCode 9 versionName "3.00" @@ -52,7 +52,6 @@ android { dependencies { api fileTree(dir: 'libs', include: ['*.jar']) - implementation "com.android.support:support-v4:${supportLibVersion}" implementation "com.android.support:support-annotations:${supportLibVersion}" implementation("com.serenegiant:common:${commonLibVersion}") { diff --git a/usbCameraTest7/src/main/AndroidManifest.xml b/usbCameraTest7/src/main/AndroidManifest.xml index 4047ece96..71cf5600d 100644 --- a/usbCameraTest7/src/main/AndroidManifest.xml +++ b/usbCameraTest7/src/main/AndroidManifest.xml @@ -37,7 +37,8 @@ + android:screenOrientation="sensorLandscape" + android:exported="true"> diff --git a/usbCameraTest8/build.gradle b/usbCameraTest8/build.gradle index 32b7c2d0a..b2bdedcdf 100644 --- a/usbCameraTest8/build.gradle +++ b/usbCameraTest8/build.gradle @@ -33,7 +33,7 @@ android { defaultConfig { applicationId "com.serenegiant.usbcameratest8" - minSdkVersion minSdkVersion // 18 + minSdkVersion minTargetVersion targetSdkVersion versionTarget versionCode 1 versionName "1.0" @@ -52,7 +52,6 @@ android { dependencies { api fileTree(dir: 'libs', include: ['*.jar']) - implementation "com.android.support:support-v4:${supportLibVersion}" implementation "com.android.support:support-annotations:${supportLibVersion}" androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { @@ -60,9 +59,7 @@ dependencies { }) testImplementation 'junit:junit:4.12' - implementation("com.serenegiant:common:${commonLibVersion}") { - exclude module: 'support-v4' - } + implementation("com.serenegiant:common:${commonLibVersion}") implementation project(':libuvccamera') implementation project(':usbCameraCommon') } diff --git a/usbCameraTest8/src/main/AndroidManifest.xml b/usbCameraTest8/src/main/AndroidManifest.xml index 99bca5aa2..62aef2222 100644 --- a/usbCameraTest8/src/main/AndroidManifest.xml +++ b/usbCameraTest8/src/main/AndroidManifest.xml @@ -1,28 +1,29 @@ + ~ UVCCamera + ~ library and sample to access to UVC web camera on non-rooted Android device + ~ + ~ Copyright (c) 2014-2017 saki t_saki@serenegiant.com + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + ~ + ~ All files in the folder are under this Apache License, Version 2.0. + ~ Files in the libjpeg-turbo, libusb, libuvc, rapidjson folder + ~ may have a different license, see the respective files. + --> + xmlns:tools="http://schemas.android.com/tools" + package="com.serenegiant.usbcameratest8"> @@ -38,7 +39,9 @@ + android:label="@string/app_name" + android:exported="true" + tools:ignore="DiscouragedApi"> From 0a14e528ee28f98d952fe9724f193532c88b46f4 Mon Sep 17 00:00:00 2001 From: Harold Thetiot Date: Sat, 14 Sep 2024 18:07:25 +0200 Subject: [PATCH 10/33] ignore MissingPermission on AudioRecord cause requested by app --- .../java/com/serenegiant/encoder/MediaAudioEncoder.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usbCameraCommon/src/main/java/com/serenegiant/encoder/MediaAudioEncoder.java b/usbCameraCommon/src/main/java/com/serenegiant/encoder/MediaAudioEncoder.java index a6a9010f6..c52022ecf 100644 --- a/usbCameraCommon/src/main/java/com/serenegiant/encoder/MediaAudioEncoder.java +++ b/usbCameraCommon/src/main/java/com/serenegiant/encoder/MediaAudioEncoder.java @@ -27,6 +27,7 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; +import android.annotation.SuppressLint; import android.media.AudioFormat; import android.media.AudioRecord; import android.media.MediaCodec; @@ -112,9 +113,10 @@ protected void release() { * Thread to capture audio data from internal mic as uncompressed 16bit PCM data * and write them to the MediaCodec encoder */ - private class AudioThread extends Thread { + private class AudioThread extends Thread { @Override - public void run() { + @SuppressLint("MissingPermission") + public void run() { android.os.Process.setThreadPriority(android.os.Process.THREAD_PRIORITY_AUDIO); // THREAD_PRIORITY_URGENT_AUDIO int cnt = 0; final int min_buffer_size = AudioRecord.getMinBufferSize( From 4560fdaea2d7f751dfe7b070d1055837f1169b35 Mon Sep 17 00:00:00 2001 From: Harold Thetiot Date: Sat, 14 Sep 2024 18:08:41 +0200 Subject: [PATCH 11/33] fix usbCameraCommon loadShutterSound --- .../encoder/MediaAudioEncoder.java | 130 +++++++++--------- .../AbstractUVCCameraHandler.java | 66 +++++---- 2 files changed, 104 insertions(+), 92 deletions(-) diff --git a/usbCameraCommon/src/main/java/com/serenegiant/encoder/MediaAudioEncoder.java b/usbCameraCommon/src/main/java/com/serenegiant/encoder/MediaAudioEncoder.java index c52022ecf..ba6d07fba 100644 --- a/usbCameraCommon/src/main/java/com/serenegiant/encoder/MediaAudioEncoder.java +++ b/usbCameraCommon/src/main/java/com/serenegiant/encoder/MediaAudioEncoder.java @@ -38,16 +38,16 @@ import android.util.Log; public class MediaAudioEncoder extends MediaEncoder implements IAudioEncoder { - private static final boolean DEBUG = true; // TODO set false on release + private static final boolean DEBUG = true; // TODO set false on release private static final String TAG = "MediaAudioEncoder"; private static final String MIME_TYPE = "audio/mp4a-latm"; - private static final int SAMPLE_RATE = 44100; // 44.1[KHz] is only setting guaranteed to be available on all devices. - private static final int BIT_RATE = 64000; - public static final int SAMPLES_PER_FRAME = 1024; // AAC, bytes/frame/channel - public static final int FRAMES_PER_BUFFER = 25; // AAC, frame/buffer/sec + private static final int SAMPLE_RATE = 44100; // 44.1[KHz] is only setting guaranteed to be available on all devices. + private static final int BIT_RATE = 64000; + public static final int SAMPLES_PER_FRAME = 1024; // AAC, bytes/frame/channel + public static final int FRAMES_PER_BUFFER = 25; // AAC, frame/buffer/sec - private AudioThread mAudioThread = null; + private AudioThread mAudioThread = null; public MediaAudioEncoder(final MediaMuxerWrapper muxer, final MediaEncoderListener listener) { super(muxer, listener); @@ -56,52 +56,52 @@ public MediaAudioEncoder(final MediaMuxerWrapper muxer, final MediaEncoderListen @Override protected void prepare() throws IOException { if (DEBUG) Log.v(TAG, "prepare:"); - mTrackIndex = -1; - mMuxerStarted = mIsEOS = false; - // prepare MediaCodec for AAC encoding of audio data from inernal mic. - final MediaCodecInfo audioCodecInfo = selectAudioCodec(MIME_TYPE); - if (audioCodecInfo == null) { - Log.e(TAG, "Unable to find an appropriate codec for " + MIME_TYPE); - return; - } + mTrackIndex = -1; + mMuxerStarted = mIsEOS = false; + // prepare MediaCodec for AAC encoding of audio data from inernal mic. + final MediaCodecInfo audioCodecInfo = selectAudioCodec(MIME_TYPE); + if (audioCodecInfo == null) { + Log.e(TAG, "Unable to find an appropriate codec for " + MIME_TYPE); + return; + } if (DEBUG) Log.i(TAG, "selected codec: " + audioCodecInfo.getName()); - final MediaFormat audioFormat = MediaFormat.createAudioFormat(MIME_TYPE, SAMPLE_RATE, 1); + final MediaFormat audioFormat = MediaFormat.createAudioFormat(MIME_TYPE, SAMPLE_RATE, 1); audioFormat.setInteger(MediaFormat.KEY_AAC_PROFILE, MediaCodecInfo.CodecProfileLevel.AACObjectLC); audioFormat.setInteger(MediaFormat.KEY_CHANNEL_MASK, AudioFormat.CHANNEL_IN_MONO); audioFormat.setInteger(MediaFormat.KEY_BIT_RATE, BIT_RATE); audioFormat.setInteger(MediaFormat.KEY_CHANNEL_COUNT, 1); -// audioFormat.setLong(MediaFormat.KEY_MAX_INPUT_SIZE, inputFile.length()); +// audioFormat.setLong(MediaFormat.KEY_MAX_INPUT_SIZE, inputFile.length()); // audioFormat.setLong(MediaFormat.KEY_DURATION, (long)durationInMs ); if (DEBUG) Log.i(TAG, "format: " + audioFormat); - mMediaCodec = MediaCodec.createEncoderByType(MIME_TYPE); - mMediaCodec.configure(audioFormat, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE); - mMediaCodec.start(); - if (DEBUG) Log.i(TAG, "prepare finishing"); - if (mListener != null) { - try { - mListener.onPrepared(this); - } catch (final Exception e) { - Log.e(TAG, "prepare:", e); - } - } + mMediaCodec = MediaCodec.createEncoderByType(MIME_TYPE); + mMediaCodec.configure(audioFormat, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE); + mMediaCodec.start(); + if (DEBUG) Log.i(TAG, "prepare finishing"); + if (mListener != null) { + try { + mListener.onPrepared(this); + } catch (final Exception e) { + Log.e(TAG, "prepare:", e); + } + } } - @Override + @Override protected void startRecording() { super.startRecording(); // create and execute audio capturing thread using internal mic if (mAudioThread == null) { - mAudioThread = new AudioThread(); + mAudioThread = new AudioThread(); mAudioThread.start(); } } @Override - protected void release() { + protected void release() { mAudioThread = null; super.release(); - } + } private static final int[] AUDIO_SOURCES = new int[] { MediaRecorder.AudioSource.DEFAULT, @@ -114,7 +114,7 @@ protected void release() { * and write them to the MediaCodec encoder */ private class AudioThread extends Thread { - @Override + @Override @SuppressLint("MissingPermission") public void run() { android.os.Process.setThreadPriority(android.os.Process.THREAD_PRIORITY_AUDIO); // THREAD_PRIORITY_URGENT_AUDIO @@ -134,7 +134,7 @@ public void run() { if (audioRecord.getState() != AudioRecord.STATE_INITIALIZED) { audioRecord.release(); audioRecord = null; - } + } } } catch (final Exception e) { audioRecord = null; @@ -199,37 +199,37 @@ public void run() { } } if (DEBUG) Log.v(TAG, "AudioThread:finished"); - } - } - - /** - * select the first codec that match a specific MIME type - * @param mimeType - * @return - */ - private static final MediaCodecInfo selectAudioCodec(final String mimeType) { - if (DEBUG) Log.v(TAG, "selectAudioCodec:"); - - MediaCodecInfo result = null; - // get the list of available codecs - final int numCodecs = MediaCodecList.getCodecCount(); -LOOP: for (int i = 0; i < numCodecs; i++) { - final MediaCodecInfo codecInfo = MediaCodecList.getCodecInfoAt(i); - if (!codecInfo.isEncoder()) { // skipp decoder - continue; - } - final String[] types = codecInfo.getSupportedTypes(); - for (int j = 0; j < types.length; j++) { - if (DEBUG) Log.i(TAG, "supportedType:" + codecInfo.getName() + ",MIME=" + types[j]); - if (types[j].equalsIgnoreCase(mimeType)) { - if (result == null) { - result = codecInfo; - break LOOP; - } - } - } - } - return result; - } + } + } + + /** + * select the first codec that match a specific MIME type + * @param mimeType + * @return + */ + private static final MediaCodecInfo selectAudioCodec(final String mimeType) { + if (DEBUG) Log.v(TAG, "selectAudioCodec:"); + + MediaCodecInfo result = null; + // get the list of available codecs + final int numCodecs = MediaCodecList.getCodecCount(); +LOOP: for (int i = 0; i < numCodecs; i++) { + final MediaCodecInfo codecInfo = MediaCodecList.getCodecInfoAt(i); + if (!codecInfo.isEncoder()) { // skipp decoder + continue; + } + final String[] types = codecInfo.getSupportedTypes(); + for (int j = 0; j < types.length; j++) { + if (DEBUG) Log.i(TAG, "supportedType:" + codecInfo.getName() + ",MIME=" + types[j]); + if (types[j].equalsIgnoreCase(mimeType)) { + if (result == null) { + result = codecInfo; + break LOOP; + } + } + } + } + return result; + } } diff --git a/usbCameraCommon/src/main/java/com/serenegiant/usbcameracommon/AbstractUVCCameraHandler.java b/usbCameraCommon/src/main/java/com/serenegiant/usbcameracommon/AbstractUVCCameraHandler.java index b368a1cfc..22ba3da78 100644 --- a/usbCameraCommon/src/main/java/com/serenegiant/usbcameracommon/AbstractUVCCameraHandler.java +++ b/usbCameraCommon/src/main/java/com/serenegiant/usbcameracommon/AbstractUVCCameraHandler.java @@ -23,6 +23,7 @@ package com.serenegiant.usbcameracommon; +import android.annotation.SuppressLint; import android.app.Activity; import android.content.Context; import android.graphics.Bitmap; @@ -31,6 +32,7 @@ import android.media.AudioManager; import android.media.MediaScannerConnection; import android.media.SoundPool; +import android.os.Build; import android.os.Environment; import android.os.Handler; import android.os.Looper; @@ -65,7 +67,7 @@ import java.util.concurrent.CopyOnWriteArraySet; abstract class AbstractUVCCameraHandler extends Handler { - private static final boolean DEBUG = true; // TODO set false on release + private static final boolean DEBUG = true; // TODO set false on release private static final String TAG = "AbsUVCCameraHandler"; public interface CameraCallback { @@ -515,7 +517,7 @@ public void handleCaptureStill(final String path) { if (DEBUG) Log.v(TAG_THREAD, "handleCaptureStill:"); final Activity parent = mWeakParent.get(); if (parent == null) return; - mSoundPool.play(mSoundId, 0.2f, 0.2f, 0, 0, 1.0f); // play shutter sound + mSoundPool.play(mSoundId, 0.2f, 0.2f, 0, 0, 1.0f); // play shutter sound try { final Bitmap bitmap = mWeakCameraView.get().captureStillImage(); // get buffered output stream for saving a captured still image as a file on external storage. @@ -544,16 +546,16 @@ public void handleStartRecording() { if (DEBUG) Log.v(TAG_THREAD, "handleStartRecording:"); try { if ((mUVCCamera == null) || (mMuxer != null)) return; - final MediaMuxerWrapper muxer = new MediaMuxerWrapper(".mp4"); // if you record audio only, ".m4a" is also OK. + final MediaMuxerWrapper muxer = new MediaMuxerWrapper(".mp4"); // if you record audio only, ".m4a" is also OK. MediaVideoBufferEncoder videoEncoder = null; switch (mEncoderType) { - case 1: // for video capturing using MediaVideoEncoder + case 1: // for video capturing using MediaVideoEncoder new MediaVideoEncoder(muxer, getWidth(), getHeight(), mMediaEncoderListener); break; - case 2: // for video capturing using MediaVideoBufferEncoder + case 2: // for video capturing using MediaVideoBufferEncoder videoEncoder = new MediaVideoBufferEncoder(muxer, getWidth(), getHeight(), mMediaEncoderListener); break; - // case 0: // for video capturing using MediaSurfaceEncoder + // case 0: // for video capturing using MediaSurfaceEncoder default: new MediaSurfaceEncoder(muxer, getWidth(), getHeight(), mMediaEncoderListener); break; @@ -700,27 +702,37 @@ public void onStopped(final MediaEncoder encoder) { /** * prepare and load shutter sound for still image capturing */ - @SuppressWarnings("deprecation") - private void loadShutterSound(final Context context) { - // get system stream type using reflection - int streamType; - try { - final Class audioSystemClass = Class.forName("android.media.AudioSystem"); - final Field sseField = audioSystemClass.getDeclaredField("STREAM_SYSTEM_ENFORCED"); - streamType = sseField.getInt(null); - } catch (final Exception e) { - streamType = AudioManager.STREAM_SYSTEM; // set appropriate according to your app policy - } - if (mSoundPool != null) { - try { - mSoundPool.release(); - } catch (final Exception e) { - } - mSoundPool = null; - } - // load shutter sound from resource - mSoundPool = new SoundPool(2, streamType, 0); - mSoundId = mSoundPool.load(context, R.raw.camera_click, 1); + @SuppressLint("SoonBlockedPrivateApi") + protected void loadShutterSound(final Context context) { + // Define a default stream type + int streamType = AudioManager.STREAM_SYSTEM; + + // Conditionally handle reflection based on the Android version + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S_V2) { // API 32 is Android 12L + try { + // Use reflection only for older versions + final Class audioSystemClass = Class.forName("android.media.AudioSystem"); + final Field sseField = audioSystemClass.getDeclaredField("STREAM_SYSTEM_ENFORCED"); + streamType = sseField.getInt(null); + } catch (final Exception e) { + // If reflection fails, fall back to STREAM_SYSTEM + streamType = AudioManager.STREAM_SYSTEM; + } + } + + // Clean up existing SoundPool instance if necessary + if (mSoundPool != null) { + try { + mSoundPool.release(); + } catch (final Exception e) { + // Handle the exception (optional) + } + mSoundPool = null; + } + + // Initialize the SoundPool and load the shutter sound + mSoundPool = new SoundPool(2, streamType, 0); + mSoundId = mSoundPool.load(context, R.raw.camera_click, 1); } @Override From 0cf9b92ccc96e767cf98741c2d3d6c7d0cf695b6 Mon Sep 17 00:00:00 2001 From: Harold Thetiot Date: Sat, 14 Sep 2024 18:09:02 +0200 Subject: [PATCH 12/33] fix loadShutterSound CameraServer --- .../com/serenegiant/service/CameraServer.java | 59 +++++++++++-------- 1 file changed, 36 insertions(+), 23 deletions(-) diff --git a/usbCameraTest4/src/main/java/com/serenegiant/service/CameraServer.java b/usbCameraTest4/src/main/java/com/serenegiant/service/CameraServer.java index 21f6a3c5b..92109883a 100644 --- a/usbCameraTest4/src/main/java/com/serenegiant/service/CameraServer.java +++ b/usbCameraTest4/src/main/java/com/serenegiant/service/CameraServer.java @@ -27,10 +27,12 @@ import java.lang.ref.WeakReference; import java.lang.reflect.Field; +import android.annotation.SuppressLint; import android.content.Context; import android.media.AudioManager; import android.media.MediaScannerConnection; import android.media.SoundPool; +import android.os.Build; import android.os.Handler; import android.os.IBinder; import android.os.Looper; @@ -594,32 +596,43 @@ public void onStopped(final MediaEncoder encoder) { } }; + + /** * prepare and load shutter sound for still image capturing */ - @SuppressWarnings("deprecation") - private void loadShutterSound(final Context context) { - if (DEBUG) Log.d(TAG_THREAD, "loadShutterSound:"); - // get system stream type using refrection - int streamType; - try { - final Class audioSystemClass = Class.forName("android.media.AudioSystem"); - final Field sseField = audioSystemClass.getDeclaredField("STREAM_SYSTEM_ENFORCED"); - streamType = sseField.getInt(null); - } catch (final Exception e) { - streamType = AudioManager.STREAM_SYSTEM; // set appropriate according to your app policy - } - if (mSoundPool != null) { - try { - mSoundPool.release(); - } catch (final Exception e) { - } - mSoundPool = null; - } - // load sutter sound from resource - mSoundPool = new SoundPool(2, streamType, 0); - mSoundId = mSoundPool.load(context, R.raw.camera_click, 1); - } + @SuppressLint("SoonBlockedPrivateApi") + protected void loadShutterSound(final Context context) { + // Define a default stream type + int streamType = AudioManager.STREAM_SYSTEM; + + // Conditionally handle reflection based on the Android version + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S_V2) { // API 32 is Android 12L + try { + // Use reflection only for older versions + final Class audioSystemClass = Class.forName("android.media.AudioSystem"); + final Field sseField = audioSystemClass.getDeclaredField("STREAM_SYSTEM_ENFORCED"); + streamType = sseField.getInt(null); + } catch (final Exception e) { + // If reflection fails, fall back to STREAM_SYSTEM + streamType = AudioManager.STREAM_SYSTEM; + } + } + + // Clean up existing SoundPool instance if necessary + if (mSoundPool != null) { + try { + mSoundPool.release(); + } catch (final Exception e) { + // Handle the exception (optional) + } + mSoundPool = null; + } + + // Initialize the SoundPool and load the shutter sound + mSoundPool = new SoundPool(2, streamType, 0); + mSoundId = mSoundPool.load(context, R.raw.camera_click, 1); + } @Override public void run() { From 9edf8bc4c5b2691c00bf2e2e20de98e0805334ac Mon Sep 17 00:00:00 2001 From: Harold Thetiot Date: Sat, 14 Sep 2024 18:09:15 +0200 Subject: [PATCH 13/33] fix missing res/values/dimens.xml entry --- usbCameraTest/src/main/res/values/dimens.xml | 1 + usbCameraTest0/src/main/res/values/dimens.xml | 1 + usbCameraTest2/src/main/res/values/dimens.xml | 1 + usbCameraTest3/src/main/res/values/dimens.xml | 1 + usbCameraTest5/src/main/res/values/dimens.xml | 1 + usbCameraTest6/src/main/res/values/dimens.xml | 1 + usbCameraTest7/src/main/res/values/dimens.xml | 1 + usbCameraTest8/src/main/res/values/dimens.xml | 1 + 8 files changed, 8 insertions(+) diff --git a/usbCameraTest/src/main/res/values/dimens.xml b/usbCameraTest/src/main/res/values/dimens.xml index 9c8e51ac3..68161865d 100644 --- a/usbCameraTest/src/main/res/values/dimens.xml +++ b/usbCameraTest/src/main/res/values/dimens.xml @@ -23,6 +23,7 @@ --> + 24sp 16dp 16dp 48dp diff --git a/usbCameraTest0/src/main/res/values/dimens.xml b/usbCameraTest0/src/main/res/values/dimens.xml index 9c8e51ac3..68161865d 100644 --- a/usbCameraTest0/src/main/res/values/dimens.xml +++ b/usbCameraTest0/src/main/res/values/dimens.xml @@ -23,6 +23,7 @@ --> + 24sp 16dp 16dp 48dp diff --git a/usbCameraTest2/src/main/res/values/dimens.xml b/usbCameraTest2/src/main/res/values/dimens.xml index 790540d2d..522af662f 100644 --- a/usbCameraTest2/src/main/res/values/dimens.xml +++ b/usbCameraTest2/src/main/res/values/dimens.xml @@ -24,6 +24,7 @@ + 24sp 16dp 16dp 48dp diff --git a/usbCameraTest3/src/main/res/values/dimens.xml b/usbCameraTest3/src/main/res/values/dimens.xml index 790540d2d..522af662f 100644 --- a/usbCameraTest3/src/main/res/values/dimens.xml +++ b/usbCameraTest3/src/main/res/values/dimens.xml @@ -24,6 +24,7 @@ + 24sp 16dp 16dp 48dp diff --git a/usbCameraTest5/src/main/res/values/dimens.xml b/usbCameraTest5/src/main/res/values/dimens.xml index 790540d2d..522af662f 100644 --- a/usbCameraTest5/src/main/res/values/dimens.xml +++ b/usbCameraTest5/src/main/res/values/dimens.xml @@ -24,6 +24,7 @@ + 24sp 16dp 16dp 48dp diff --git a/usbCameraTest6/src/main/res/values/dimens.xml b/usbCameraTest6/src/main/res/values/dimens.xml index 790540d2d..522af662f 100644 --- a/usbCameraTest6/src/main/res/values/dimens.xml +++ b/usbCameraTest6/src/main/res/values/dimens.xml @@ -24,6 +24,7 @@ + 24sp 16dp 16dp 48dp diff --git a/usbCameraTest7/src/main/res/values/dimens.xml b/usbCameraTest7/src/main/res/values/dimens.xml index 790540d2d..522af662f 100644 --- a/usbCameraTest7/src/main/res/values/dimens.xml +++ b/usbCameraTest7/src/main/res/values/dimens.xml @@ -24,6 +24,7 @@ + 24sp 16dp 16dp 48dp diff --git a/usbCameraTest8/src/main/res/values/dimens.xml b/usbCameraTest8/src/main/res/values/dimens.xml index f353c0d9d..e0619e297 100644 --- a/usbCameraTest8/src/main/res/values/dimens.xml +++ b/usbCameraTest8/src/main/res/values/dimens.xml @@ -23,6 +23,7 @@ + 24sp 16dp 16dp From 56a3ddea0ecbdaf1174a211d25f9eae36385b3c7 Mon Sep 17 00:00:00 2001 From: Harold Thetiot Date: Sat, 14 Sep 2024 18:09:58 +0200 Subject: [PATCH 14/33] update .idea --- .../UVCCamera.libuvccamera.androidTest.iml | 5 ++- .../UVCCamera.usbCameraCommon.iml | 32 +++++++++++++++++++ .../UVCCamera.usbCameraTest.androidTest.iml | 4 ++- .../usbCameraTest/UVCCamera.usbCameraTest.iml | 31 ++++++++++++++++++ .../UVCCamera.usbCameraTest.main.iml | 4 ++- .../UVCCamera.usbCameraTest0.androidTest.iml | 8 +++-- .../UVCCamera.usbCameraTest0.iml | 31 ++++++++++++++++++ .../UVCCamera.usbCameraTest0.main.iml | 4 ++- .../UVCCamera.usbCameraTest2.androidTest.iml | 4 ++- .../UVCCamera.usbCameraTest2.iml | 31 ++++++++++++++++++ .../UVCCamera.usbCameraTest2.main.iml | 4 ++- .../UVCCamera.usbCameraTest3.androidTest.iml | 8 +++-- .../UVCCamera.usbCameraTest3.iml | 31 ++++++++++++++++++ .../UVCCamera.usbCameraTest3.main.iml | 4 ++- .../UVCCamera.usbCameraTest4.androidTest.iml | 4 ++- .../UVCCamera.usbCameraTest4.iml | 31 ++++++++++++++++++ .../UVCCamera.usbCameraTest4.main.iml | 4 ++- .../UVCCamera.usbCameraTest5.androidTest.iml | 8 +++-- .../UVCCamera.usbCameraTest5.main.iml | 4 ++- .../UVCCamera.usbCameraTest6.androidTest.iml | 8 +++-- .../UVCCamera.usbCameraTest6.iml | 31 ++++++++++++++++++ .../UVCCamera.usbCameraTest6.main.iml | 4 ++- .../UVCCamera.usbCameraTest7.androidTest.iml | 8 +++-- .../UVCCamera.usbCameraTest7.iml | 31 ++++++++++++++++++ .../UVCCamera.usbCameraTest7.main.iml | 4 ++- .../UVCCamera.usbCameraTest8.androidTest.iml | 8 +++-- .../UVCCamera.usbCameraTest8.iml | 31 ++++++++++++++++++ .../UVCCamera.usbCameraTest8.main.iml | 4 ++- .idea/runConfigurations.xml | 12 ------- 29 files changed, 356 insertions(+), 37 deletions(-) create mode 100644 .idea/modules/usbCameraCommon/UVCCamera.usbCameraCommon.iml create mode 100644 .idea/modules/usbCameraTest/UVCCamera.usbCameraTest.iml create mode 100644 .idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.iml create mode 100644 .idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.iml create mode 100644 .idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.iml create mode 100644 .idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.iml create mode 100644 .idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.iml create mode 100644 .idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.iml create mode 100644 .idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.iml delete mode 100644 .idea/runConfigurations.xml diff --git a/.idea/modules/libuvccamera/UVCCamera.libuvccamera.androidTest.iml b/.idea/modules/libuvccamera/UVCCamera.libuvccamera.androidTest.iml index b81fd7bc6..262a49ee2 100644 --- a/.idea/modules/libuvccamera/UVCCamera.libuvccamera.androidTest.iml +++ b/.idea/modules/libuvccamera/UVCCamera.libuvccamera.androidTest.iml @@ -18,7 +18,9 @@ - + + + @@ -26,6 +28,7 @@ + diff --git a/.idea/modules/usbCameraCommon/UVCCamera.usbCameraCommon.iml b/.idea/modules/usbCameraCommon/UVCCamera.usbCameraCommon.iml new file mode 100644 index 000000000..de20051a0 --- /dev/null +++ b/.idea/modules/usbCameraCommon/UVCCamera.usbCameraCommon.iml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.androidTest.iml b/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.androidTest.iml index c220006d7..c9ad257b3 100644 --- a/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.androidTest.iml +++ b/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.androidTest.iml @@ -23,7 +23,9 @@ - + + + diff --git a/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.iml b/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.iml new file mode 100644 index 000000000..90903e744 --- /dev/null +++ b/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.iml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.main.iml b/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.main.iml index 5b4ab5589..f55222b9f 100644 --- a/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.main.iml +++ b/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.main.iml @@ -17,7 +17,9 @@ - + + + diff --git a/.idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.androidTest.iml b/.idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.androidTest.iml index 22557b12a..f4e6b9f9c 100644 --- a/.idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.androidTest.iml +++ b/.idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.androidTest.iml @@ -17,13 +17,17 @@ - + + + - + + + diff --git a/.idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.iml b/.idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.iml new file mode 100644 index 000000000..ba4b21234 --- /dev/null +++ b/.idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.iml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.main.iml b/.idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.main.iml index ef398a673..98c2fe8b0 100644 --- a/.idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.main.iml +++ b/.idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.main.iml @@ -17,7 +17,9 @@ - + + + diff --git a/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.androidTest.iml b/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.androidTest.iml index 509ce7cb0..927e57197 100644 --- a/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.androidTest.iml +++ b/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.androidTest.iml @@ -23,7 +23,9 @@ - + + + diff --git a/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.iml b/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.iml new file mode 100644 index 000000000..18036a540 --- /dev/null +++ b/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.iml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.main.iml b/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.main.iml index 25bdcbc00..9d6807602 100644 --- a/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.main.iml +++ b/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.main.iml @@ -17,7 +17,9 @@ - + + + diff --git a/.idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.androidTest.iml b/.idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.androidTest.iml index a258ffb5b..35686c4c7 100644 --- a/.idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.androidTest.iml +++ b/.idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.androidTest.iml @@ -17,13 +17,17 @@ - + + + - + + + diff --git a/.idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.iml b/.idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.iml new file mode 100644 index 000000000..f70d0dea3 --- /dev/null +++ b/.idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.iml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.main.iml b/.idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.main.iml index d432c1275..66fda7f9c 100644 --- a/.idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.main.iml +++ b/.idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.main.iml @@ -17,7 +17,9 @@ - + + + diff --git a/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.androidTest.iml b/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.androidTest.iml index c7198e9ff..80bb0e064 100644 --- a/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.androidTest.iml +++ b/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.androidTest.iml @@ -23,7 +23,9 @@ - + + + diff --git a/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.iml b/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.iml new file mode 100644 index 000000000..7fa482911 --- /dev/null +++ b/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.iml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.main.iml b/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.main.iml index 8bcd93874..797ff829b 100644 --- a/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.main.iml +++ b/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.main.iml @@ -19,7 +19,9 @@ - + + + diff --git a/.idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.androidTest.iml b/.idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.androidTest.iml index bab6c8416..d95ba8268 100644 --- a/.idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.androidTest.iml +++ b/.idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.androidTest.iml @@ -17,13 +17,17 @@ - + + + - + + + diff --git a/.idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.main.iml b/.idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.main.iml index cb0dffceb..2a980529f 100644 --- a/.idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.main.iml +++ b/.idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.main.iml @@ -17,7 +17,9 @@ - + + + diff --git a/.idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.androidTest.iml b/.idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.androidTest.iml index d85b22f9f..f0417c1fe 100644 --- a/.idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.androidTest.iml +++ b/.idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.androidTest.iml @@ -17,13 +17,17 @@ - + + + - + + + diff --git a/.idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.iml b/.idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.iml new file mode 100644 index 000000000..531db69c5 --- /dev/null +++ b/.idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.iml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.main.iml b/.idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.main.iml index dd9d351ca..a74ee91aa 100644 --- a/.idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.main.iml +++ b/.idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.main.iml @@ -17,7 +17,9 @@ - + + + diff --git a/.idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.androidTest.iml b/.idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.androidTest.iml index 78e15f3f5..c067be5c7 100644 --- a/.idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.androidTest.iml +++ b/.idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.androidTest.iml @@ -17,13 +17,17 @@ - + + + - + + + diff --git a/.idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.iml b/.idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.iml new file mode 100644 index 000000000..b5fd24861 --- /dev/null +++ b/.idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.iml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.main.iml b/.idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.main.iml index 847fa6b19..0c9cb2eba 100644 --- a/.idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.main.iml +++ b/.idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.main.iml @@ -17,7 +17,9 @@ - + + + diff --git a/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.androidTest.iml b/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.androidTest.iml index 46b6890a4..b9357acae 100644 --- a/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.androidTest.iml +++ b/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.androidTest.iml @@ -17,13 +17,17 @@ - + + + - + + + diff --git a/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.iml b/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.iml new file mode 100644 index 000000000..4dc51f2a9 --- /dev/null +++ b/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.iml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.main.iml b/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.main.iml index dc41492a3..eefc677dc 100644 --- a/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.main.iml +++ b/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.main.iml @@ -17,7 +17,9 @@ - + + + diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460d8..000000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file From c7e557e77f5466320c2ba464c3b732c65bda1fd4 Mon Sep 17 00:00:00 2001 From: Harold Thetiot Date: Sat, 14 Sep 2024 18:10:07 +0200 Subject: [PATCH 15/33] add gradle/wrapper/gradle-wrapper.jar --- gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 53636 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..13372aef5e24af05341d49695ee84e5f9b594659 GIT binary patch literal 53636 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ⅅ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 H-+%o-(+5aQ literal 0 HcmV?d00001 From 25d40cfe2de567345cfe9e520c858b34cc7baa0f Mon Sep 17 00:00:00 2001 From: Harold Thetiot Date: Sat, 14 Sep 2024 18:17:21 +0200 Subject: [PATCH 16/33] fix indent to tab instead of space --- build.gradle | 26 +++---- libuvccamera/build.gradle | 1 - .../com/serenegiant/service/CameraServer.java | 70 +++++++++---------- 3 files changed, 48 insertions(+), 49 deletions(-) diff --git a/build.gradle b/build.gradle index 1951ad1bd..6b881ebec 100644 --- a/build.gradle +++ b/build.gradle @@ -1,20 +1,20 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - repositories { - jcenter() - google() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.2.1' - } + repositories { + jcenter() + google() + } + dependencies { + classpath 'com.android.tools.build:gradle:7.2.1' + } } allprojects { - repositories { - maven { url 'https://raw.github.com/saki4510t/libcommon/master/repository/' } - jcenter() - google() - } + repositories { + maven { url 'https://raw.github.com/saki4510t/libcommon/master/repository/' } + jcenter() + google() + } } task clean(type: Delete) { @@ -26,7 +26,7 @@ ext { commonLibVersion= '2.12.4' versionCompiler = 34 versionTarget = 34 - minTargetVersion = 30 + minTargetVersion = 30 versionNameString = '1.0.0' javaSourceCompatibility = JavaVersion.VERSION_1_8 javaTargetCompatibility = JavaVersion.VERSION_1_8 diff --git a/libuvccamera/build.gradle b/libuvccamera/build.gradle index 05a7a9ab2..d0d460f85 100644 --- a/libuvccamera/build.gradle +++ b/libuvccamera/build.gradle @@ -85,7 +85,6 @@ clean.dependsOn 'ndkClean' dependencies { implementation fileTree(dir: new File(buildDir, 'libs'), include: '*.jar') - //implementation "com.android.support:support-v4:${supportLibVersion}" implementation "com.android.support:support-annotations:${supportLibVersion}" implementation("com.serenegiant:common:${commonLibVersion}") { diff --git a/usbCameraTest4/src/main/java/com/serenegiant/service/CameraServer.java b/usbCameraTest4/src/main/java/com/serenegiant/service/CameraServer.java index 92109883a..f57bad958 100644 --- a/usbCameraTest4/src/main/java/com/serenegiant/service/CameraServer.java +++ b/usbCameraTest4/src/main/java/com/serenegiant/service/CameraServer.java @@ -63,13 +63,13 @@ public final class CameraServer extends Handler { private int mFrameWidth = DEFAULT_WIDTH, mFrameHeight = DEFAULT_HEIGHT; - private static class CallbackCookie { + private static class CallbackCookie { boolean isConnected; } - private final RemoteCallbackList mCallbacks + private final RemoteCallbackList mCallbacks = new RemoteCallbackList(); - private int mRegisteredCallbackCount; + private int mRegisteredCallbackCount; private RendererHolder mRendererHolder; private final WeakReference mWeakThread; @@ -319,7 +319,7 @@ private static final class CameraThread extends Thread { private static final String TAG_THREAD = "CameraThread"; private final Object mSync = new Object(); private boolean mIsRecording; - private final WeakReference mWeakContext; + private final WeakReference mWeakContext; private int mEncoderSurfaceId; private int mFrameWidth, mFrameHeight; /** @@ -602,37 +602,37 @@ public void onStopped(final MediaEncoder encoder) { * prepare and load shutter sound for still image capturing */ @SuppressLint("SoonBlockedPrivateApi") - protected void loadShutterSound(final Context context) { - // Define a default stream type - int streamType = AudioManager.STREAM_SYSTEM; - - // Conditionally handle reflection based on the Android version - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S_V2) { // API 32 is Android 12L - try { - // Use reflection only for older versions - final Class audioSystemClass = Class.forName("android.media.AudioSystem"); - final Field sseField = audioSystemClass.getDeclaredField("STREAM_SYSTEM_ENFORCED"); - streamType = sseField.getInt(null); - } catch (final Exception e) { - // If reflection fails, fall back to STREAM_SYSTEM - streamType = AudioManager.STREAM_SYSTEM; - } - } - - // Clean up existing SoundPool instance if necessary - if (mSoundPool != null) { - try { - mSoundPool.release(); - } catch (final Exception e) { - // Handle the exception (optional) - } - mSoundPool = null; - } - - // Initialize the SoundPool and load the shutter sound - mSoundPool = new SoundPool(2, streamType, 0); - mSoundId = mSoundPool.load(context, R.raw.camera_click, 1); - } + protected void loadShutterSound(final Context context) { + // Define a default stream type + int streamType = AudioManager.STREAM_SYSTEM; + + // Conditionally handle reflection based on the Android version + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S_V2) { // API 32 is Android 12L + try { + // Use reflection only for older versions + final Class audioSystemClass = Class.forName("android.media.AudioSystem"); + final Field sseField = audioSystemClass.getDeclaredField("STREAM_SYSTEM_ENFORCED"); + streamType = sseField.getInt(null); + } catch (final Exception e) { + // If reflection fails, fall back to STREAM_SYSTEM + streamType = AudioManager.STREAM_SYSTEM; + } + } + + // Clean up existing SoundPool instance if necessary + if (mSoundPool != null) { + try { + mSoundPool.release(); + } catch (final Exception e) { + // Handle the exception (optional) + } + mSoundPool = null; + } + + // Initialize the SoundPool and load the shutter sound + mSoundPool = new SoundPool(2, streamType, 0); + mSoundId = mSoundPool.load(context, R.raw.camera_click, 1); + } @Override public void run() { From d33bc2789d2162caa13b2db2ec175c2672a296fd Mon Sep 17 00:00:00 2001 From: Harold Thetiot Date: Sat, 14 Sep 2024 18:17:54 +0200 Subject: [PATCH 17/33] fix checkPermissionWriteExternalStorage on android 30+ --- .../UVCCamera.usbCameraTest8.unitTest.iml | 4 +++- .../com/serenegiant/common/BaseActivity.java | 16 +++++++++++----- .../com/serenegiant/common/BaseFragment.java | 16 +++++++++++----- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.unitTest.iml b/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.unitTest.iml index 556275361..d4cbb7f44 100644 --- a/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.unitTest.iml +++ b/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.unitTest.iml @@ -16,7 +16,9 @@ - + + + diff --git a/libuvccamera/src/main/java/com/serenegiant/common/BaseActivity.java b/libuvccamera/src/main/java/com/serenegiant/common/BaseActivity.java index 33257fa06..96783e699 100644 --- a/libuvccamera/src/main/java/com/serenegiant/common/BaseActivity.java +++ b/libuvccamera/src/main/java/com/serenegiant/common/BaseActivity.java @@ -26,7 +26,9 @@ import android.Manifest; import android.annotation.SuppressLint; import android.content.pm.PackageManager; +import android.os.Build; import android.os.Bundle; +import android.os.Environment; import android.os.Handler; import android.os.Looper; import android.support.annotation.NonNull; @@ -278,11 +280,15 @@ protected void checkPermissionResult(final int requestCode, final String permiss * @return true 外部ストレージへの書き込みパーミッションが有る */ protected boolean checkPermissionWriteExternalStorage() { - if (!PermissionCheck.hasWriteExternalStorage(this)) { - MessageDialogFragment.showDialog(this, REQUEST_PERMISSION_WRITE_EXTERNAL_STORAGE, - R.string.permission_title, R.string.permission_ext_storage_request, - new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}); - return false; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S_V2) { + return Environment.isExternalStorageManager() || Environment.isExternalStorageEmulated(); + } else { + if (!PermissionCheck.hasWriteExternalStorage(this)) { + MessageDialogFragment.showDialog(this, REQUEST_PERMISSION_WRITE_EXTERNAL_STORAGE, + R.string.permission_title, R.string.permission_ext_storage_request, + new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}); + return false; + } } return true; } diff --git a/libuvccamera/src/main/java/com/serenegiant/common/BaseFragment.java b/libuvccamera/src/main/java/com/serenegiant/common/BaseFragment.java index cdb07fe4c..4318bda8b 100644 --- a/libuvccamera/src/main/java/com/serenegiant/common/BaseFragment.java +++ b/libuvccamera/src/main/java/com/serenegiant/common/BaseFragment.java @@ -27,7 +27,9 @@ import android.annotation.SuppressLint; import android.app.Fragment; import android.content.pm.PackageManager; +import android.os.Build; import android.os.Bundle; +import android.os.Environment; import android.os.Handler; import android.os.Looper; import android.support.annotation.NonNull; @@ -285,11 +287,15 @@ protected void checkPermissionResult(final int requestCode, final String permiss * @return true 外部ストレージへの書き込みパーミッションが有る */ protected boolean checkPermissionWriteExternalStorage() { - if (!PermissionCheck.hasWriteExternalStorage(getActivity())) { - MessageDialogFragment.showDialog(this, REQUEST_PERMISSION_WRITE_EXTERNAL_STORAGE, - com.serenegiant.common.R.string.permission_title, com.serenegiant.common.R.string.permission_ext_storage_request, - new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}); - return false; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S_V2) { + return Environment.isExternalStorageManager() || Environment.isExternalStorageEmulated(); + } else { + if (!PermissionCheck.hasWriteExternalStorage(getActivity())) { + MessageDialogFragment.showDialog(this, REQUEST_PERMISSION_WRITE_EXTERNAL_STORAGE, + R.string.permission_title, R.string.permission_ext_storage_request, + new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}); + return false; + } } return true; } From 68bedab7eb37222c606ebe3a675f24271cd0b7d4 Mon Sep 17 00:00:00 2001 From: Harold Thetiot Date: Sat, 14 Sep 2024 18:20:59 +0200 Subject: [PATCH 18/33] fix possible missing local.properties file for libuvccamera ndkBuildPath --- libuvccamera/build.gradle | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libuvccamera/build.gradle b/libuvccamera/build.gradle index d0d460f85..913a75503 100644 --- a/libuvccamera/build.gradle +++ b/libuvccamera/build.gradle @@ -57,9 +57,12 @@ tasks.withType(JavaCompile) { String getNdkBuildPath() { Properties properties = new Properties() - properties.load(project.rootProject.file('local.properties').newDataInputStream()) - def ndkBuildingDir = properties.getProperty("ndk.dir") - def ndkBuildPath = ndkBuildingDir + def ndkBuildPath = ""; + def ndkBuildingDir = ""; + if (project.rootProject.file("local.properties").exists()) { + properties.load(project.rootProject.file('local.properties').newDataInputStream()) + ndkBuildingDir = properties.getProperty("ndk.dir") + '/' + } if (Os.isFamily(Os.FAMILY_WINDOWS)) { ndkBuildPath = ndkBuildingDir + '/ndk-build.cmd' } else { From 204dccfe77be9843fb2638877e641d73a5114e85 Mon Sep 17 00:00:00 2001 From: Harold Thetiot Date: Sat, 14 Sep 2024 18:25:13 +0200 Subject: [PATCH 19/33] fix libuvccamera/build.gradle getNdkBuildPath --- libuvccamera/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libuvccamera/build.gradle b/libuvccamera/build.gradle index 913a75503..d95f9e811 100644 --- a/libuvccamera/build.gradle +++ b/libuvccamera/build.gradle @@ -64,9 +64,9 @@ String getNdkBuildPath() { ndkBuildingDir = properties.getProperty("ndk.dir") + '/' } if (Os.isFamily(Os.FAMILY_WINDOWS)) { - ndkBuildPath = ndkBuildingDir + '/ndk-build.cmd' + ndkBuildPath = ndkBuildingDir + 'ndk-build.cmd' } else { - ndkBuildPath = ndkBuildingDir + '/ndk-build' + ndkBuildPath = ndkBuildingDir + 'ndk-build' } return ndkBuildPath } From e8fe7a2c47911942d8855c3a4c36327cc3e43cdd Mon Sep 17 00:00:00 2001 From: Harold Thetiot Date: Sat, 14 Sep 2024 18:31:03 +0200 Subject: [PATCH 20/33] remove CI 'List APK files' --- .github/workflows/main.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ee99b4574..08653eade 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,9 +31,6 @@ jobs: - name: Execute Gradle Build Release run: ./gradlew clean build assembleRelease --parallel -x lint - - - name: List APK files - run: ls app/build/outputs/apk/**/*.apk - name: Upload if: github.ref_name == 'release' From 051f21326b0cb7f430b4f4bb8a2ba3d860041d59 Mon Sep 17 00:00:00 2001 From: Harold Thetiot Date: Sat, 14 Sep 2024 18:39:21 +0200 Subject: [PATCH 21/33] fix Handle segfault in handle_iso_completion (c8ff2c603c16de2cc75481f05ce0b0037a84b6d1) via @adib --- libuvccamera/src/main/jni/libusb/libusb/os/android_usbfs.c | 2 +- libuvccamera/src/main/jni/libusb/libusb/os/linux_usbfs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libuvccamera/src/main/jni/libusb/libusb/os/android_usbfs.c b/libuvccamera/src/main/jni/libusb/libusb/os/android_usbfs.c index 86265959e..ccbea84df 100644 --- a/libuvccamera/src/main/jni/libusb/libusb/os/android_usbfs.c +++ b/libuvccamera/src/main/jni/libusb/libusb/os/android_usbfs.c @@ -2726,7 +2726,7 @@ static int handle_iso_completion(struct libusb_device_handle *handle, // XXX add usbi_mutex_lock(&itransfer->lock); for (i = 0; i < num_urbs; i++) { - if (urb == tpriv->iso_urbs[i]) { + if(tpriv->iso_urbs && urb == tpriv->iso_urbs[i]) urb_idx = i + 1; break; } diff --git a/libuvccamera/src/main/jni/libusb/libusb/os/linux_usbfs.c b/libuvccamera/src/main/jni/libusb/libusb/os/linux_usbfs.c index 5ad6129b6..28d9e28a1 100644 --- a/libuvccamera/src/main/jni/libusb/libusb/os/linux_usbfs.c +++ b/libuvccamera/src/main/jni/libusb/libusb/os/linux_usbfs.c @@ -2292,7 +2292,7 @@ static int handle_iso_completion(struct usbi_transfer *itransfer, usbi_mutex_lock(&itransfer->lock); for (i = 0; i < num_urbs; i++) { - if (urb == tpriv->iso_urbs[i]) { + if(tpriv->iso_urbs && urb == tpriv->iso_urbs[i]) urb_idx = i + 1; break; } From ca35f0f1da75370c73c8f571b3b440929625f1c3 Mon Sep 17 00:00:00 2001 From: Harold Thetiot Date: Sat, 14 Sep 2024 18:40:02 +0200 Subject: [PATCH 22/33] fix Fix stopPreview() crash (de019b7fa50f7fa2a92866a1fd0286182b8d1491) via @adhawkmicrosystems --- libuvccamera/src/main/jni/UVCCamera/UVCPreview.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libuvccamera/src/main/jni/UVCCamera/UVCPreview.cpp b/libuvccamera/src/main/jni/UVCCamera/UVCPreview.cpp index 02c1a60b8..391d82f45 100644 --- a/libuvccamera/src/main/jni/UVCCamera/UVCPreview.cpp +++ b/libuvccamera/src/main/jni/UVCCamera/UVCPreview.cpp @@ -845,7 +845,7 @@ void UVCPreview::do_capture_surface(JNIEnv *env) { */ void UVCPreview::do_capture_callback(JNIEnv *env, uvc_frame_t *frame) { ENTER(); - + pthread_mutex_lock(&capture_mutex); if (LIKELY(frame)) { uvc_frame_t *callback_frame = frame; if (mFrameCallbackObj) { @@ -872,5 +872,6 @@ void UVCPreview::do_capture_callback(JNIEnv *env, uvc_frame_t *frame) { SKIP: recycle_frame(callback_frame); } + pthread_mutex_unlock(&capture_mutex); EXIT(); } From 79e6228bf27b7ae617043a55e9cd6378491133b7 Mon Sep 17 00:00:00 2001 From: Harold Thetiot Date: Sat, 14 Sep 2024 18:41:11 +0200 Subject: [PATCH 23/33] Revert "fix Handle segfault in handle_iso_completion (c8ff2c603c16de2cc75481f05ce0b0037a84b6d1) via @adib" This reverts commit 051f21326b0cb7f430b4f4bb8a2ba3d860041d59. --- libuvccamera/src/main/jni/libusb/libusb/os/android_usbfs.c | 2 +- libuvccamera/src/main/jni/libusb/libusb/os/linux_usbfs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libuvccamera/src/main/jni/libusb/libusb/os/android_usbfs.c b/libuvccamera/src/main/jni/libusb/libusb/os/android_usbfs.c index ccbea84df..86265959e 100644 --- a/libuvccamera/src/main/jni/libusb/libusb/os/android_usbfs.c +++ b/libuvccamera/src/main/jni/libusb/libusb/os/android_usbfs.c @@ -2726,7 +2726,7 @@ static int handle_iso_completion(struct libusb_device_handle *handle, // XXX add usbi_mutex_lock(&itransfer->lock); for (i = 0; i < num_urbs; i++) { - if(tpriv->iso_urbs && urb == tpriv->iso_urbs[i]) + if (urb == tpriv->iso_urbs[i]) { urb_idx = i + 1; break; } diff --git a/libuvccamera/src/main/jni/libusb/libusb/os/linux_usbfs.c b/libuvccamera/src/main/jni/libusb/libusb/os/linux_usbfs.c index 28d9e28a1..5ad6129b6 100644 --- a/libuvccamera/src/main/jni/libusb/libusb/os/linux_usbfs.c +++ b/libuvccamera/src/main/jni/libusb/libusb/os/linux_usbfs.c @@ -2292,7 +2292,7 @@ static int handle_iso_completion(struct usbi_transfer *itransfer, usbi_mutex_lock(&itransfer->lock); for (i = 0; i < num_urbs; i++) { - if(tpriv->iso_urbs && urb == tpriv->iso_urbs[i]) + if (urb == tpriv->iso_urbs[i]) { urb_idx = i + 1; break; } From c7f043f685319f65eaef75f60c13ca7ee4df6bef Mon Sep 17 00:00:00 2001 From: Plena Date: Wed, 16 Dec 2020 10:17:10 +0800 Subject: [PATCH 24/33] Update android_usbfs.c Fixed crash when Android target SDK > 27 --- .../src/main/jni/libusb/libusb/os/android_usbfs.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libuvccamera/src/main/jni/libusb/libusb/os/android_usbfs.c b/libuvccamera/src/main/jni/libusb/libusb/os/android_usbfs.c index 86265959e..932787fa6 100644 --- a/libuvccamera/src/main/jni/libusb/libusb/os/android_usbfs.c +++ b/libuvccamera/src/main/jni/libusb/libusb/os/android_usbfs.c @@ -2726,6 +2726,9 @@ static int handle_iso_completion(struct libusb_device_handle *handle, // XXX add usbi_mutex_lock(&itransfer->lock); for (i = 0; i < num_urbs; i++) { + if(tpriv->iso_urbs == NULL){ + return LIBUSB_TRANSFER_ERROR; + } if (urb == tpriv->iso_urbs[i]) { urb_idx = i + 1; break; @@ -2926,7 +2929,13 @@ static int reap_for_handle(struct libusb_device_handle *handle) { usbi_dbg("urb type=%d status=%d transferred=%d", urb->type, urb->status, urb->actual_length); - + + //if not check status, will crash when target > 27 + //current error status is -108 + if(urb->status < 0){ + return LIBUSB_ERROR_OTHER; + } + switch (transfer->type) { case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS: return handle_iso_completion(handle, itransfer, urb); From ff6fe3b52e6f100f13a591868e7ec29cb3581f9e Mon Sep 17 00:00:00 2001 From: Plena Date: Wed, 23 Dec 2020 10:33:08 +0800 Subject: [PATCH 25/33] Update android_usbfs.c --- libuvccamera/src/main/jni/libusb/libusb/os/android_usbfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libuvccamera/src/main/jni/libusb/libusb/os/android_usbfs.c b/libuvccamera/src/main/jni/libusb/libusb/os/android_usbfs.c index 932787fa6..6648538b6 100644 --- a/libuvccamera/src/main/jni/libusb/libusb/os/android_usbfs.c +++ b/libuvccamera/src/main/jni/libusb/libusb/os/android_usbfs.c @@ -2932,7 +2932,7 @@ static int reap_for_handle(struct libusb_device_handle *handle) { //if not check status, will crash when target > 27 //current error status is -108 - if(urb->status < 0){ + if(urb->status == -108){ return LIBUSB_ERROR_OTHER; } From 463c51dda398d6caebaeee118e53fa33ed27b97d Mon Sep 17 00:00:00 2001 From: Harshit Saxena Date: Fri, 28 Aug 2020 13:36:50 +0530 Subject: [PATCH 26/33] Update README.md Fixed text in ndk.dir from `path to Android SDK on your storage` to `path to Android NDK on your storage` --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a6bdc99dd..d09c0f65d 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ If you want to use Android Studio(unfortunately NDK supporting on Android Studio 5. Android Studio raise some errors but just ignore now. Android Studio generate `local.properties` file. Please open `local.properties` and add `ndk.dir` key to the end of the file. The contents of the file looks like this. ``` sdk.dir={path to Android SDK on your storage} -ndk.dir={path to Android SDK on your storage} +ndk.dir={path to Android NDK on your storage} ``` Please replace actual path to SDK and NDK on your storage. Of course you can make `local.properties` by manually instead of using automatically generated ones by Android Studio. From 2a7fcbdfac1d38ebeec494f6e143d1812d4cce65 Mon Sep 17 00:00:00 2001 From: Harold Thetiot Date: Sat, 14 Sep 2024 20:05:15 +0200 Subject: [PATCH 27/33] fix registerReceiver RECEIVER_NOT_EXPORTED --- .../main/java/com/serenegiant/usb/USBMonitor.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/libuvccamera/src/main/java/com/serenegiant/usb/USBMonitor.java b/libuvccamera/src/main/java/com/serenegiant/usb/USBMonitor.java index 722dd3613..bb8eb4341 100644 --- a/libuvccamera/src/main/java/com/serenegiant/usb/USBMonitor.java +++ b/libuvccamera/src/main/java/com/serenegiant/usb/USBMonitor.java @@ -43,6 +43,7 @@ import android.hardware.usb.UsbDeviceConnection; import android.hardware.usb.UsbInterface; import android.hardware.usb.UsbManager; +import android.os.Build; import android.os.Handler; import android.text.TextUtils; import android.util.Log; @@ -167,11 +168,21 @@ public synchronized void register() throws IllegalStateException { if (DEBUG) Log.i(TAG, "register:"); final Context context = mWeakContext.get(); if (context != null) { - mPermissionIntent = PendingIntent.getBroadcast(context, 0, new Intent(ACTION_USB_PERMISSION), 0); + mPermissionIntent = PendingIntent.getBroadcast(context, 0, new Intent(ACTION_USB_PERMISSION), PendingIntent.FLAG_IMMUTABLE); final IntentFilter filter = new IntentFilter(ACTION_USB_PERMISSION); // ACTION_USB_DEVICE_ATTACHED never comes on some devices so it should not be added here filter.addAction(UsbManager.ACTION_USB_DEVICE_DETACHED); - context.registerReceiver(mUsbReceiver, filter); + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + // For Android 13 (API level 33) and above, use receiver flags + context.registerReceiver(mUsbReceiver, filter, Context.RECEIVER_NOT_EXPORTED); + } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { + // For Android 12 (API level 31) and above + context.registerReceiver(mUsbReceiver, filter); + } else { + // For older versions of Android + context.registerReceiver(mUsbReceiver, filter); + } } // start connection check mDeviceCounts = 0; From 7eb8cbbe3dda450b52cc767043e25687ba74e41b Mon Sep 17 00:00:00 2001 From: Harold Thetiot Date: Sat, 14 Sep 2024 20:06:47 +0200 Subject: [PATCH 28/33] fix indentation to tab libuvccamera/src/main/jni/libusb/libusb/os/android_usbfs.c --- .../main/jni/libusb/libusb/os/android_usbfs.c | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/libuvccamera/src/main/jni/libusb/libusb/os/android_usbfs.c b/libuvccamera/src/main/jni/libusb/libusb/os/android_usbfs.c index 6648538b6..0d52e7384 100644 --- a/libuvccamera/src/main/jni/libusb/libusb/os/android_usbfs.c +++ b/libuvccamera/src/main/jni/libusb/libusb/os/android_usbfs.c @@ -1311,10 +1311,10 @@ static int android_initialize_device(struct libusb_device *dev, priv->descriptors_len = 0; priv->fd = 0; memset(desc, 0, sizeof(desc)); - if (!lseek(fd, 0, SEEK_SET)) { - // ディスクリプタを読み込んでローカルキャッシュする - int length = read(fd, desc, sizeof(desc)); - LOGD("Device::init read returned %d errno %d\n", length, errno); + if (!lseek(fd, 0, SEEK_SET)) { + // ディスクリプタを読み込んでローカルキャッシュする + int length = read(fd, desc, sizeof(desc)); + LOGD("Device::init read returned %d errno %d\n", length, errno); if (length > 0) { priv->fd = fd; priv->descriptors = usbi_reallocf(priv->descriptors, length); @@ -1383,36 +1383,36 @@ int android_generate_device(struct libusb_context *ctx, struct libusb_device **d int r = 0; *dev = NULL; - /* FIXME: session ID is not guaranteed unique as addresses can wrap and - * will be reused. instead we should add a simple sysfs attribute with - * a session ID. */ + /* FIXME: session ID is not guaranteed unique as addresses can wrap and + * will be reused. instead we should add a simple sysfs attribute with + * a session ID. */ session_id = busnum << 8 | devaddr; - LOGD("allocating new device for %d/%d (session %ld)", busnum, devaddr, session_id); - *dev = usbi_alloc_device(ctx, session_id); // この時点で参照カウンタ=1 - if (UNLIKELY(!dev)) { - RETURN(LIBUSB_ERROR_NO_MEM, int); - } - - r = android_initialize_device(*dev, busnum, devaddr, fd); - if (UNLIKELY(r < 0)) { - LOGE("initialize_device failed: ret=%d", r); - goto out; - } - r = usbi_sanitize_device(*dev); - if (UNLIKELY(r < 0)) { - LOGE("usbi_sanitize_device failed: ret=%d", r); - goto out; - } + LOGD("allocating new device for %d/%d (session %ld)", busnum, devaddr, session_id); + *dev = usbi_alloc_device(ctx, session_id); // この時点で参照カウンタ=1 + if (UNLIKELY(!dev)) { + RETURN(LIBUSB_ERROR_NO_MEM, int); + } + + r = android_initialize_device(*dev, busnum, devaddr, fd); + if (UNLIKELY(r < 0)) { + LOGE("initialize_device failed: ret=%d", r); + goto out; + } + r = usbi_sanitize_device(*dev); + if (UNLIKELY(r < 0)) { + LOGE("usbi_sanitize_device failed: ret=%d", r); + goto out; + } out: - if (UNLIKELY(r < 0)) { - libusb_unref_device(*dev); // ここで参照カウンタが0になって破棄される - *dev = NULL; - } else { - usbi_connect_device(*dev); - } + if (UNLIKELY(r < 0)) { + libusb_unref_device(*dev); // ここで参照カウンタが0になって破棄される + *dev = NULL; + } else { + usbi_connect_device(*dev); + } - RETURN(r, int); + RETURN(r, int); } @@ -2726,9 +2726,9 @@ static int handle_iso_completion(struct libusb_device_handle *handle, // XXX add usbi_mutex_lock(&itransfer->lock); for (i = 0; i < num_urbs; i++) { - if(tpriv->iso_urbs == NULL){ - return LIBUSB_TRANSFER_ERROR; - } + if(tpriv->iso_urbs == NULL){ + return LIBUSB_TRANSFER_ERROR; + } if (urb == tpriv->iso_urbs[i]) { urb_idx = i + 1; break; @@ -2930,10 +2930,10 @@ static int reap_for_handle(struct libusb_device_handle *handle) { usbi_dbg("urb type=%d status=%d transferred=%d", urb->type, urb->status, urb->actual_length); - //if not check status, will crash when target > 27 - //current error status is -108 + // if not check status, will crash when target > 27 + // current error status is -108 if(urb->status == -108){ - return LIBUSB_ERROR_OTHER; + return LIBUSB_ERROR_OTHER; } switch (transfer->type) { From a417bba76cb0342efc84e94b3fd7c309d3ff5168 Mon Sep 17 00:00:00 2001 From: Harold Thetiot Date: Sat, 14 Sep 2024 20:06:59 +0200 Subject: [PATCH 29/33] fix com.serenegiant.usbcameratest2 --- usbCameraTest2/src/main/res/layout/activity_main.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usbCameraTest2/src/main/res/layout/activity_main.xml b/usbCameraTest2/src/main/res/layout/activity_main.xml index ae26b4037..131bb9ca4 100644 --- a/usbCameraTest2/src/main/res/layout/activity_main.xml +++ b/usbCameraTest2/src/main/res/layout/activity_main.xml @@ -27,7 +27,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="#ff000000" - tools:context="com.serenegiant.usbcameratest.MainActivity" + tools:context="com.serenegiant.usbcameratest2.MainActivity" tools:ignore="MergeRootFrame" > + android:background="@null" /> - + Date: Sat, 14 Sep 2024 20:45:22 +0200 Subject: [PATCH 30/33] fix com.serenegiant.usbcameratest SimpleUVCCameraTextureView --- usbCameraTest/src/main/res/layout/activity_main.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usbCameraTest/src/main/res/layout/activity_main.xml b/usbCameraTest/src/main/res/layout/activity_main.xml index 5ca52e562..cde370285 100644 --- a/usbCameraTest/src/main/res/layout/activity_main.xml +++ b/usbCameraTest/src/main/res/layout/activity_main.xml @@ -34,7 +34,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center" - android:background="#ff000000" /> + android:background="@null" /> Date: Sat, 14 Sep 2024 20:46:59 +0200 Subject: [PATCH 31/33] fix usbdevice.getSerialNumber on > 28 --- .../src/main/java/com/serenegiant/usb/USBMonitor.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libuvccamera/src/main/java/com/serenegiant/usb/USBMonitor.java b/libuvccamera/src/main/java/com/serenegiant/usb/USBMonitor.java index bb8eb4341..abfd37a70 100644 --- a/libuvccamera/src/main/java/com/serenegiant/usb/USBMonitor.java +++ b/libuvccamera/src/main/java/com/serenegiant/usb/USBMonitor.java @@ -671,7 +671,11 @@ public static final String getDeviceKeyName(final UsbDevice device, final String if (useNewAPI && BuildCheck.isAndroid5()) { sb.append("#"); if (TextUtils.isEmpty(serial)) { - sb.append(device.getSerialNumber()); sb.append("#"); // API >= 21 + try { + sb.append(device.getSerialNumber()); + sb.append("#"); + } // API >= 21 & targetSdkVersion has to be <= 28 + catch(SecurityException ignore) {} } sb.append(device.getManufacturerName()); sb.append("#"); // API >= 21 sb.append(device.getConfigurationCount()); sb.append("#"); // API >= 21 From aec108e24ae75be9d22a5f8b4ba91ebc037b7873 Mon Sep 17 00:00:00 2001 From: Harold Thetiot Date: Sat, 14 Sep 2024 20:47:19 +0200 Subject: [PATCH 32/33] update .idea --- .../usbCameraTest/UVCCamera.usbCameraTest.androidTest.iml | 4 +++- .../usbCameraTest2/UVCCamera.usbCameraTest2.androidTest.iml | 4 +++- .../usbCameraTest4/UVCCamera.usbCameraTest4.androidTest.iml | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.androidTest.iml b/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.androidTest.iml index c9ad257b3..44b229f29 100644 --- a/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.androidTest.iml +++ b/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.androidTest.iml @@ -17,7 +17,9 @@ - + + + diff --git a/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.androidTest.iml b/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.androidTest.iml index 927e57197..7767740c9 100644 --- a/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.androidTest.iml +++ b/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.androidTest.iml @@ -17,7 +17,9 @@ - + + + diff --git a/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.androidTest.iml b/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.androidTest.iml index 80bb0e064..8d11495f4 100644 --- a/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.androidTest.iml +++ b/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.androidTest.iml @@ -17,7 +17,9 @@ - + + + From 618233f9d3ac0dfd18d7bddccfa7452507a6b078 Mon Sep 17 00:00:00 2001 From: Harold Thetiot Date: Sat, 14 Sep 2024 20:51:33 +0200 Subject: [PATCH 33/33] git ignore .idea/modules* --- .gitignore | 2 + .idea/modules.xml | 52 ------------- .../UVCCamera.libuvccamera.androidTest.iml | 59 --------------- .../libuvccamera/UVCCamera.libuvccamera.iml | 32 -------- .../UVCCamera.libuvccamera.main.iml | 59 --------------- .../UVCCamera.libuvccamera.unitTest.iml | 47 ------------ .../UVCCamera.usbCameraCommon.androidTest.iml | 59 --------------- .../UVCCamera.usbCameraCommon.iml | 32 -------- .../UVCCamera.usbCameraCommon.main.iml | 60 --------------- .../UVCCamera.usbCameraCommon.unitTest.iml | 48 ------------ .../UVCCamera.usbCameraTest.androidTest.iml | 58 --------------- .../usbCameraTest/UVCCamera.usbCameraTest.iml | 31 -------- .../UVCCamera.usbCameraTest.main.iml | 59 --------------- .../UVCCamera.usbCameraTest.unitTest.iml | 47 ------------ .../UVCCamera.usbCameraTest0.androidTest.iml | 58 --------------- .../UVCCamera.usbCameraTest0.iml | 31 -------- .../UVCCamera.usbCameraTest0.main.iml | 59 --------------- .../UVCCamera.usbCameraTest0.unitTest.iml | 47 ------------ .../UVCCamera.usbCameraTest2.androidTest.iml | 58 --------------- .../UVCCamera.usbCameraTest2.iml | 31 -------- .../UVCCamera.usbCameraTest2.main.iml | 59 --------------- .../UVCCamera.usbCameraTest2.unitTest.iml | 47 ------------ .../UVCCamera.usbCameraTest3.androidTest.iml | 59 --------------- .../UVCCamera.usbCameraTest3.iml | 31 -------- .../UVCCamera.usbCameraTest3.main.iml | 60 --------------- .../UVCCamera.usbCameraTest3.unitTest.iml | 48 ------------ .../UVCCamera.usbCameraTest4.androidTest.iml | 59 --------------- .../UVCCamera.usbCameraTest4.iml | 31 -------- .../UVCCamera.usbCameraTest4.main.iml | 63 ---------------- .../UVCCamera.usbCameraTest4.unitTest.iml | 48 ------------ .../UVCCamera.usbCameraTest5.androidTest.iml | 59 --------------- .../UVCCamera.usbCameraTest5.iml | 31 -------- .../UVCCamera.usbCameraTest5.main.iml | 60 --------------- .../UVCCamera.usbCameraTest5.unitTest.iml | 48 ------------ .../UVCCamera.usbCameraTest6.androidTest.iml | 59 --------------- .../UVCCamera.usbCameraTest6.iml | 31 -------- .../UVCCamera.usbCameraTest6.main.iml | 60 --------------- .../UVCCamera.usbCameraTest6.unitTest.iml | 48 ------------ .../UVCCamera.usbCameraTest7.androidTest.iml | 59 --------------- .../UVCCamera.usbCameraTest7.iml | 31 -------- .../UVCCamera.usbCameraTest7.main.iml | 60 --------------- .../UVCCamera.usbCameraTest7.unitTest.iml | 48 ------------ .../UVCCamera.usbCameraTest8.androidTest.iml | 74 ------------------- .../UVCCamera.usbCameraTest8.iml | 31 -------- .../UVCCamera.usbCameraTest8.main.iml | 60 --------------- .../UVCCamera.usbCameraTest8.unitTest.iml | 54 -------------- 46 files changed, 2 insertions(+), 2245 deletions(-) delete mode 100644 .idea/modules.xml delete mode 100644 .idea/modules/libuvccamera/UVCCamera.libuvccamera.androidTest.iml delete mode 100644 .idea/modules/libuvccamera/UVCCamera.libuvccamera.iml delete mode 100644 .idea/modules/libuvccamera/UVCCamera.libuvccamera.main.iml delete mode 100644 .idea/modules/libuvccamera/UVCCamera.libuvccamera.unitTest.iml delete mode 100644 .idea/modules/usbCameraCommon/UVCCamera.usbCameraCommon.androidTest.iml delete mode 100644 .idea/modules/usbCameraCommon/UVCCamera.usbCameraCommon.iml delete mode 100644 .idea/modules/usbCameraCommon/UVCCamera.usbCameraCommon.main.iml delete mode 100644 .idea/modules/usbCameraCommon/UVCCamera.usbCameraCommon.unitTest.iml delete mode 100644 .idea/modules/usbCameraTest/UVCCamera.usbCameraTest.androidTest.iml delete mode 100644 .idea/modules/usbCameraTest/UVCCamera.usbCameraTest.iml delete mode 100644 .idea/modules/usbCameraTest/UVCCamera.usbCameraTest.main.iml delete mode 100644 .idea/modules/usbCameraTest/UVCCamera.usbCameraTest.unitTest.iml delete mode 100644 .idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.androidTest.iml delete mode 100644 .idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.iml delete mode 100644 .idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.main.iml delete mode 100644 .idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.unitTest.iml delete mode 100644 .idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.androidTest.iml delete mode 100644 .idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.iml delete mode 100644 .idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.main.iml delete mode 100644 .idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.unitTest.iml delete mode 100644 .idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.androidTest.iml delete mode 100644 .idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.iml delete mode 100644 .idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.main.iml delete mode 100644 .idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.unitTest.iml delete mode 100644 .idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.androidTest.iml delete mode 100644 .idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.iml delete mode 100644 .idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.main.iml delete mode 100644 .idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.unitTest.iml delete mode 100644 .idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.androidTest.iml delete mode 100644 .idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.iml delete mode 100644 .idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.main.iml delete mode 100644 .idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.unitTest.iml delete mode 100644 .idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.androidTest.iml delete mode 100644 .idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.iml delete mode 100644 .idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.main.iml delete mode 100644 .idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.unitTest.iml delete mode 100644 .idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.androidTest.iml delete mode 100644 .idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.iml delete mode 100644 .idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.main.iml delete mode 100644 .idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.unitTest.iml delete mode 100644 .idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.androidTest.iml delete mode 100644 .idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.iml delete mode 100644 .idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.main.iml delete mode 100644 .idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.unitTest.iml diff --git a/.gitignore b/.gitignore index be507050d..5982fd762 100644 --- a/.gitignore +++ b/.gitignore @@ -56,6 +56,8 @@ build !.idea/fileColors.xml !.idea/encodings.xml !.idea/gradle.xml +!.idea/modules.xml +!.idea/modules/*.xml !.idea/runConfigurations/*.xml !.idea/inspectionProfiles/*.xml diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 1492c4dfd..000000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/libuvccamera/UVCCamera.libuvccamera.androidTest.iml b/.idea/modules/libuvccamera/UVCCamera.libuvccamera.androidTest.iml deleted file mode 100644 index 262a49ee2..000000000 --- a/.idea/modules/libuvccamera/UVCCamera.libuvccamera.androidTest.iml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/libuvccamera/UVCCamera.libuvccamera.iml b/.idea/modules/libuvccamera/UVCCamera.libuvccamera.iml deleted file mode 100644 index df06f1511..000000000 --- a/.idea/modules/libuvccamera/UVCCamera.libuvccamera.iml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/libuvccamera/UVCCamera.libuvccamera.main.iml b/.idea/modules/libuvccamera/UVCCamera.libuvccamera.main.iml deleted file mode 100644 index dc0c5095b..000000000 --- a/.idea/modules/libuvccamera/UVCCamera.libuvccamera.main.iml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/libuvccamera/UVCCamera.libuvccamera.unitTest.iml b/.idea/modules/libuvccamera/UVCCamera.libuvccamera.unitTest.iml deleted file mode 100644 index 7258bdf4f..000000000 --- a/.idea/modules/libuvccamera/UVCCamera.libuvccamera.unitTest.iml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraCommon/UVCCamera.usbCameraCommon.androidTest.iml b/.idea/modules/usbCameraCommon/UVCCamera.usbCameraCommon.androidTest.iml deleted file mode 100644 index 8e1aa5887..000000000 --- a/.idea/modules/usbCameraCommon/UVCCamera.usbCameraCommon.androidTest.iml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraCommon/UVCCamera.usbCameraCommon.iml b/.idea/modules/usbCameraCommon/UVCCamera.usbCameraCommon.iml deleted file mode 100644 index de20051a0..000000000 --- a/.idea/modules/usbCameraCommon/UVCCamera.usbCameraCommon.iml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraCommon/UVCCamera.usbCameraCommon.main.iml b/.idea/modules/usbCameraCommon/UVCCamera.usbCameraCommon.main.iml deleted file mode 100644 index ba0e17cad..000000000 --- a/.idea/modules/usbCameraCommon/UVCCamera.usbCameraCommon.main.iml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraCommon/UVCCamera.usbCameraCommon.unitTest.iml b/.idea/modules/usbCameraCommon/UVCCamera.usbCameraCommon.unitTest.iml deleted file mode 100644 index cc5cf8105..000000000 --- a/.idea/modules/usbCameraCommon/UVCCamera.usbCameraCommon.unitTest.iml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.androidTest.iml b/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.androidTest.iml deleted file mode 100644 index 44b229f29..000000000 --- a/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.androidTest.iml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.iml b/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.iml deleted file mode 100644 index 90903e744..000000000 --- a/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.iml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.main.iml b/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.main.iml deleted file mode 100644 index f55222b9f..000000000 --- a/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.main.iml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.unitTest.iml b/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.unitTest.iml deleted file mode 100644 index e3df29d36..000000000 --- a/.idea/modules/usbCameraTest/UVCCamera.usbCameraTest.unitTest.iml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.androidTest.iml b/.idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.androidTest.iml deleted file mode 100644 index f4e6b9f9c..000000000 --- a/.idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.androidTest.iml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.iml b/.idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.iml deleted file mode 100644 index ba4b21234..000000000 --- a/.idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.iml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.main.iml b/.idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.main.iml deleted file mode 100644 index 98c2fe8b0..000000000 --- a/.idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.main.iml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.unitTest.iml b/.idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.unitTest.iml deleted file mode 100644 index 7d08e476e..000000000 --- a/.idea/modules/usbCameraTest0/UVCCamera.usbCameraTest0.unitTest.iml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.androidTest.iml b/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.androidTest.iml deleted file mode 100644 index 7767740c9..000000000 --- a/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.androidTest.iml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.iml b/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.iml deleted file mode 100644 index 18036a540..000000000 --- a/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.iml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.main.iml b/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.main.iml deleted file mode 100644 index 9d6807602..000000000 --- a/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.main.iml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.unitTest.iml b/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.unitTest.iml deleted file mode 100644 index 59671a2d9..000000000 --- a/.idea/modules/usbCameraTest2/UVCCamera.usbCameraTest2.unitTest.iml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.androidTest.iml b/.idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.androidTest.iml deleted file mode 100644 index 35686c4c7..000000000 --- a/.idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.androidTest.iml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.iml b/.idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.iml deleted file mode 100644 index f70d0dea3..000000000 --- a/.idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.iml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.main.iml b/.idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.main.iml deleted file mode 100644 index 66fda7f9c..000000000 --- a/.idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.main.iml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.unitTest.iml b/.idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.unitTest.iml deleted file mode 100644 index 2968bcca2..000000000 --- a/.idea/modules/usbCameraTest3/UVCCamera.usbCameraTest3.unitTest.iml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.androidTest.iml b/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.androidTest.iml deleted file mode 100644 index 8d11495f4..000000000 --- a/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.androidTest.iml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.iml b/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.iml deleted file mode 100644 index 7fa482911..000000000 --- a/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.iml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.main.iml b/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.main.iml deleted file mode 100644 index 797ff829b..000000000 --- a/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.main.iml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.unitTest.iml b/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.unitTest.iml deleted file mode 100644 index 8d6fd6e0f..000000000 --- a/.idea/modules/usbCameraTest4/UVCCamera.usbCameraTest4.unitTest.iml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.androidTest.iml b/.idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.androidTest.iml deleted file mode 100644 index d95ba8268..000000000 --- a/.idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.androidTest.iml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.iml b/.idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.iml deleted file mode 100644 index b4ea28a31..000000000 --- a/.idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.iml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.main.iml b/.idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.main.iml deleted file mode 100644 index 2a980529f..000000000 --- a/.idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.main.iml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.unitTest.iml b/.idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.unitTest.iml deleted file mode 100644 index 1e5f340c2..000000000 --- a/.idea/modules/usbCameraTest5/UVCCamera.usbCameraTest5.unitTest.iml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.androidTest.iml b/.idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.androidTest.iml deleted file mode 100644 index f0417c1fe..000000000 --- a/.idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.androidTest.iml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.iml b/.idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.iml deleted file mode 100644 index 531db69c5..000000000 --- a/.idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.iml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.main.iml b/.idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.main.iml deleted file mode 100644 index a74ee91aa..000000000 --- a/.idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.main.iml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.unitTest.iml b/.idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.unitTest.iml deleted file mode 100644 index 57938af5d..000000000 --- a/.idea/modules/usbCameraTest6/UVCCamera.usbCameraTest6.unitTest.iml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.androidTest.iml b/.idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.androidTest.iml deleted file mode 100644 index c067be5c7..000000000 --- a/.idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.androidTest.iml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.iml b/.idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.iml deleted file mode 100644 index b5fd24861..000000000 --- a/.idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.iml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.main.iml b/.idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.main.iml deleted file mode 100644 index 0c9cb2eba..000000000 --- a/.idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.main.iml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.unitTest.iml b/.idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.unitTest.iml deleted file mode 100644 index 701dcaab0..000000000 --- a/.idea/modules/usbCameraTest7/UVCCamera.usbCameraTest7.unitTest.iml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.androidTest.iml b/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.androidTest.iml deleted file mode 100644 index b9357acae..000000000 --- a/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.androidTest.iml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.iml b/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.iml deleted file mode 100644 index 4dc51f2a9..000000000 --- a/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.iml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.main.iml b/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.main.iml deleted file mode 100644 index eefc677dc..000000000 --- a/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.main.iml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.unitTest.iml b/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.unitTest.iml deleted file mode 100644 index d4cbb7f44..000000000 --- a/.idea/modules/usbCameraTest8/UVCCamera.usbCameraTest8.unitTest.iml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file