[Engine] rename cls && add cls && vad android demo (#3188)
* [Engine] rename cls to AudioClassification * [Engine] add android && vad demopull/3198/head
@ -0,0 +1,100 @@
|
||||
# audio classification
|
||||
|
||||
This directory provieds audio classification on CPU
|
||||
|
||||
## conf
|
||||
config is the input of engine
|
||||
|
||||
[CONF]
|
||||
wav_normal=true
|
||||
wav_normal_type=linear
|
||||
wav_norm_mul_factor=1.0
|
||||
model_path=./inference.onnx
|
||||
param_path=
|
||||
dict_path=./label_list
|
||||
num_cpu_thread=1
|
||||
samp_freq=32000
|
||||
frame_length_ms=32
|
||||
frame_shift_ms=10
|
||||
num_bins=64
|
||||
low_freq=50
|
||||
high_freq=14000
|
||||
dither=0.0
|
||||
## label_list
|
||||
model output label
|
||||
|
||||
Dog
|
||||
Rooster
|
||||
Pig
|
||||
Cow
|
||||
Frog
|
||||
Cat
|
||||
Hen
|
||||
Insects (flying)
|
||||
Sheep
|
||||
Crow
|
||||
Rain
|
||||
Sea waves
|
||||
Crackling fire
|
||||
.....
|
||||
## scp && test.wav
|
||||
scp is the input of engine and each line in scp is wav
|
||||
## execute
|
||||
../../build/Linux/x86_64/engine/audio_classification/nnet/panns_nnet_main --conf_path=./conf --scp_path=./scp --topk=1
|
||||
usage: panns_nnet_main conf scp topk
|
||||
output such as:
|
||||
|
||||
wav_normal = true
|
||||
wav_normal_type = linear
|
||||
wav_norm_mul_factor = 1.0
|
||||
model_path = ./inference.onnx
|
||||
param_path =
|
||||
dict_path = ./label_list
|
||||
num_cpu_thread = 1
|
||||
samp_freq = 32000
|
||||
frame_length_ms = 32
|
||||
frame_shift_ms = 10
|
||||
num_bins = 64
|
||||
low_freq = 50
|
||||
high_freq = 14000
|
||||
dither = 0.0
|
||||
[INFO] fastdeploy/runtime/runtime.cc(293)::CreateOrtBackend Runtime initialized with Backend::ORT in Device::CPU.
|
||||
--- Init FastDeploy Runitme Done!
|
||||
--- Model: ./inference.onnx
|
||||
test.wav{"Clock alarm":"16.5309"}
|
||||
## android demo
|
||||
### install
|
||||
#### copy lib & interface
|
||||
cd ../../
|
||||
sh build_android.sh
|
||||
cp build/Android/arm64-v8a-api-21/cls-android-out/*.so examples/audio_classification/android_demo/app/src/main/cpp/jniLibs/arm64-v8a/
|
||||
cp build/Android/arm64-v8a-api-21/cls-android-out/panns_interface.h examples/audio_classification/android_demo/app/src/main/cpp/
|
||||
includes/
|
||||
|
||||
#### set path
|
||||
push resource into android phone
|
||||
|
||||
1. change resource path in conf to gloabal path, such as:
|
||||
|
||||
[CONF]
|
||||
wav_normal=true
|
||||
wav_normal_type=linear
|
||||
wav_norm_mul_factor=1.0
|
||||
model_path=/data/local/tmp/inference.onnx
|
||||
param_path=
|
||||
dict_path=/data/local/tmp/label_list
|
||||
num_cpu_thread=1
|
||||
samp_freq=32000
|
||||
frame_length_ms=32
|
||||
frame_shift_ms=10
|
||||
num_bins=64
|
||||
low_freq=50
|
||||
high_freq=14000
|
||||
dither=0.0
|
||||
2. adb push conf label_list scp test.wav /data/local/tmp/
|
||||
3. set reource path in android demo(android_demo/app/src/main/cpp/native-lib.cpp) to actual path, such as:
|
||||
|
||||
std::string conf_path = "/data/local/tmp/conf";
|
||||
std::string wav_path = "/data/local/tmp/test.wav";
|
||||
|
||||
4. excecute android_demo in android studio
|
@ -0,0 +1,15 @@
|
||||
*.iml
|
||||
.gradle
|
||||
/local.properties
|
||||
/.idea/caches
|
||||
/.idea/libraries
|
||||
/.idea/modules.xml
|
||||
/.idea/workspace.xml
|
||||
/.idea/navEditor.xml
|
||||
/.idea/assetWizardSettings.xml
|
||||
.DS_Store
|
||||
/build
|
||||
/captures
|
||||
.externalNativeBuild
|
||||
.cxx
|
||||
local.properties
|
@ -0,0 +1,3 @@
|
||||
# Default ignored files
|
||||
/shelf/
|
||||
/workspace.xml
|
@ -0,0 +1,123 @@
|
||||
<component name="ProjectCodeStyleConfiguration">
|
||||
<code_scheme name="Project" version="173">
|
||||
<JetCodeStyleSettings>
|
||||
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
|
||||
</JetCodeStyleSettings>
|
||||
<codeStyleSettings language="XML">
|
||||
<option name="FORCE_REARRANGE_MODE" value="1" />
|
||||
<indentOptions>
|
||||
<option name="CONTINUATION_INDENT_SIZE" value="4" />
|
||||
</indentOptions>
|
||||
<arrangement>
|
||||
<rules>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>xmlns:android</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>xmlns:.*</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
<order>BY_NAME</order>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>.*:id</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>.*:name</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>name</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>style</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>.*</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
<order>BY_NAME</order>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>.*</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
<order>ANDROID_ATTRIBUTE_ORDER</order>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>.*</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>.*</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
<order>BY_NAME</order>
|
||||
</rule>
|
||||
</section>
|
||||
</rules>
|
||||
</arrangement>
|
||||
</codeStyleSettings>
|
||||
<codeStyleSettings language="kotlin">
|
||||
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
|
||||
</codeStyleSettings>
|
||||
</code_scheme>
|
||||
</component>
|
@ -0,0 +1,5 @@
|
||||
<component name="ProjectCodeStyleConfiguration">
|
||||
<state>
|
||||
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
|
||||
</state>
|
||||
</component>
|
@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="CompilerConfiguration">
|
||||
<bytecodeTargetLevel target="11" />
|
||||
</component>
|
||||
</project>
|
@ -0,0 +1,19 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="GradleMigrationSettings" migrationVersion="1" />
|
||||
<component name="GradleSettings">
|
||||
<option name="linkedExternalProjectsSettings">
|
||||
<GradleProjectSettings>
|
||||
<option name="testRunner" value="GRADLE" />
|
||||
<option name="distributionType" value="DEFAULT_WRAPPED" />
|
||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||
<option name="modules">
|
||||
<set>
|
||||
<option value="$PROJECT_DIR$" />
|
||||
<option value="$PROJECT_DIR$/app" />
|
||||
</set>
|
||||
</option>
|
||||
</GradleProjectSettings>
|
||||
</option>
|
||||
</component>
|
||||
</project>
|
@ -0,0 +1,10 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||
</component>
|
||||
<component name="ProjectType">
|
||||
<option name="id" value="Android" />
|
||||
</component>
|
||||
</project>
|
@ -0,0 +1 @@
|
||||
/build
|
@ -0,0 +1,21 @@
|
||||
# Add project specific ProGuard rules here.
|
||||
# You can control the set of applied configuration files using the
|
||||
# proguardFiles setting in build.gradle.
|
||||
#
|
||||
# For more details, see
|
||||
# http://developer.android.com/guide/developing/tools/proguard.html
|
||||
|
||||
# If your project uses WebView with JS, uncomment the following
|
||||
# and specify the fully qualified class name to the JavaScript interface
|
||||
# class:
|
||||
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
|
||||
# public *;
|
||||
#}
|
||||
|
||||
# Uncomment this to preserve the line number information for
|
||||
# debugging stack traces.
|
||||
#-keepattributes SourceFile,LineNumberTable
|
||||
|
||||
# If you keep the line number information, uncomment this to
|
||||
# hide the original source file name.
|
||||
#-renamesourcefileattribute SourceFile
|
@ -0,0 +1,24 @@
|
||||
package com.example.cls
|
||||
|
||||
import android.support.test.InstrumentationRegistry
|
||||
import android.support.test.runner.AndroidJUnit4
|
||||
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
|
||||
import org.junit.Assert.*
|
||||
|
||||
/**
|
||||
* Instrumented test, which will execute on an Android device.
|
||||
*
|
||||
* See [testing documentation](http://d.android.com/tools/testing).
|
||||
*/
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
class ExampleInstrumentedTest {
|
||||
@Test
|
||||
fun useAppContext() {
|
||||
// Context of the app under test.
|
||||
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
|
||||
assertEquals("com.example.cls", appContext.packageName)
|
||||
}
|
||||
}
|
@ -0,0 +1,30 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools" >
|
||||
|
||||
<application
|
||||
android:allowBackup="true"
|
||||
android:dataExtractionRules="@xml/data_extraction_rules"
|
||||
android:fullBackupContent="@xml/backup_rules"
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
android:label="@string/app_name"
|
||||
android:roundIcon="@mipmap/ic_launcher_round"
|
||||
android:supportsRtl="true"
|
||||
android:theme="@style/Theme.Cls"
|
||||
tools:targetApi="31" >
|
||||
<activity
|
||||
android:name=".MainActivity"
|
||||
android:exported="true" >
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
|
||||
<meta-data
|
||||
android:name="android.app.lib_name"
|
||||
android:value="" />
|
||||
</activity>
|
||||
</application>
|
||||
|
||||
</manifest>
|
@ -0,0 +1,59 @@
|
||||
|
||||
# For more information about using CMake with Android Studio, read the
|
||||
# documentation: https://d.android.com/studio/projects/add-native-code.html
|
||||
|
||||
# Sets the minimum version of CMake required to build the native library.
|
||||
|
||||
cmake_minimum_required(VERSION 3.18.1)
|
||||
|
||||
# Declares and names the project.
|
||||
|
||||
project("cls")
|
||||
|
||||
include_directories(src/main/cpp/)
|
||||
file(GLOB CPP_FILES "src/main/cpp/*.cpp")
|
||||
|
||||
# 添加so库存放位置
|
||||
set(distribution_DIR ${CMAKE_SOURCE_DIR}/jniLibs)
|
||||
|
||||
# Creates and names a library, sets it as either STATIC
|
||||
# or SHARED, and provides the relative paths to its source code.
|
||||
# You can define multiple libraries, and CMake builds them for you.
|
||||
# Gradle automatically packages shared libraries with your APK.
|
||||
|
||||
add_library( # Sets the name of the library.
|
||||
native-lib
|
||||
|
||||
# Sets the library as a shared library.
|
||||
SHARED
|
||||
|
||||
# Provides a relative path to your source file(s).
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/native-lib.cpp )
|
||||
|
||||
# Searches for a specified prebuilt library and stores the path as a
|
||||
# variable. Because CMake includes system libraries in the search path by
|
||||
# default, you only need to specify the name of the public NDK library
|
||||
# you want to add. CMake verifies that the library exists before
|
||||
# completing its build.
|
||||
|
||||
find_library( # Sets the name of the path variable.
|
||||
log-lib
|
||||
|
||||
# Specifies the name of the NDK library that
|
||||
# you want CMake to locate.
|
||||
log )
|
||||
|
||||
# Specifies libraries CMake should link to your target library. You
|
||||
# can link multiple libraries, such as libraries you define in this
|
||||
# build script, prebuilt third-party libraries, or system libraries.
|
||||
|
||||
target_link_libraries( # Specifies the target library.
|
||||
native-lib
|
||||
${CMAKE_SOURCE_DIR}/jniLibs/${ANDROID_ABI}/libc++_shared.so
|
||||
${CMAKE_SOURCE_DIR}/jniLibs/${ANDROID_ABI}/libcls.so
|
||||
${CMAKE_SOURCE_DIR}/jniLibs/${ANDROID_ABI}/libfastdeploy.so
|
||||
${CMAKE_SOURCE_DIR}/jniLibs/${ANDROID_ABI}/libonnxruntime.so
|
||||
# Links the target library to the log library
|
||||
# included in the NDK.
|
||||
${log-lib}
|
||||
)
|
@ -0,0 +1,27 @@
|
||||
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
|
||||
//
|
||||
// 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.
|
||||
|
||||
#pragma once
|
||||
|
||||
namespace ppspeech {
|
||||
|
||||
void* ClsCreateInstance(const char* conf_path);
|
||||
int ClsDestroyInstance(void* instance);
|
||||
int ClsFeedForward(void* instance,
|
||||
const char* wav_path,
|
||||
int topk,
|
||||
char* result,
|
||||
int result_max_len);
|
||||
int ClsReset(void* instance);
|
||||
} // namespace ppspeech
|
@ -0,0 +1,31 @@
|
||||
package com.baidu.paddlespeech.cls
|
||||
|
||||
import android.support.v7.app.AppCompatActivity
|
||||
import android.os.Bundle
|
||||
import android.widget.TextView
|
||||
|
||||
class MainActivity : AppCompatActivity() {
|
||||
private lateinit var tvContent: TextView
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
setContentView(R.layout.activity_main)
|
||||
tvContent = findViewById(R.id.tv_content)
|
||||
|
||||
nClsCreateInstance()
|
||||
tvContent.text = nClsFeedForward()
|
||||
nClsReset()
|
||||
nClsDestroyInstance()
|
||||
}
|
||||
|
||||
external fun nClsCreateInstance(): Boolean
|
||||
external fun nClsDestroyInstance(): Boolean
|
||||
external fun nClsFeedForward(): String
|
||||
external fun nClsReset(): Boolean
|
||||
|
||||
companion object{
|
||||
init {
|
||||
System.loadLibrary("native-lib")
|
||||
}
|
||||
}
|
||||
}
|
@ -0,0 +1,30 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:aapt="http://schemas.android.com/aapt"
|
||||
android:width="108dp"
|
||||
android:height="108dp"
|
||||
android:viewportWidth="108"
|
||||
android:viewportHeight="108">
|
||||
<path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
|
||||
<aapt:attr name="android:fillColor">
|
||||
<gradient
|
||||
android:endX="85.84757"
|
||||
android:endY="92.4963"
|
||||
android:startX="42.9492"
|
||||
android:startY="49.59793"
|
||||
android:type="linear">
|
||||
<item
|
||||
android:color="#44000000"
|
||||
android:offset="0.0" />
|
||||
<item
|
||||
android:color="#00000000"
|
||||
android:offset="1.0" />
|
||||
</gradient>
|
||||
</aapt:attr>
|
||||
</path>
|
||||
<path
|
||||
android:fillColor="#FFFFFF"
|
||||
android:fillType="nonZero"
|
||||
android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
|
||||
android:strokeWidth="1"
|
||||
android:strokeColor="#00000000" />
|
||||
</vector>
|
@ -0,0 +1,170 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="108dp"
|
||||
android:height="108dp"
|
||||
android:viewportWidth="108"
|
||||
android:viewportHeight="108">
|
||||
<path
|
||||
android:fillColor="#3DDC84"
|
||||
android:pathData="M0,0h108v108h-108z" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M9,0L9,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,0L19,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M29,0L29,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M39,0L39,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M49,0L49,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M59,0L59,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M69,0L69,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M79,0L79,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M89,0L89,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M99,0L99,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,9L108,9"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,19L108,19"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,29L108,29"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,39L108,39"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,49L108,49"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,59L108,59"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,69L108,69"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,79L108,79"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,89L108,89"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,99L108,99"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,29L89,29"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,39L89,39"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,49L89,49"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,59L89,59"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,69L89,69"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,79L89,79"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M29,19L29,89"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M39,19L39,89"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M49,19L49,89"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M59,19L59,89"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M69,19L69,89"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M79,19L79,89"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
</vector>
|
@ -0,0 +1,19 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<android.support.constraint.ConstraintLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context=".MainActivity">
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Hello World!"
|
||||
android:id="@+id/tv_content"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
</android.support.constraint.ConstraintLayout>
|
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@drawable/ic_launcher_background" />
|
||||
<foreground android:drawable="@drawable/ic_launcher_foreground" />
|
||||
</adaptive-icon>
|
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@drawable/ic_launcher_background" />
|
||||
<foreground android:drawable="@drawable/ic_launcher_foreground" />
|
||||
</adaptive-icon>
|
After Width: | Height: | Size: 1.4 KiB |
After Width: | Height: | Size: 2.8 KiB |
After Width: | Height: | Size: 982 B |
After Width: | Height: | Size: 1.7 KiB |
After Width: | Height: | Size: 1.9 KiB |
After Width: | Height: | Size: 3.8 KiB |
After Width: | Height: | Size: 2.8 KiB |
After Width: | Height: | Size: 5.8 KiB |
After Width: | Height: | Size: 3.8 KiB |
After Width: | Height: | Size: 7.6 KiB |
@ -0,0 +1,10 @@
|
||||
<resources xmlns:tools="http://schemas.android.com/tools">
|
||||
<!-- Base application theme. -->
|
||||
<style name="Theme.Cls" parent="Theme.AppCompat.Light.DarkActionBar">
|
||||
<!-- Primary brand color. -->
|
||||
<item name="colorPrimary">@color/purple_200</item>
|
||||
<item name="colorPrimaryDark">@color/purple_700</item>
|
||||
<item name="colorAccent">@color/teal_200</item>
|
||||
<!-- Customize your theme here. -->
|
||||
</style>
|
||||
</resources>
|
@ -0,0 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="purple_200">#FFBB86FC</color>
|
||||
<color name="purple_500">#FF6200EE</color>
|
||||
<color name="purple_700">#FF3700B3</color>
|
||||
<color name="teal_200">#FF03DAC5</color>
|
||||
<color name="teal_700">#FF018786</color>
|
||||
<color name="black">#FF000000</color>
|
||||
<color name="white">#FFFFFFFF</color>
|
||||
</resources>
|
@ -0,0 +1,3 @@
|
||||
<resources>
|
||||
<string name="app_name">cls</string>
|
||||
</resources>
|
@ -0,0 +1,10 @@
|
||||
<resources xmlns:tools="http://schemas.android.com/tools">
|
||||
<!-- Base application theme. -->
|
||||
<style name="Theme.Cls" parent="Theme.AppCompat.Light.DarkActionBar">
|
||||
<!-- Primary brand color. -->
|
||||
<item name="colorPrimary">@color/purple_500</item>
|
||||
<item name="colorPrimaryDark">@color/purple_700</item>
|
||||
<item name="colorAccent">@color/teal_200</item>
|
||||
<!-- Customize your theme here. -->
|
||||
</style>
|
||||
</resources>
|
@ -0,0 +1,13 @@
|
||||
<?xml version="1.0" encoding="utf-8"?><!--
|
||||
Sample backup rules file; uncomment and customize as necessary.
|
||||
See https://developer.android.com/guide/topics/data/autobackup
|
||||
for details.
|
||||
Note: This file is ignored for devices older that API 31
|
||||
See https://developer.android.com/about/versions/12/backup-restore
|
||||
-->
|
||||
<full-backup-content>
|
||||
<!--
|
||||
<include domain="sharedpref" path="."/>
|
||||
<exclude domain="sharedpref" path="device.xml"/>
|
||||
-->
|
||||
</full-backup-content>
|
@ -0,0 +1,19 @@
|
||||
<?xml version="1.0" encoding="utf-8"?><!--
|
||||
Sample data extraction rules file; uncomment and customize as necessary.
|
||||
See https://developer.android.com/about/versions/12/backup-restore#xml-changes
|
||||
for details.
|
||||
-->
|
||||
<data-extraction-rules>
|
||||
<cloud-backup>
|
||||
<!-- TODO: Use <include> and <exclude> to control what is backed up.
|
||||
<include .../>
|
||||
<exclude .../>
|
||||
-->
|
||||
</cloud-backup>
|
||||
<!--
|
||||
<device-transfer>
|
||||
<include .../>
|
||||
<exclude .../>
|
||||
</device-transfer>
|
||||
-->
|
||||
</data-extraction-rules>
|
@ -0,0 +1,6 @@
|
||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||
plugins {
|
||||
id 'com.android.application' version '7.3.1' apply false
|
||||
id 'com.android.library' version '7.3.1' apply false
|
||||
id 'org.jetbrains.kotlin.android' version '1.7.20' apply false
|
||||
}
|
@ -0,0 +1,19 @@
|
||||
# Project-wide Gradle settings.
|
||||
# IDE (e.g. Android Studio) users:
|
||||
# Gradle settings configured through the IDE *will override*
|
||||
# any settings specified in this file.
|
||||
# For more details on how to configure your build environment visit
|
||||
# http://www.gradle.org/docs/current/userguide/build_environment.html
|
||||
# Specifies the JVM arguments used for the daemon process.
|
||||
# The setting is particularly useful for tweaking memory settings.
|
||||
org.gradle.jvmargs=-Xmx2048m -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
|
||||
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
||||
# org.gradle.parallel=true
|
||||
# Kotlin code style for this project: "official" or "obsolete":
|
||||
kotlin.code.style=official
|
||||
# Enables namespacing of each library's R class so that its R class includes only the
|
||||
# resources declared in the library itself and none from the library's dependencies,
|
||||
# thereby reducing the size of the R class for that library
|
||||
android.nonTransitiveRClass=true
|
@ -0,0 +1,6 @@
|
||||
#Mon Jan 16 16:37:04 CST 2023
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
|
||||
distributionPath=wrapper/dists
|
||||
zipStorePath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
@ -0,0 +1,185 @@
|
||||
#!/usr/bin/env sh
|
||||
|
||||
#
|
||||
# Copyright 2015 the original author or authors.
|
||||
#
|
||||
# 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
|
||||
#
|
||||
# https://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.
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
##
|
||||
## Gradle start up script for UN*X
|
||||
##
|
||||
##############################################################################
|
||||
|
||||
# Attempt to set APP_HOME
|
||||
# Resolve links: $0 may be a link
|
||||
PRG="$0"
|
||||
# Need this for relative symlinks.
|
||||
while [ -h "$PRG" ] ; do
|
||||
ls=`ls -ld "$PRG"`
|
||||
link=`expr "$ls" : '.*-> \(.*\)$'`
|
||||
if expr "$link" : '/.*' > /dev/null; then
|
||||
PRG="$link"
|
||||
else
|
||||
PRG=`dirname "$PRG"`"/$link"
|
||||
fi
|
||||
done
|
||||
SAVED="`pwd`"
|
||||
cd "`dirname \"$PRG\"`/" >/dev/null
|
||||
APP_HOME="`pwd -P`"
|
||||
cd "$SAVED" >/dev/null
|
||||
|
||||
APP_NAME="Gradle"
|
||||
APP_BASE_NAME=`basename "$0"`
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD="maximum"
|
||||
|
||||
warn () {
|
||||
echo "$*"
|
||||
}
|
||||
|
||||
die () {
|
||||
echo
|
||||
echo "$*"
|
||||
echo
|
||||
exit 1
|
||||
}
|
||||
|
||||
# OS specific support (must be 'true' or 'false').
|
||||
cygwin=false
|
||||
msys=false
|
||||
darwin=false
|
||||
nonstop=false
|
||||
case "`uname`" in
|
||||
CYGWIN* )
|
||||
cygwin=true
|
||||
;;
|
||||
Darwin* )
|
||||
darwin=true
|
||||
;;
|
||||
MINGW* )
|
||||
msys=true
|
||||
;;
|
||||
NONSTOP* )
|
||||
nonstop=true
|
||||
;;
|
||||
esac
|
||||
|
||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
if [ -n "$JAVA_HOME" ] ; then
|
||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||
# IBM's JDK on AIX uses strange locations for the executables
|
||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
||||
else
|
||||
JAVACMD="$JAVA_HOME/bin/java"
|
||||
fi
|
||||
if [ ! -x "$JAVACMD" ] ; then
|
||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD="java"
|
||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
|
||||
MAX_FD_LIMIT=`ulimit -H -n`
|
||||
if [ $? -eq 0 ] ; then
|
||||
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
||||
MAX_FD="$MAX_FD_LIMIT"
|
||||
fi
|
||||
ulimit -n $MAX_FD
|
||||
if [ $? -ne 0 ] ; then
|
||||
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
||||
fi
|
||||
else
|
||||
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
||||
fi
|
||||
fi
|
||||
|
||||
# For Darwin, add options to specify how the application appears in the dock
|
||||
if $darwin; then
|
||||
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
||||
fi
|
||||
|
||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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`
|
||||
SEP=""
|
||||
for dir in $ROOTDIRSRAW ; do
|
||||
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
||||
SEP="|"
|
||||
done
|
||||
OURCYGPATTERN="(^($ROOTDIRS))"
|
||||
# Add a user-defined pattern to the cygpath arguments
|
||||
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
|
||||
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
|
||||
fi
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
i=0
|
||||
for arg in "$@" ; do
|
||||
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
|
||||
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
|
||||
|
||||
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
|
||||
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
|
||||
else
|
||||
eval `echo args$i`="\"$arg\""
|
||||
fi
|
||||
i=`expr $i + 1`
|
||||
done
|
||||
case $i in
|
||||
0) set -- ;;
|
||||
1) set -- "$args0" ;;
|
||||
2) set -- "$args0" "$args1" ;;
|
||||
3) set -- "$args0" "$args1" "$args2" ;;
|
||||
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
||||
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
||||
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
||||
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
||||
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
||||
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# Escape application args
|
||||
save () {
|
||||
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
||||
echo " "
|
||||
}
|
||||
APP_ARGS=`save "$@"`
|
||||
|
||||
# Collect all arguments for the java command, following the shell quoting and substitution rules
|
||||
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
|
||||
|
||||
exec "$JAVACMD" "$@"
|
@ -0,0 +1,89 @@
|
||||
@rem
|
||||
@rem Copyright 2015 the original author or authors.
|
||||
@rem
|
||||
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
||||
@rem you may not use this file except in compliance with the License.
|
||||
@rem You may obtain a copy of the License at
|
||||
@rem
|
||||
@rem https://www.apache.org/licenses/LICENSE-2.0
|
||||
@rem
|
||||
@rem Unless required by applicable law or agreed to in writing, software
|
||||
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
||||
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
@rem See the License for the specific language governing permissions and
|
||||
@rem limitations under the License.
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%" == "" @echo off
|
||||
@rem ##########################################################################
|
||||
@rem
|
||||
@rem Gradle startup script for Windows
|
||||
@rem
|
||||
@rem ##########################################################################
|
||||
|
||||
@rem Set local scope for the variables with windows NT shell
|
||||
if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%" == "" set DIRNAME=.
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
||||
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
||||
|
||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
||||
|
||||
@rem Find java.exe
|
||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if "%ERRORLEVEL%" == "0" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
|
||||
goto fail
|
||||
|
||||
:findJavaFromJavaHome
|
||||
set JAVA_HOME=%JAVA_HOME:"=%
|
||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
|
||||
goto fail
|
||||
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
if "%ERRORLEVEL%"=="0" goto mainEnd
|
||||
|
||||
:fail
|
||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||
rem the _cmd.exe /c_ return code!
|
||||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
||||
exit /b 1
|
||||
|
||||
:mainEnd
|
||||
if "%OS%"=="Windows_NT" endlocal
|
||||
|
||||
:omega
|
@ -0,0 +1,16 @@
|
||||
pluginManagement {
|
||||
repositories {
|
||||
gradlePluginPortal()
|
||||
google()
|
||||
mavenCentral()
|
||||
}
|
||||
}
|
||||
dependencyResolutionManagement {
|
||||
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
|
||||
repositories {
|
||||
google()
|
||||
mavenCentral()
|
||||
}
|
||||
}
|
||||
rootProject.name = "cls"
|
||||
include ':app'
|
@ -0,0 +1,15 @@
|
||||
[CONF]
|
||||
wav_normal=true
|
||||
wav_normal_type=linear
|
||||
wav_norm_mul_factor=1.0
|
||||
model_path=./inference.onnx
|
||||
param_path=
|
||||
dict_path=./label_list
|
||||
num_cpu_thread=1
|
||||
samp_freq=32000
|
||||
frame_length_ms=32
|
||||
frame_shift_ms=10
|
||||
num_bins=64
|
||||
low_freq=50
|
||||
high_freq=14000
|
||||
dither=0.0
|
@ -0,0 +1,50 @@
|
||||
Dog
|
||||
Rooster
|
||||
Pig
|
||||
Cow
|
||||
Frog
|
||||
Cat
|
||||
Hen
|
||||
Insects (flying)
|
||||
Sheep
|
||||
Crow
|
||||
Rain
|
||||
Sea waves
|
||||
Crackling fire
|
||||
Crickets
|
||||
Chirping birds
|
||||
Water drops
|
||||
Wind
|
||||
Pouring water
|
||||
Toilet flush
|
||||
Thunderstorm
|
||||
Crying baby
|
||||
Sneezing
|
||||
Clapping
|
||||
Breathing
|
||||
Coughing
|
||||
Footsteps
|
||||
Laughing
|
||||
Brushing teeth
|
||||
Snoring
|
||||
Drinking, sipping
|
||||
Door knock
|
||||
Mouse click
|
||||
Keyboard typing
|
||||
Door, wood creaks
|
||||
Can opening
|
||||
Washing machine
|
||||
Vacuum cleaner
|
||||
Clock alarm
|
||||
Clock tick
|
||||
Glass breaking
|
||||
Helicopter
|
||||
Chainsaw
|
||||
Siren
|
||||
Car horn
|
||||
Engine
|
||||
Train
|
||||
Church bells
|
||||
Airplane
|
||||
Fireworks
|
||||
Hand saw
|
@ -0,0 +1 @@
|
||||
test.wav
|
@ -0,0 +1,2 @@
|
||||
#Wed Mar 29 16:03:45 CST 2023
|
||||
gradle.version=6.1.1
|
@ -0,0 +1,3 @@
|
||||
# Default ignored files
|
||||
/shelf/
|
||||
/workspace.xml
|
@ -0,0 +1 @@
|
||||
VAD
|
@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="CompilerConfiguration">
|
||||
<bytecodeTargetLevel target="11" />
|
||||
</component>
|
||||
</project>
|
@ -0,0 +1,20 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="GradleMigrationSettings" migrationVersion="1" />
|
||||
<component name="GradleSettings">
|
||||
<option name="linkedExternalProjectsSettings">
|
||||
<GradleProjectSettings>
|
||||
<option name="testRunner" value="GRADLE" />
|
||||
<option name="distributionType" value="DEFAULT_WRAPPED" />
|
||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||
<option name="modules">
|
||||
<set>
|
||||
<option value="$PROJECT_DIR$" />
|
||||
<option value="$PROJECT_DIR$/example" />
|
||||
<option value="$PROJECT_DIR$/vad" />
|
||||
</set>
|
||||
</option>
|
||||
</GradleProjectSettings>
|
||||
</option>
|
||||
</component>
|
||||
</project>
|
@ -0,0 +1,30 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="RemoteRepositoriesConfiguration">
|
||||
<remote-repository>
|
||||
<option name="id" value="central" />
|
||||
<option name="name" value="Maven Central repository" />
|
||||
<option name="url" value="https://repo1.maven.org/maven2" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="jboss.community" />
|
||||
<option name="name" value="JBoss Community repository" />
|
||||
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="BintrayJCenter" />
|
||||
<option name="name" value="BintrayJCenter" />
|
||||
<option name="url" value="https://jcenter.bintray.com/" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="maven" />
|
||||
<option name="name" value="maven" />
|
||||
<option name="url" value="https://jitpack.io" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="Google" />
|
||||
<option name="name" value="Google" />
|
||||
<option name="url" value="https://dl.google.com/dl/android/maven2/" />
|
||||
</remote-repository>
|
||||
</component>
|
||||
</project>
|
@ -0,0 +1,10 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||
</component>
|
||||
<component name="ProjectType">
|
||||
<option name="id" value="Android" />
|
||||
</component>
|
||||
</project>
|
@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
@ -0,0 +1,16 @@
|
||||
Copyright 2019 Georgiy Konovalov
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
|
||||
associated documentation files (the "Software"), to deal in the Software without restriction,
|
||||
including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
|
||||
subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all copies or substantial
|
||||
portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
|
||||
NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
|
||||
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
@ -0,0 +1,147 @@
|
||||
This VAD library can process audio in real-time utilizing
|
||||
[Gaussian Mixture Model](http://en.wikipedia.org/wiki/Mixture_model#Gaussian_mixture_model) (GMM)
|
||||
which helps identify presence of human speech in an audio sample that contains a mixture of speech
|
||||
and noise. VAD work offline and all processing done on device.
|
||||
|
||||
Library based on
|
||||
[WebRTC VAD](https://chromium.googlesource.com/external/webrtc/+/branch-heads/43/webrtc/common_audio/vad/)
|
||||
from Google which is reportedly one of the best available: it's fast, modern and free.
|
||||
This algorithm has found wide adoption and has recently become one of
|
||||
the gold-standards for delay-sensitive scenarios like web-based interaction.
|
||||
|
||||
If you are looking for a higher accuracy and faster processing time I recommend to use Deep Neural
|
||||
Networks(DNN). Please see for reference the following paper with
|
||||
[DNN vs GMM](https://www.microsoft.com/en-us/research/uploads/prod/2018/02/KoPhiliposeTashevZarar_ICASSP_2018.pdf)
|
||||
comparison.
|
||||
|
||||
<p align="center">
|
||||
<img src="https://raw.githubusercontent.com/gkonovalov/android-vad/master/demo.gif" alt="drawing" height="400"/>
|
||||
</p>
|
||||
|
||||
## Parameters
|
||||
VAD library only accepts 16-bit mono PCM audio stream and can work with next Sample Rates, Frame Sizes and Classifiers.
|
||||
<table>
|
||||
<tr>
|
||||
<td>
|
||||
 
|
||||
|
||||
| Valid Sample Rate | Valid Frame Size |
|
||||
|:-------------------|:------------------|
|
||||
| 8000Hz | 80, 160, 240 |
|
||||
| 16000Hz | 160, 320, 480 |
|
||||
| 32000Hz | 320, 640, 960 |
|
||||
| 48000Hz | 480, 960, 1440 |
|
||||
</td>
|
||||
<td>
|
||||
 
|
||||
|
||||
| Valid Classifiers |
|
||||
|:------------------|
|
||||
| NORMAL |
|
||||
| LOW_BITRATE |
|
||||
| AGGRESSIVE |
|
||||
| VERY_AGGRESSIVE |
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
|
||||
**Silence duration (ms)** - this parameter used in Continuous Speech detector,
|
||||
the value of this parameter will define the necessary and sufficient
|
||||
duration of negative results to recognize it as silence.
|
||||
|
||||
**Voice duration (ms)** - this parameter used in Continuous Speech detector,
|
||||
the value of this parameter will define the necessary and sufficient
|
||||
duration of positive results to recognize result as speech.
|
||||
|
||||
Recommended parameters:
|
||||
* Sample Rate - **16KHz**,
|
||||
* Frame Size - **160**,
|
||||
* Mode - **VERY_AGGRESSIVE**,
|
||||
* Silence Duration - **500ms**,
|
||||
* Voice Duration - **500ms**;
|
||||
|
||||
## Usage
|
||||
VAD supports 2 different ways of detecting speech:
|
||||
1. Continuous Speech listener was designed to detect long utterances
|
||||
without returning false positive results when user makes pauses between
|
||||
sentences.
|
||||
```java
|
||||
Vad vad = new Vad(VadConfig.newBuilder()
|
||||
.setSampleRate(VadConfig.SampleRate.SAMPLE_RATE_16K)
|
||||
.setFrameSize(VadConfig.FrameSize.FRAME_SIZE_160)
|
||||
.setMode(VadConfig.Mode.VERY_AGGRESSIVE)
|
||||
.setSilenceDurationMillis(500)
|
||||
.setVoiceDurationMillis(500)
|
||||
.build());
|
||||
|
||||
vad.start();
|
||||
|
||||
vad.addContinuousSpeechListener(short[] audioFrame, new VadListener() {
|
||||
@Override
|
||||
public void onSpeechDetected() {
|
||||
//speech detected!
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNoiseDetected() {
|
||||
//noise detected!
|
||||
}
|
||||
});
|
||||
|
||||
vad.stop();
|
||||
```
|
||||
|
||||
2. Speech detector was designed to detect speech/noise in small audio
|
||||
frames and return result for every frame. This method will not work for
|
||||
long utterances.
|
||||
```java
|
||||
Vad vad = new Vad(VadConfig.newBuilder()
|
||||
.setSampleRate(VadConfig.SampleRate.SAMPLE_RATE_16K)
|
||||
.setFrameSize(VadConfig.FrameSize.FRAME_SIZE_160)
|
||||
.setMode(VadConfig.Mode.VERY_AGGRESSIVE)
|
||||
.build());
|
||||
|
||||
vad.start();
|
||||
|
||||
boolean isSpeech = vad.isSpeech(short[] audioFrame);
|
||||
|
||||
vad.stop();
|
||||
```
|
||||
## Requirements
|
||||
Android VAD supports Android 4.1 (Jelly Bean) and later.
|
||||
|
||||
## Development
|
||||
|
||||
To open the project in Android Studio:
|
||||
|
||||
1. Go to *File* menu or the *Welcome Screen*
|
||||
2. Click on *Open...*
|
||||
3. Navigate to VAD's root directory.
|
||||
4. Select `setting.gradle`
|
||||
|
||||
## Download
|
||||
[](https://jitpack.io/#gkonovalov/android-vad)
|
||||
|
||||
|
||||
Gradle is the only supported build configuration, so just add the dependency to your project `build.gradle` file:
|
||||
1. Add it in your root build.gradle at the end of repositories:
|
||||
```groovy
|
||||
allprojects {
|
||||
repositories {
|
||||
maven { url 'https://jitpack.io' }
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
2. Add the dependency
|
||||
```groovy
|
||||
dependencies {
|
||||
implementation 'com.github.gkonovalov:android-vad:1.0.1'
|
||||
}
|
||||
```
|
||||
|
||||
You also can download precompiled AAR library and APK files from GitHub's [releases page](https://github.com/gkonovalov/android-vad/releases).
|
||||
|
||||
------------
|
||||
Georgiy Konovalov 2021 (c) [MIT License](https://opensource.org/licenses/MIT)
|
@ -0,0 +1,28 @@
|
||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||
|
||||
buildscript {
|
||||
repositories {
|
||||
google()
|
||||
jcenter()
|
||||
maven { url 'https://jitpack.io' }
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:4.0.2'
|
||||
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
|
||||
// NOTE: Do not place your application dependencies here; they belong
|
||||
// in the individual module build.gradle files
|
||||
}
|
||||
}
|
||||
|
||||
allprojects {
|
||||
repositories {
|
||||
google()
|
||||
jcenter()
|
||||
maven { url 'https://jitpack.io' }
|
||||
}
|
||||
}
|
||||
|
||||
task clean(type: Delete) {
|
||||
delete rootProject.buildDir
|
||||
}
|
After Width: | Height: | Size: 73 KiB |
@ -0,0 +1 @@
|
||||
/build
|
@ -0,0 +1,39 @@
|
||||
apply plugin: 'com.android.application'
|
||||
|
||||
android {
|
||||
compileSdkVersion 29
|
||||
buildToolsVersion "29.0.2"
|
||||
defaultConfig {
|
||||
applicationId "com.konovalov.vad.example"
|
||||
minSdkVersion 16
|
||||
targetSdkVersion 29
|
||||
versionCode 2
|
||||
versionName "1.0.1"
|
||||
|
||||
setProperty("archivesBaseName", "Android-VAD-v" + versionName)
|
||||
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
buildTypes {
|
||||
release {
|
||||
minifyEnabled false
|
||||
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||
implementation 'androidx.appcompat:appcompat:1.3.0'
|
||||
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
|
||||
|
||||
implementation 'com.airbnb.android:lottie:3.4.0'
|
||||
implementation 'org.permissionsdispatcher:permissionsdispatcher:4.8.0'
|
||||
annotationProcessor 'org.permissionsdispatcher:permissionsdispatcher-processor:4.8.0'
|
||||
implementation project(path: ':vad')
|
||||
|
||||
testImplementation 'junit:junit:4.12'
|
||||
androidTestImplementation 'androidx.test:runner:1.3.0'
|
||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
|
||||
implementation 'com.google.android.material:material:1.3.0'
|
||||
}
|
@ -0,0 +1,9 @@
|
||||
## This file must *NOT* be checked into Version Control Systems,
|
||||
# as it contains information specific to your local configuration.
|
||||
#
|
||||
# Location of the SDK. This is only used by Gradle.
|
||||
# For customization when using a Version Control System, please read the
|
||||
# header note.
|
||||
#Thu Mar 30 16:37:21 CST 2023
|
||||
sdk.dir=/Users/masimeng/Library/Android/sdk
|
||||
ndk.dir=/Users/masimeng/Library/Android/sdk/ndk/23.1.7779620/
|
@ -0,0 +1,21 @@
|
||||
# Add project specific ProGuard rules here.
|
||||
# You can control the set of applied configuration files using the
|
||||
# proguardFiles setting in build.gradle.
|
||||
#
|
||||
# For more details, see
|
||||
# http://developer.android.com/guide/developing/tools/proguard.html
|
||||
|
||||
# If your project uses WebView with JS, uncomment the following
|
||||
# and specify the fully qualified class name to the JavaScript interface
|
||||
# class:
|
||||
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
|
||||
# public *;
|
||||
#}
|
||||
|
||||
# Uncomment this to preserve the line number information for
|
||||
# debugging stack traces.
|
||||
#-keepattributes SourceFile,LineNumberTable
|
||||
|
||||
# If you keep the line number information, uncomment this to
|
||||
# hide the original source file name.
|
||||
#-renamesourcefileattribute SourceFile
|
@ -0,0 +1,27 @@
|
||||
package com.konovalov.vad.example;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
import androidx.test.platform.app.InstrumentationRegistry;
|
||||
import androidx.test.runner.AndroidJUnit4;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
/**
|
||||
* Instrumented test, which will execute on an Android device.
|
||||
*
|
||||
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
|
||||
*/
|
||||
@RunWith(AndroidJUnit4.class)
|
||||
public class ExampleInstrumentedTest {
|
||||
@Test
|
||||
public void useAppContext() {
|
||||
// Context of the app under test.
|
||||
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
|
||||
|
||||
assertEquals("com.konovalov.vad.example", appContext.getPackageName());
|
||||
}
|
||||
}
|
@ -0,0 +1,27 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
package="com.konovalov.vad.example">
|
||||
|
||||
<uses-permission android:name="android.permission.RECORD_AUDIO" />
|
||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
|
||||
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
|
||||
tools:ignore="ProtectedPermissions"></uses-permission>
|
||||
|
||||
<application
|
||||
android:allowBackup="true"
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
android:label="@string/app_name"
|
||||
android:roundIcon="@mipmap/ic_launcher_round"
|
||||
android:screenOrientation="portrait"
|
||||
android:theme="@style/AppTheme.NoActionBar">
|
||||
<activity android:name=".MainActivity">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
</application>
|
||||
|
||||
</manifest>
|
@ -0,0 +1,204 @@
|
||||
package com.konovalov.vad.example;
|
||||
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
|
||||
import android.Manifest;
|
||||
import android.os.Bundle;
|
||||
import android.view.View;
|
||||
import android.widget.AdapterView;
|
||||
import android.widget.ArrayAdapter;
|
||||
import android.widget.Spinner;
|
||||
import android.widget.TextView;
|
||||
|
||||
import com.google.android.material.floatingactionbutton.FloatingActionButton;
|
||||
import com.konovalov.vad.Vad;
|
||||
import com.konovalov.vad.example.recorder.VoiceRecorder;
|
||||
import com.konovalov.vad.example.recorder.VoiceRecorderConfig;
|
||||
|
||||
import java.util.LinkedList;
|
||||
|
||||
import permissions.dispatcher.NeedsPermission;
|
||||
import permissions.dispatcher.RuntimePermissions;
|
||||
|
||||
@RuntimePermissions
|
||||
public class MainActivity extends AppCompatActivity implements VoiceRecorder.Listener, View.OnClickListener, AdapterView.OnItemSelectedListener {
|
||||
|
||||
private VoiceRecorderConfig.SampleRate DEFAULT_SAMPLE_RATE = VoiceRecorderConfig.SampleRate.SAMPLE_RATE_16K;
|
||||
private VoiceRecorderConfig.FrameSize DEFAULT_FRAME_SIZE = VoiceRecorderConfig.FrameSize.FRAME_SIZE_1536;
|
||||
// private VoiceRecorderConfig.Mode DEFAULT_MODE = VoiceRecorderConfig.Mode.VERY_AGGRESSIVE;
|
||||
|
||||
// private int DEFAULT_SILENCE_DURATION = 500;
|
||||
// private int DEFAULT_VOICE_DURATION = 500;
|
||||
|
||||
private final String SPINNER_SAMPLE_RATE_TAG = "sample_rate";
|
||||
private final String SPINNER_FRAME_SIZE_TAG = "frame_size";
|
||||
// private final String SPINNER_MODE_TAG = "mode";
|
||||
|
||||
private FloatingActionButton recordingActionButton;
|
||||
private TextView speechTextView;
|
||||
private Spinner sampleRateSpinner;
|
||||
private Spinner frameSpinner;
|
||||
// private Spinner modeSpinner;
|
||||
|
||||
private ArrayAdapter sampleRateAdapter;
|
||||
private ArrayAdapter frameAdapter;
|
||||
// private ArrayAdapter modeAdapter;
|
||||
|
||||
private VoiceRecorder recorder;
|
||||
private VoiceRecorderConfig config;
|
||||
private boolean isRecording = false;
|
||||
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_main);
|
||||
|
||||
config = VoiceRecorderConfig.newBuilder()
|
||||
.setSampleRate(DEFAULT_SAMPLE_RATE)
|
||||
.setFrameSize(DEFAULT_FRAME_SIZE)
|
||||
// .setMode(DEFAULT_MODE)
|
||||
// .setSilenceDurationMillis(DEFAULT_SILENCE_DURATION)
|
||||
// .setVoiceDurationMillis(DEFAULT_VOICE_DURATION)
|
||||
.build();
|
||||
|
||||
recorder = new VoiceRecorder(this, config);
|
||||
|
||||
speechTextView = findViewById(R.id.speechTextView);
|
||||
sampleRateSpinner = findViewById(R.id.sampleRateSpinner);
|
||||
sampleRateAdapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item, getSampleRates());
|
||||
sampleRateSpinner.setAdapter(sampleRateAdapter);
|
||||
sampleRateSpinner.setTag(SPINNER_SAMPLE_RATE_TAG);
|
||||
sampleRateSpinner.setSelection(getSampleRates().indexOf(DEFAULT_SAMPLE_RATE.name()), false);
|
||||
sampleRateSpinner.setOnItemSelectedListener(this);
|
||||
|
||||
frameSpinner = findViewById(R.id.frameSampleRateSpinner);
|
||||
frameAdapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item, getFrameSizes());
|
||||
frameSpinner.setAdapter(frameAdapter);
|
||||
frameSpinner.setTag(SPINNER_FRAME_SIZE_TAG);
|
||||
frameSpinner.setSelection(getFrameSizes().indexOf(DEFAULT_FRAME_SIZE.name()), false);
|
||||
frameSpinner.setOnItemSelectedListener(this);
|
||||
|
||||
// modeSpinner = findViewById(R.id.modeSpinner);
|
||||
// modeAdapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item, getModes());
|
||||
// modeSpinner.setAdapter(modeAdapter);
|
||||
// modeSpinner.setTag(SPINNER_MODE_TAG);
|
||||
// modeSpinner.setSelection(getModes().indexOf(DEFAULT_MODE.name()), false);
|
||||
// modeSpinner.setOnItemSelectedListener(this);
|
||||
|
||||
recordingActionButton = findViewById(R.id.recordingActionButton);
|
||||
recordingActionButton.setOnClickListener(this);
|
||||
recordingActionButton.setEnabled(false);
|
||||
|
||||
MainActivityPermissionsDispatcher.activateAudioPermissionWithPermissionCheck(this);
|
||||
}
|
||||
|
||||
private LinkedList<String> getSampleRates() {
|
||||
LinkedList<String> result = new LinkedList<>();
|
||||
for (VoiceRecorderConfig.SampleRate sampleRate : VoiceRecorderConfig.SampleRate.values()) {
|
||||
result.add(sampleRate.name());
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
private LinkedList<String> getFrameSizes() {
|
||||
LinkedList<String> result = new LinkedList<>();
|
||||
result.add(VoiceRecorderConfig.FrameSize.FRAME_SIZE_1536.name());
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
// private LinkedList<String> getModes() {
|
||||
// LinkedList<String> result = new LinkedList<>();
|
||||
// for (VadConfig.Mode mode : VadConfig.Mode.values()) {
|
||||
// result.add(mode.name());
|
||||
// }
|
||||
// return result;
|
||||
// }
|
||||
|
||||
private void startRecording() {
|
||||
isRecording = true;
|
||||
recorder.start();
|
||||
recordingActionButton.setImageResource(R.drawable.stop);
|
||||
}
|
||||
|
||||
private void stopRecording() {
|
||||
isRecording = false;
|
||||
recorder.stop();
|
||||
recordingActionButton.setImageResource(R.drawable.red_dot);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onItemSelected(AdapterView<?> adapterView, View view, int position, long l) {
|
||||
stopRecording();
|
||||
|
||||
switch (String.valueOf(adapterView.getTag())) {
|
||||
case SPINNER_SAMPLE_RATE_TAG:
|
||||
config.setSampleRate(VoiceRecorderConfig.SampleRate.valueOf(String.valueOf(sampleRateAdapter.getItem(position))));
|
||||
|
||||
frameAdapter.clear();
|
||||
frameAdapter.addAll(getFrameSizes());
|
||||
frameAdapter.notifyDataSetChanged();
|
||||
frameSpinner.setSelection(0);
|
||||
|
||||
config.setFrameSize(VoiceRecorderConfig.FrameSize.valueOf(String.valueOf(frameAdapter.getItem(0))));
|
||||
break;
|
||||
case SPINNER_FRAME_SIZE_TAG:
|
||||
config.setFrameSize(VoiceRecorderConfig.FrameSize.valueOf(String.valueOf(frameAdapter.getItem(position))));
|
||||
break;
|
||||
// case SPINNER_MODE_TAG:
|
||||
// config.setMode(VadConfig.Mode.valueOf(String.valueOf(modeAdapter.getItem(position))));
|
||||
// break;
|
||||
}
|
||||
|
||||
recorder.updateConfig(config);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNothingSelected(AdapterView<?> parent) {
|
||||
}
|
||||
|
||||
|
||||
@NeedsPermission(Manifest.permission.RECORD_AUDIO)
|
||||
public void activateAudioPermission() {
|
||||
recordingActionButton.setEnabled(true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
if (!isRecording) {
|
||||
startRecording();
|
||||
} else {
|
||||
stopRecording();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onSpeechDetected() {
|
||||
runOnUiThread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
speechTextView.setText(R.string.speech_detected);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNoiseDetected() {
|
||||
runOnUiThread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
speechTextView.setText(R.string.noise_detected);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
|
||||
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
|
||||
// NOTE: delegate the permission handling to generated method
|
||||
MainActivityPermissionsDispatcher.onRequestPermissionsResult(this, requestCode, grantResults);
|
||||
}
|
||||
|
||||
|
||||
}
|
@ -0,0 +1,151 @@
|
||||
package com.konovalov.vad.example.recorder;
|
||||
|
||||
import android.media.AudioFormat;
|
||||
import android.media.AudioRecord;
|
||||
import android.media.MediaRecorder;
|
||||
import android.util.Log;
|
||||
|
||||
import com.konovalov.vad.example.recorder.VoiceRecorderConfig;
|
||||
|
||||
import com.konovalov.vad.Vad;
|
||||
//import com.konovalov.vad.VadConfig;
|
||||
import com.konovalov.vad.VadListener;
|
||||
|
||||
import static android.media.AudioFormat.CHANNEL_IN_MONO;
|
||||
import static android.media.AudioFormat.CHANNEL_IN_STEREO;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
/**
|
||||
* Created by George Konovalov on 11/16/2019.
|
||||
*/
|
||||
|
||||
public class VoiceRecorder {
|
||||
private static final int PCM_CHANNEL = CHANNEL_IN_MONO;
|
||||
private static final int PCM_ENCODING_BIT = AudioFormat.ENCODING_PCM_16BIT;
|
||||
|
||||
private VoiceRecorderConfig config;
|
||||
private Vad vad;
|
||||
private AudioRecord audioRecord;
|
||||
private Listener callback;
|
||||
private Thread thread;
|
||||
|
||||
private boolean isListening = false;
|
||||
|
||||
private static final String TAG = VoiceRecorder.class.getSimpleName();
|
||||
|
||||
public VoiceRecorder(Listener callback, VoiceRecorderConfig config) {
|
||||
this.callback = callback;
|
||||
this.config = config;
|
||||
this.vad = new Vad();
|
||||
}
|
||||
|
||||
public void updateConfig(VoiceRecorderConfig config) {
|
||||
this.config = config;
|
||||
}
|
||||
|
||||
public void start() {
|
||||
stop();
|
||||
audioRecord = createAudioRecord();
|
||||
if (audioRecord != null) {
|
||||
isListening = true;
|
||||
audioRecord.startRecording();
|
||||
|
||||
thread = new Thread(new ProcessVoice());
|
||||
thread.start();
|
||||
vad.start();
|
||||
} else {
|
||||
Log.w(TAG, "Failed start Voice Recorder!");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public void stop() {
|
||||
isListening = false;
|
||||
if (thread != null) {
|
||||
thread.interrupt();
|
||||
thread = null;
|
||||
}
|
||||
if (audioRecord != null) {
|
||||
try {
|
||||
audioRecord.release();
|
||||
} catch (Exception e) {
|
||||
Log.e(TAG, "Error stop AudioRecord ", e);
|
||||
}
|
||||
audioRecord = null;
|
||||
}
|
||||
if (vad != null) {
|
||||
vad.stop();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private AudioRecord createAudioRecord() {
|
||||
try {
|
||||
final int minBufSize = AudioRecord.getMinBufferSize(config.getSampleRate().getValue(), PCM_CHANNEL, PCM_ENCODING_BIT);
|
||||
int frame_size = config.getFrameSize().getValue();
|
||||
if (minBufSize > frame_size) {
|
||||
Log.e(TAG, "minBufSize > frame_size");
|
||||
return null;
|
||||
}
|
||||
Log.i(TAG, "minBufSize : " + minBufSize);
|
||||
final AudioRecord audioRecord = new AudioRecord(MediaRecorder.AudioSource.MIC, config.getSampleRate().getValue(), PCM_CHANNEL, PCM_ENCODING_BIT, frame_size);
|
||||
Log.i(TAG, "config.getSampleRate().getValue() : " + config.getSampleRate().getValue());
|
||||
|
||||
if (audioRecord.getState() == AudioRecord.STATE_INITIALIZED) {
|
||||
return audioRecord;
|
||||
} else {
|
||||
audioRecord.release();
|
||||
}
|
||||
} catch (IllegalArgumentException e) {
|
||||
Log.e(TAG, "Error can't create AudioRecord ", e);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private int getNumberOfChannels() {
|
||||
switch (PCM_CHANNEL) {
|
||||
case CHANNEL_IN_MONO:
|
||||
return 1;
|
||||
case CHANNEL_IN_STEREO:
|
||||
return 2;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
private class ProcessVoice implements Runnable {
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
android.os.Process.setThreadPriority(android.os.Process.THREAD_PRIORITY_AUDIO);
|
||||
final int minBufSize = AudioRecord.getMinBufferSize(config.getSampleRate().getValue(), PCM_CHANNEL, PCM_ENCODING_BIT);
|
||||
while (!Thread.interrupted() && isListening && audioRecord != null) {
|
||||
short[] buffer = new short[config.getFrameSize().getValue()];
|
||||
audioRecord.read(buffer, 0, buffer.length);
|
||||
detectSpeech(buffer);
|
||||
}
|
||||
}
|
||||
|
||||
private void detectSpeech(short[] buffer) {
|
||||
vad.addContinuousSpeechListener(buffer, new VadListener() {
|
||||
@Override
|
||||
public void onSpeechDetected() {
|
||||
callback.onSpeechDetected();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNoiseDetected() {
|
||||
callback.onNoiseDetected();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
public interface Listener {
|
||||
void onSpeechDetected();
|
||||
|
||||
void onNoiseDetected();
|
||||
}
|
||||
|
||||
}
|
@ -0,0 +1,157 @@
|
||||
package com.konovalov.vad.example.recorder;
|
||||
|
||||
|
||||
/**
|
||||
* Created by George Konovalov on 11/16/2019.
|
||||
*/
|
||||
|
||||
public class VoiceRecorderConfig {
|
||||
private SampleRate sampleRate;
|
||||
private Mode mode;
|
||||
private FrameSize frameSize;
|
||||
private int voiceDurationMillis;
|
||||
private int silenceDurationMillis;
|
||||
|
||||
public VoiceRecorderConfig() {
|
||||
}
|
||||
|
||||
public VoiceRecorderConfig(Builder builder) {
|
||||
this.voiceDurationMillis = builder.voiceDurationMillis;
|
||||
this.silenceDurationMillis = builder.silenceDurationMillis;
|
||||
this.sampleRate = builder.sampleRate;
|
||||
this.frameSize = builder.frameSize;
|
||||
this.mode = builder.mode;
|
||||
}
|
||||
|
||||
public SampleRate getSampleRate() {
|
||||
return sampleRate;
|
||||
}
|
||||
|
||||
public Mode getMode() {
|
||||
return mode;
|
||||
}
|
||||
|
||||
public FrameSize getFrameSize() {
|
||||
return frameSize;
|
||||
}
|
||||
|
||||
public int getVoiceDurationMillis() {
|
||||
return voiceDurationMillis;
|
||||
}
|
||||
|
||||
public int getSilenceDurationMillis() {
|
||||
return silenceDurationMillis;
|
||||
}
|
||||
|
||||
public void setSampleRate(SampleRate sampleRate) {
|
||||
this.sampleRate = sampleRate;
|
||||
}
|
||||
|
||||
public void setMode(Mode mode) {
|
||||
this.mode = mode;
|
||||
}
|
||||
|
||||
public void setFrameSize(FrameSize frameSize) {
|
||||
this.frameSize = frameSize;
|
||||
}
|
||||
|
||||
public void setVoiceDurationMillis(int voiceDurationMillis) {
|
||||
this.voiceDurationMillis = voiceDurationMillis;
|
||||
}
|
||||
|
||||
public void setSilenceDurationMillis(int silenceDurationMillis) {
|
||||
this.silenceDurationMillis = silenceDurationMillis;
|
||||
}
|
||||
|
||||
public static Builder newBuilder() {
|
||||
return new Builder();
|
||||
}
|
||||
|
||||
public static class Builder {
|
||||
private SampleRate sampleRate = SampleRate.SAMPLE_RATE_16K;
|
||||
private Mode mode = Mode.VERY_AGGRESSIVE;
|
||||
private FrameSize frameSize;
|
||||
private int voiceDurationMillis = 500;
|
||||
private int silenceDurationMillis = 500;
|
||||
|
||||
private Builder() {
|
||||
}
|
||||
|
||||
public Builder setSampleRate(SampleRate sampleRate) {
|
||||
this.sampleRate = sampleRate;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder setMode(Mode mode) {
|
||||
this.mode = mode;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder setFrameSize(FrameSize frameSize) {
|
||||
this.frameSize = frameSize;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder setVoiceDurationMillis(int voiceDurationMillis) {
|
||||
this.voiceDurationMillis = voiceDurationMillis;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder setSilenceDurationMillis(int silenceDurationMillis) {
|
||||
this.silenceDurationMillis = silenceDurationMillis;
|
||||
return this;
|
||||
}
|
||||
|
||||
public VoiceRecorderConfig build() {
|
||||
return new VoiceRecorderConfig(this);
|
||||
}
|
||||
}
|
||||
|
||||
public enum SampleRate {
|
||||
SAMPLE_RATE_16K(16000);
|
||||
|
||||
private int sampleRate;
|
||||
|
||||
public int getValue() {
|
||||
return sampleRate;
|
||||
}
|
||||
|
||||
SampleRate(int sampleRate) {
|
||||
this.sampleRate = sampleRate;
|
||||
}
|
||||
}
|
||||
|
||||
public enum Mode {
|
||||
NORMAL(0),
|
||||
LOW_BITRATE(1),
|
||||
AGGRESSIVE(2),
|
||||
VERY_AGGRESSIVE(3);
|
||||
|
||||
private int mode;
|
||||
|
||||
public int getValue() {
|
||||
return mode;
|
||||
}
|
||||
|
||||
Mode(int mode) {
|
||||
this.mode = mode;
|
||||
}
|
||||
}
|
||||
|
||||
public enum FrameSize {
|
||||
FRAME_SIZE_1536(1536);
|
||||
|
||||
private int frameSize;
|
||||
|
||||
public int getValue() {
|
||||
return frameSize;
|
||||
}
|
||||
|
||||
FrameSize(int frameSize) {
|
||||
this.frameSize = frameSize;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|