diff --git a/.github/workflows/apk-audio-tagging-wearos.yaml b/.github/workflows/apk-audio-tagging-wearos.yaml new file mode 100644 index 00000000..67fb1ea3 --- /dev/null +++ b/.github/workflows/apk-audio-tagging-wearos.yaml @@ -0,0 +1,174 @@ +name: apk-audio-tagging-wearos + +on: + push: + tags: + - '*' + + workflow_dispatch: + +concurrency: + group: apk-audio-tagging-wearos-${{ github.ref }} + cancel-in-progress: true + +permissions: + contents: write + +jobs: + apk_audio_tagging_wearos: + if: github.repository_owner == 'csukuangfj' || github.repository_owner == 'k2-fsa' + runs-on: ${{ matrix.os }} + name: apk for WearOS ${{ matrix.index }}/${{ matrix.total }} + strategy: + fail-fast: false + matrix: + os: [ubuntu-latest] + total: ["1"] + index: ["0"] + + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + + # https://github.com/actions/setup-java + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' # See 'Supported distributions' for available options + java-version: '21' + + - name: ccache + uses: hendrikmuhs/ccache-action@v1.2 + with: + key: ${{ matrix.os }}-android + + - name: Display NDK HOME + shell: bash + run: | + echo "ANDROID_NDK_LATEST_HOME: ${ANDROID_NDK_LATEST_HOME}" + ls -lh ${ANDROID_NDK_LATEST_HOME} + + - name: Install Python dependencies + shell: bash + run: | + python3 -m pip install --upgrade pip jinja2 + + - name: Setup build tool version variable + shell: bash + run: | + echo "---" + ls -lh /usr/local/lib/android/ + echo "---" + + ls -lh /usr/local/lib/android/sdk + echo "---" + + ls -lh /usr/local/lib/android/sdk/build-tools + echo "---" + + BUILD_TOOL_VERSION=$(ls /usr/local/lib/android/sdk/build-tools/ | tail -n 1) + echo "BUILD_TOOL_VERSION=$BUILD_TOOL_VERSION" >> $GITHUB_ENV + echo "Last build tool version is: $BUILD_TOOL_VERSION" + + - name: Generate build script + shell: bash + run: | + cd scripts/apk + + total=${{ matrix.total }} + index=${{ matrix.index }} + + ./generate-audio-tagging-apk-script.py --total $total --index $index + + chmod +x build-apk-audio-tagging-wearos.sh + mv -v ./build-apk-audio-tagging-wearos.sh ../.. + + - name: build APK + shell: bash + run: | + export CMAKE_CXX_COMPILER_LAUNCHER=ccache + export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" + cmake --version + + export ANDROID_NDK=$ANDROID_NDK_LATEST_HOME + ./build-apk-audio-tagging-wearos.sh + + - name: Display APK + shell: bash + run: | + ls -lh ./apks/ + du -h -d1 . + + # https://github.com/marketplace/actions/sign-android-release + - uses: r0adkll/sign-android-release@v1 + name: Sign app APK + with: + releaseDirectory: ./apks + signingKeyBase64: ${{ secrets.ANDROID_SIGNING_KEY }} + alias: ${{ secrets.ANDROID_SIGNING_KEY_ALIAS }} + keyStorePassword: ${{ secrets.ANDROID_SIGNING_KEY_STORE_PASSWORD }} + env: + BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }} + + - name: Display APK for audio tagging after signing + shell: bash + run: | + ls -lh ./apks/ + du -h -d1 . + + - name: Rename APK for audio tagging after signing + shell: bash + run: | + cd apks + rm -fv signingKey.jks + rm -fv *.apk.idsig + rm -fv *-aligned.apk + + all_apks=$(ls -1 *-signed.apk) + echo "----" + echo $all_apks + echo "----" + for apk in ${all_apks[@]}; do + n=$(echo $apk | sed -e s/-signed//) + mv -v $apk $n + done + + cd .. + + ls -lh ./apks/ + du -h -d1 . + + - name: Display APK after rename + shell: bash + run: | + ls -lh ./apks/ + du -h -d1 . + + - name: Publish to huggingface + env: + HF_TOKEN: ${{ secrets.HF_TOKEN }} + uses: nick-fields/retry@v3 + with: + max_attempts: 20 + timeout_seconds: 200 + shell: bash + command: | + git config --global user.email "csukuangfj@gmail.com" + git config --global user.name "Fangjun Kuang" + + rm -rf huggingface + export GIT_LFS_SKIP_SMUDGE=1 + + git clone https://huggingface.co/csukuangfj/sherpa-onnx-apk huggingface + cd huggingface + git fetch + git pull + git merge -m "merge remote" --ff origin main + + mkdir -p audio-tagging-wearos + cp -v ../apks/*.apk ./audio-tagging-wearos/ + git status + git lfs track "*.apk" + git add . + git commit -m "add more apks" + git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/sherpa-onnx-apk main diff --git a/.github/workflows/test-build-wheel.yaml b/.github/workflows/test-build-wheel.yaml index c7c36f87..0100e10b 100644 --- a/.github/workflows/test-build-wheel.yaml +++ b/.github/workflows/test-build-wheel.yaml @@ -90,7 +90,7 @@ jobs: export PATH=/c/hostedtoolcache/windows/Python/3.9.13/x64/bin:$PATH export PATH=/c/hostedtoolcache/windows/Python/3.10.11/x64/bin:$PATH export PATH=/c/hostedtoolcache/windows/Python/3.11.9/x64/bin:$PATH - export PATH=/c/hostedtoolcache/windows/Python/3.12.2/x64/bin:$PATH + export PATH=/c/hostedtoolcache/windows/Python/3.12.3/x64/bin:$PATH which sherpa-onnx sherpa-onnx --help diff --git a/.github/workflows/test-pip-install.yaml b/.github/workflows/test-pip-install.yaml index 381df814..ca1fdbd8 100644 --- a/.github/workflows/test-pip-install.yaml +++ b/.github/workflows/test-pip-install.yaml @@ -68,7 +68,7 @@ jobs: export PATH=/c/hostedtoolcache/windows/Python/3.9.13/x64/bin:$PATH export PATH=/c/hostedtoolcache/windows/Python/3.10.11/x64/bin:$PATH export PATH=/c/hostedtoolcache/windows/Python/3.11.9/x64/bin:$PATH - export PATH=/c/hostedtoolcache/windows/Python/3.12.2/x64/bin:$PATH + export PATH=/c/hostedtoolcache/windows/Python/3.12.3/x64/bin:$PATH sherpa-onnx --help sherpa-onnx-keyword-spotter --help diff --git a/.github/workflows/wasm-simd-hf-space-zh-en-asr-paraformer.yaml b/.github/workflows/wasm-simd-hf-space-zh-en-asr-paraformer.yaml index cb92b7a1..6fdd35cc 100644 --- a/.github/workflows/wasm-simd-hf-space-zh-en-asr-paraformer.yaml +++ b/.github/workflows/wasm-simd-hf-space-zh-en-asr-paraformer.yaml @@ -40,7 +40,7 @@ jobs: ls -lh echo "----------" - wget https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-streaming-paraformer-bilingual-zh-en.tar.bz2 + curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-streaming-paraformer-bilingual-zh-en.tar.bz2 tar xvf sherpa-onnx-streaming-paraformer-bilingual-zh-en.tar.bz2 rm sherpa-onnx-streaming-paraformer-bilingual-zh-en.tar.bz2 diff --git a/android/README.md b/android/README.md index 705049f8..42b29e08 100644 --- a/android/README.md +++ b/android/README.md @@ -26,3 +26,7 @@ for usage. - [SherpaOnnxWebSocket](./SherpaOnnxWebSocket) It shows how to write a websocket client for the Python streaming websocket server. + +- [SherpaOnnxAudioTagging](./SherpaOnnxAudioTagging) It shows how to use audio tagging. + +- [SherpaOnnxAudioTaggingWearOS](./SherpaOnnxAudioTagging) It shows how to use audio tagging on WearOS. diff --git a/android/SherpaOnnxAudioTagging/app/src/main/java/com/k2fsa/sherpa/onnx/audio/tagging/AudioTagging.kt b/android/SherpaOnnxAudioTagging/app/src/main/java/com/k2fsa/sherpa/onnx/audio/tagging/AudioTagging.kt index b3c85069..9c4b5ceb 100644 --- a/android/SherpaOnnxAudioTagging/app/src/main/java/com/k2fsa/sherpa/onnx/audio/tagging/AudioTagging.kt +++ b/android/SherpaOnnxAudioTagging/app/src/main/java/com/k2fsa/sherpa/onnx/audio/tagging/AudioTagging.kt @@ -103,14 +103,14 @@ class AudioTagging( // // See also // https://k2-fsa.github.io/sherpa/onnx/audio-tagging/ -fun getAudioTaggingConfig(type: Int): AudioTaggingConfig? { +fun getAudioTaggingConfig(type: Int, numThreads: Int=1): AudioTaggingConfig? { when (type) { 0 -> { val modelDir = "sherpa-onnx-zipformer-small-audio-tagging-2024-04-15" return AudioTaggingConfig( model = AudioTaggingModelConfig( zipformer = OfflineZipformerAudioTaggingModelConfig(model = "$modelDir/model.int8.onnx"), - numThreads = 1, + numThreads = numThreads, debug = true, ), labels = "$modelDir/class_labels_indices.csv", diff --git a/android/SherpaOnnxAudioTagging/app/src/main/java/com/k2fsa/sherpa/onnx/audio/tagging/Tagger.kt b/android/SherpaOnnxAudioTagging/app/src/main/java/com/k2fsa/sherpa/onnx/audio/tagging/Tagger.kt index 8e6c970b..4be860ef 100644 --- a/android/SherpaOnnxAudioTagging/app/src/main/java/com/k2fsa/sherpa/onnx/audio/tagging/Tagger.kt +++ b/android/SherpaOnnxAudioTagging/app/src/main/java/com/k2fsa/sherpa/onnx/audio/tagging/Tagger.kt @@ -3,6 +3,7 @@ package com.k2fsa.sherpa.onnx.audio.tagging import android.content.res.AssetManager import android.util.Log import com.k2fsa.sherpa.onnx.AudioTagging +import com.k2fsa.sherpa.onnx.audio.tagging.wear.os.presentation.TAG import com.k2fsa.sherpa.onnx.getAudioTaggingConfig object Tagger { @@ -11,14 +12,14 @@ object Tagger { get() { return _tagger!! } - fun initTagger(assetManager: AssetManager? = null) { + fun initTagger(assetManager: AssetManager? = null, numThreads: Int = 1) { synchronized(this) { if (_tagger != null) { return } Log.i(TAG, "Initializing audio tagger") - val config = getAudioTaggingConfig(type = 0)!! + val config = getAudioTaggingConfig(type = 0, numThreads=numThreads)!! _tagger = AudioTagging(assetManager, config) } } diff --git a/android/SherpaOnnxAudioTagging/app/src/main/res/values/strings.xml b/android/SherpaOnnxAudioTagging/app/src/main/res/values/strings.xml index be0de0b1..8dd8dcef 100644 --- a/android/SherpaOnnxAudioTagging/app/src/main/res/values/strings.xml +++ b/android/SherpaOnnxAudioTagging/app/src/main/res/values/strings.xml @@ -1,3 +1,3 @@ - SherpaOnnxAudioTagging - \ No newline at end of file + Audio Tagging + diff --git a/android/SherpaOnnxAudioTaggingWearOs/.gitignore b/android/SherpaOnnxAudioTaggingWearOs/.gitignore new file mode 100644 index 00000000..aa724b77 --- /dev/null +++ b/android/SherpaOnnxAudioTaggingWearOs/.gitignore @@ -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 diff --git a/android/SherpaOnnxAudioTaggingWearOs/app/.gitignore b/android/SherpaOnnxAudioTaggingWearOs/app/.gitignore new file mode 100644 index 00000000..42afabfd --- /dev/null +++ b/android/SherpaOnnxAudioTaggingWearOs/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/android/SherpaOnnxAudioTaggingWearOs/app/build.gradle.kts b/android/SherpaOnnxAudioTaggingWearOs/app/build.gradle.kts new file mode 100644 index 00000000..5fd77806 --- /dev/null +++ b/android/SherpaOnnxAudioTaggingWearOs/app/build.gradle.kts @@ -0,0 +1,66 @@ +plugins { + id("com.android.application") + id("org.jetbrains.kotlin.android") +} + +android { + namespace = "com.k2fsa.sherpa.onnx.audio.tagging.wear.os" + compileSdk = 34 + + defaultConfig { + applicationId = "com.k2fsa.sherpa.onnx.audio.tagging.wear.os" + minSdk = 26 + targetSdk = 34 + versionCode = 1 + versionName = "1.0" + vectorDrawables { + useSupportLibrary = true + } + + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.1" + } + packaging { + resources { + excludes += "/META-INF/{AL2.0,LGPL2.1}" + } + } +} + +dependencies { + + implementation("com.google.android.gms:play-services-wearable:18.1.0") + implementation(platform("androidx.compose:compose-bom:2023.08.00")) + implementation("androidx.compose.ui:ui") + implementation("androidx.compose.ui:ui-tooling-preview") + implementation("androidx.wear.compose:compose-material:1.1.2") + implementation("androidx.wear.compose:compose-foundation:1.1.2") + implementation("androidx.activity:activity-compose:1.7.2") + implementation("androidx.core:core-splashscreen:1.0.1") + implementation("androidx.compose.material3:material3-android:1.2.1") + androidTestImplementation(platform("androidx.compose:compose-bom:2023.08.00")) + androidTestImplementation("androidx.compose.ui:ui-test-junit4") + debugImplementation("androidx.compose.ui:ui-tooling") + debugImplementation("androidx.compose.ui:ui-test-manifest") +} \ No newline at end of file diff --git a/android/SherpaOnnxAudioTaggingWearOs/app/lint.xml b/android/SherpaOnnxAudioTaggingWearOs/app/lint.xml new file mode 100644 index 00000000..44fac75b --- /dev/null +++ b/android/SherpaOnnxAudioTaggingWearOs/app/lint.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/android/SherpaOnnxAudioTaggingWearOs/app/proguard-rules.pro b/android/SherpaOnnxAudioTaggingWearOs/app/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /dev/null +++ b/android/SherpaOnnxAudioTaggingWearOs/app/proguard-rules.pro @@ -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 \ No newline at end of file diff --git a/android/SherpaOnnxAudioTaggingWearOs/app/src/main/AndroidManifest.xml b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/AndroidManifest.xml new file mode 100644 index 00000000..721639d0 --- /dev/null +++ b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/AndroidManifest.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android/SherpaOnnxAudioTaggingWearOs/app/src/main/assets/.gitignore b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/assets/.gitignore new file mode 100644 index 00000000..e69de29b diff --git a/android/SherpaOnnxAudioTaggingWearOs/app/src/main/java/com/k2fsa/sherpa/onnx/audio/tagging/wear/os/presentation/AudioTagging.kt b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/java/com/k2fsa/sherpa/onnx/audio/tagging/wear/os/presentation/AudioTagging.kt new file mode 120000 index 00000000..db43b2fd --- /dev/null +++ b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/java/com/k2fsa/sherpa/onnx/audio/tagging/wear/os/presentation/AudioTagging.kt @@ -0,0 +1 @@ +../../../../../../../../../../../../../../SherpaOnnxAudioTagging/app/src/main/java/com/k2fsa/sherpa/onnx/audio/tagging/AudioTagging.kt \ No newline at end of file diff --git a/android/SherpaOnnxAudioTaggingWearOs/app/src/main/java/com/k2fsa/sherpa/onnx/audio/tagging/wear/os/presentation/HomeScreen.kt b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/java/com/k2fsa/sherpa/onnx/audio/tagging/wear/os/presentation/HomeScreen.kt new file mode 100644 index 00000000..9af2c571 --- /dev/null +++ b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/java/com/k2fsa/sherpa/onnx/audio/tagging/wear/os/presentation/HomeScreen.kt @@ -0,0 +1,209 @@ +package com.k2fsa.sherpa.onnx.audio.tagging.wear.os.presentation + +import android.Manifest +import android.app.Activity +import android.content.pm.PackageManager +import android.media.AudioFormat +import android.media.AudioRecord +import android.media.MediaRecorder +import android.util.Log +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.material3.Slider +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.core.app.ActivityCompat +import androidx.wear.compose.material.Button +import androidx.wear.compose.material.MaterialTheme +import androidx.wear.compose.material.Text +import com.k2fsa.sherpa.onnx.AudioEvent +import com.k2fsa.sherpa.onnx.audio.tagging.Tagger +import com.k2fsa.sherpa.onnx.audio.tagging.wear.os.presentation.theme.SherpaOnnxAudioTaggingWearOsTheme +import kotlin.concurrent.thread + +private var audioRecord: AudioRecord? = null +private val sampleRateInHz = 16000 + +@Composable +fun HomeScreen() { + val activity = LocalContext.current as Activity + var threshold by remember { mutableStateOf(0.6F) } + var firstTime by remember { mutableStateOf(true) } + var isStarted by remember { mutableStateOf(false) } + var result by remember { mutableStateOf("") } + val onButtonClick: () -> Unit = { + firstTime = false + + isStarted = !isStarted + if (isStarted) { + result = "" + if (ActivityCompat.checkSelfPermission( + activity, + Manifest.permission.RECORD_AUDIO + ) != PackageManager.PERMISSION_GRANTED + ) { + Log.i(TAG, "Recording is not allowed") + } else { + val audioSource = MediaRecorder.AudioSource.MIC + val channelConfig = AudioFormat.CHANNEL_IN_MONO + val audioFormat = AudioFormat.ENCODING_PCM_16BIT + val numBytes = + AudioRecord.getMinBufferSize(sampleRateInHz, channelConfig, audioFormat) + + audioRecord = AudioRecord( + audioSource, + sampleRateInHz, + AudioFormat.CHANNEL_IN_MONO, + AudioFormat.ENCODING_PCM_16BIT, + numBytes * 2 // a sample has two bytes as we are using 16-bit PCM + ) + + thread(true) { + Log.i(TAG, "processing samples") + val interval = 0.1 // i.e., 100 ms + val bufferSize = (interval * sampleRateInHz).toInt() // in samples + val buffer = ShortArray(bufferSize) + val sampleList = ArrayList() + audioRecord?.let { + it.startRecording() + while (isStarted) { + val ret = it.read(buffer, 0, buffer.size) + ret.let { n -> + val samples = FloatArray(n) { buffer[it] / 32768.0f } + sampleList.add(samples) + } + } + } + Log.i(TAG, "Stop recording") + Log.i(TAG, "Start recognition") + val samples = Flatten(sampleList) + val stream = Tagger.tagger.createStream() + stream.acceptWaveform(samples, sampleRateInHz) + val events = Tagger.tagger.compute(stream) + stream.release() + + var str: String = "" + for (e in events) { + if (e.prob > threshold) { + str += "%s (%.2f)\n".format(e.name, e.prob) + } + } + result = str + } + } + } + } + + + SherpaOnnxAudioTaggingWearOsTheme { + Box( + modifier = Modifier + .fillMaxSize() + .background(MaterialTheme.colors.background), + contentAlignment = Alignment.Center + ) { + Column( + horizontalAlignment = Alignment.CenterHorizontally + ) { + Spacer(modifier = Modifier.height(16.dp)) + if (firstTime) { + ShowMessage() + } + + Spacer(modifier = Modifier.height(16.dp)) + Text( + result, + fontSize = 12.sp, + ) + + Text( + "Threshold " + String.format("%.1f", threshold), + fontSize = 12.sp + ) + Slider( + value = threshold, + onValueChange = { threshold = it }, + valueRange = 0.1F..1.0F, + modifier = Modifier.fillMaxWidth() + ) + Button( + onClick = onButtonClick, + ) { + if (isStarted) { + Text("Stop") + } else { + Text("Start") + } + } + } + } + } +} + +@Composable +fun ShowMessage() { + val msg = "Audio tagging\nwith\nNext-gen Kaldi" + Text( + modifier = Modifier.fillMaxWidth(), + textAlign = TextAlign.Center, + color = MaterialTheme.colors.primary, + text = msg, + ) +} + +@Composable +fun ViewRow( + modifier: Modifier = Modifier, + event: AudioEvent +) { + Row( + modifier = modifier, + horizontalArrangement = Arrangement.Center, + verticalAlignment = Alignment.CenterVertically, + ) { + Text( + text = event.name, + modifier = modifier.weight(1.0F), + ) + Text( + text = "%.2f".format(event.prob), + modifier = modifier.weight(1.0F), + ) + } + +} + + +fun Flatten(sampleList: ArrayList): FloatArray { + var totalSamples = 0 + for (a in sampleList) { + totalSamples += a.size + } + var i = 0 + val samples = FloatArray(totalSamples) + for (a in sampleList) { + for (s in a) { + samples[i] = s + i += 1 + } + } + Log.i(TAG, "$i, $totalSamples") + + return samples +} \ No newline at end of file diff --git a/android/SherpaOnnxAudioTaggingWearOs/app/src/main/java/com/k2fsa/sherpa/onnx/audio/tagging/wear/os/presentation/MainActivity.kt b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/java/com/k2fsa/sherpa/onnx/audio/tagging/wear/os/presentation/MainActivity.kt new file mode 100644 index 00000000..06542e60 --- /dev/null +++ b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/java/com/k2fsa/sherpa/onnx/audio/tagging/wear/os/presentation/MainActivity.kt @@ -0,0 +1,76 @@ +/* While this template provides a good starting point for using Wear Compose, you can always + * take a look at https://github.com/android/wear-os-samples/tree/main/ComposeStarter and + * https://github.com/android/wear-os-samples/tree/main/ComposeAdvanced to find the most up to date + * changes to the libraries and their usages. + */ + +package com.k2fsa.sherpa.onnx.audio.tagging.wear.os.presentation + +import android.Manifest +import android.content.pm.PackageManager +import android.os.Bundle +import android.util.Log +import android.view.WindowManager +import android.widget.Toast +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.compose.runtime.Composable +import androidx.core.app.ActivityCompat +import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen +import com.k2fsa.sherpa.onnx.audio.tagging.Tagger + +const val TAG = "sherpa-onnx" +private const val REQUEST_RECORD_AUDIO_PERMISSION = 200 + +class MainActivity : ComponentActivity() { + private val permissions: Array = arrayOf(Manifest.permission.RECORD_AUDIO) + override fun onCreate(savedInstanceState: Bundle?) { + installSplashScreen() + + super.onCreate(savedInstanceState) + + // Keep the screen always on + // https://developer.android.com/develop/background-work/background-tasks/scheduling/wakelock + window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) + + setTheme(android.R.style.Theme_DeviceDefault) + + setContent { + WearApp() + } + + ActivityCompat.requestPermissions(this, permissions, REQUEST_RECORD_AUDIO_PERMISSION) + Tagger.initTagger(this.assets, numThreads = 2) + } + + @Suppress("DEPRECATION") + override fun onRequestPermissionsResult( + requestCode: Int, + permissions: Array, + grantResults: IntArray + ) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults) + val permissionToRecordAccepted = if (requestCode == REQUEST_RECORD_AUDIO_PERMISSION) { + grantResults[0] == PackageManager.PERMISSION_GRANTED + } else { + false + } + + if (!permissionToRecordAccepted) { + Log.e(TAG, "Audio record is disallowed") + Toast.makeText( + this, + "This App needs access to the microphone", + Toast.LENGTH_SHORT + ) + .show() + finish() + } + Log.i(TAG, "Audio record is permitted") + } +} + +@Composable +fun WearApp() { + HomeScreen() +} \ No newline at end of file diff --git a/android/SherpaOnnxAudioTaggingWearOs/app/src/main/java/com/k2fsa/sherpa/onnx/audio/tagging/wear/os/presentation/OfflineStream.kt b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/java/com/k2fsa/sherpa/onnx/audio/tagging/wear/os/presentation/OfflineStream.kt new file mode 120000 index 00000000..b881f4db --- /dev/null +++ b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/java/com/k2fsa/sherpa/onnx/audio/tagging/wear/os/presentation/OfflineStream.kt @@ -0,0 +1 @@ +../../../../../../../../../../../../../../SherpaOnnxAudioTagging/app/src/main/java/com/k2fsa/sherpa/onnx/audio/tagging/OfflineStream.kt \ No newline at end of file diff --git a/android/SherpaOnnxAudioTaggingWearOs/app/src/main/java/com/k2fsa/sherpa/onnx/audio/tagging/wear/os/presentation/Tagger.kt b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/java/com/k2fsa/sherpa/onnx/audio/tagging/wear/os/presentation/Tagger.kt new file mode 120000 index 00000000..bb3656ae --- /dev/null +++ b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/java/com/k2fsa/sherpa/onnx/audio/tagging/wear/os/presentation/Tagger.kt @@ -0,0 +1 @@ +../../../../../../../../../../../../../../SherpaOnnxAudioTagging/app/src/main/java/com/k2fsa/sherpa/onnx/audio/tagging/Tagger.kt \ No newline at end of file diff --git a/android/SherpaOnnxAudioTaggingWearOs/app/src/main/java/com/k2fsa/sherpa/onnx/audio/tagging/wear/os/presentation/theme/Theme.kt b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/java/com/k2fsa/sherpa/onnx/audio/tagging/wear/os/presentation/theme/Theme.kt new file mode 100644 index 00000000..7a6e4fb9 --- /dev/null +++ b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/java/com/k2fsa/sherpa/onnx/audio/tagging/wear/os/presentation/theme/Theme.kt @@ -0,0 +1,17 @@ +package com.k2fsa.sherpa.onnx.audio.tagging.wear.os.presentation.theme + +import androidx.compose.runtime.Composable +import androidx.wear.compose.material.MaterialTheme + +@Composable +fun SherpaOnnxAudioTaggingWearOsTheme( + content: @Composable () -> Unit +) { + /** + * Empty theme to customize for your app. + * See: https://developer.android.com/jetpack/compose/designsystems/custom + */ + MaterialTheme( + content = content + ) +} \ No newline at end of file diff --git a/android/SherpaOnnxAudioTaggingWearOs/app/src/main/jniLibs/arm64-v8a/.gitignore b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/jniLibs/arm64-v8a/.gitignore new file mode 100644 index 00000000..e69de29b diff --git a/android/SherpaOnnxAudioTaggingWearOs/app/src/main/jniLibs/armeabi-v7a/.gitignore b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/jniLibs/armeabi-v7a/.gitignore new file mode 100644 index 00000000..e69de29b diff --git a/android/SherpaOnnxAudioTaggingWearOs/app/src/main/jniLibs/x86/.gitignore b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/jniLibs/x86/.gitignore new file mode 100644 index 00000000..e69de29b diff --git a/android/SherpaOnnxAudioTaggingWearOs/app/src/main/jniLibs/x86_64/.gitignore b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/jniLibs/x86_64/.gitignore new file mode 100644 index 00000000..e69de29b diff --git a/android/SherpaOnnxAudioTaggingWearOs/app/src/main/res/drawable/splash_icon.xml b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/res/drawable/splash_icon.xml new file mode 100644 index 00000000..7874e83f --- /dev/null +++ b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/res/drawable/splash_icon.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + diff --git a/android/SherpaOnnxAudioTaggingWearOs/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 00000000..c209e78e Binary files /dev/null and b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/android/SherpaOnnxAudioTaggingWearOs/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 00000000..4f0f1d64 Binary files /dev/null and b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/android/SherpaOnnxAudioTaggingWearOs/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 00000000..948a3070 Binary files /dev/null and b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/android/SherpaOnnxAudioTaggingWearOs/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 00000000..28d4b77f Binary files /dev/null and b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/android/SherpaOnnxAudioTaggingWearOs/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 00000000..aa7d6427 Binary files /dev/null and b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/android/SherpaOnnxAudioTaggingWearOs/app/src/main/res/values-round/strings.xml b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/res/values-round/strings.xml new file mode 100644 index 00000000..42f12297 --- /dev/null +++ b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/res/values-round/strings.xml @@ -0,0 +1,3 @@ + + From the Round world,\nHello, %1$s! + \ No newline at end of file diff --git a/android/SherpaOnnxAudioTaggingWearOs/app/src/main/res/values/strings.xml b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/res/values/strings.xml new file mode 100644 index 00000000..28dfe9bc --- /dev/null +++ b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/res/values/strings.xml @@ -0,0 +1,8 @@ + + AudioTagging + + From the Square world,\nHello, %1$s! + \ No newline at end of file diff --git a/android/SherpaOnnxAudioTaggingWearOs/app/src/main/res/values/styles.xml b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/res/values/styles.xml new file mode 100644 index 00000000..dbf9c83a --- /dev/null +++ b/android/SherpaOnnxAudioTaggingWearOs/app/src/main/res/values/styles.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/android/SherpaOnnxAudioTaggingWearOs/build.gradle.kts b/android/SherpaOnnxAudioTaggingWearOs/build.gradle.kts new file mode 100644 index 00000000..8e8f4ab9 --- /dev/null +++ b/android/SherpaOnnxAudioTaggingWearOs/build.gradle.kts @@ -0,0 +1,5 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + id("com.android.application") version "8.2.0" apply false + id("org.jetbrains.kotlin.android") version "1.9.0" apply false +} \ No newline at end of file diff --git a/android/SherpaOnnxAudioTaggingWearOs/gradle.properties b/android/SherpaOnnxAudioTaggingWearOs/gradle.properties new file mode 100644 index 00000000..3c5031eb --- /dev/null +++ b/android/SherpaOnnxAudioTaggingWearOs/gradle.properties @@ -0,0 +1,23 @@ +# 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 +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app's APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=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 \ No newline at end of file diff --git a/android/SherpaOnnxAudioTaggingWearOs/gradle/wrapper/gradle-wrapper.jar b/android/SherpaOnnxAudioTaggingWearOs/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..e708b1c0 Binary files /dev/null and b/android/SherpaOnnxAudioTaggingWearOs/gradle/wrapper/gradle-wrapper.jar differ diff --git a/android/SherpaOnnxAudioTaggingWearOs/gradle/wrapper/gradle-wrapper.properties b/android/SherpaOnnxAudioTaggingWearOs/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..9758ae8e --- /dev/null +++ b/android/SherpaOnnxAudioTaggingWearOs/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Tue Apr 16 20:57:10 CST 2024 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/android/SherpaOnnxAudioTaggingWearOs/gradlew b/android/SherpaOnnxAudioTaggingWearOs/gradlew new file mode 100755 index 00000000..4f906e0c --- /dev/null +++ b/android/SherpaOnnxAudioTaggingWearOs/gradlew @@ -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" "$@" diff --git a/android/SherpaOnnxAudioTaggingWearOs/gradlew.bat b/android/SherpaOnnxAudioTaggingWearOs/gradlew.bat new file mode 100644 index 00000000..ac1b06f9 --- /dev/null +++ b/android/SherpaOnnxAudioTaggingWearOs/gradlew.bat @@ -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 diff --git a/android/SherpaOnnxAudioTaggingWearOs/settings.gradle.kts b/android/SherpaOnnxAudioTaggingWearOs/settings.gradle.kts new file mode 100644 index 00000000..68476cb5 --- /dev/null +++ b/android/SherpaOnnxAudioTaggingWearOs/settings.gradle.kts @@ -0,0 +1,18 @@ +pluginManagement { + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} + +rootProject.name = "SherpaOnnxAudioTaggingWearOs" +include(":app") + \ No newline at end of file diff --git a/nodejs-examples/README.md b/nodejs-examples/README.md index 29c93a27..4c3df2a6 100644 --- a/nodejs-examples/README.md +++ b/nodejs-examples/README.md @@ -183,7 +183,7 @@ we use [sherpa-onnx-streaming-zipformer-ctc-small-2024-03-18](https://github.com You can use the following command to run it: ```bash -wget https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-streaming-zipformer-ctc-small-2024-03-18.tar.bz2 +wget -q https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-streaming-zipformer-ctc-small-2024-03-18.tar.bz2 tar xvf sherpa-onnx-streaming-zipformer-ctc-small-2024-03-18.tar.bz2 node ./test-online-zipformer2-ctc-hlg.js ``` diff --git a/scripts/apk/build-apk-audio-tagging-wearos.sh.in b/scripts/apk/build-apk-audio-tagging-wearos.sh.in new file mode 100644 index 00000000..bc28f526 --- /dev/null +++ b/scripts/apk/build-apk-audio-tagging-wearos.sh.in @@ -0,0 +1,88 @@ +#!/usr/bin/env bash +# +# Auto generated! Please DO NOT EDIT! + +# Please set the environment variable ANDROID_NDK +# before running this script + +# Inside the $ANDROID_NDK directory, you can find a binary ndk-build +# and some other files like the file "build/cmake/android.toolchain.cmake" + +set -ex + +log() { + # This function is from espnet + local fname=${BASH_SOURCE[1]##*/} + echo -e "$(date '+%Y-%m-%d %H:%M:%S') (${fname}:${BASH_LINENO[0]}:${FUNCNAME[1]}) $*" +} + +SHERPA_ONNX_VERSION=$(grep "SHERPA_ONNX_VERSION" ./CMakeLists.txt | cut -d " " -f 2 | cut -d '"' -f 2) + +log "Building audio tagging WearOS APK for sherpa-onnx v${SHERPA_ONNX_VERSION}" + +log "====================arm64-v8a=================" +./build-android-arm64-v8a.sh +log "====================armv7-eabi================" +./build-android-armv7-eabi.sh +log "====================x86-64====================" +./build-android-x86-64.sh +log "====================x86====================" +./build-android-x86.sh + +mkdir -p apks + +{% for model in model_list %} +pushd ./android/SherpaOnnxAudioTaggingWearOs/app/src/main/assets/ +model_name={{ model.model_name }} +short_name={{ model.short_name }} +type={{ model.idx }} + +curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/audio-tagging-models/${model_name}.tar.bz2 +tar xvf ${model_name}.tar.bz2 +rm -rfv $model_name/model.onnx +rm -rfv $model_name/test_wavs +rm -rf *.tar.bz2 +ls -lh $model_name + +popd +# Now we are at the project root directory + +git checkout . +# Tagger.kt is a symlink file, so we use SherpaOnnxAudioTagging here instead of SherpaOnnxAudioTaggingWearOs +pushd android/SherpaOnnxAudioTagging/app/src/main/java/com/k2fsa/sherpa/onnx/audio/tagging/ +sed -i.bak s/"type = 0/type = $type/" ./Tagger.kt +git diff +popd + +for arch in arm64-v8a armeabi-v7a x86_64 x86; do + log "------------------------------------------------------------" + log "build audio tagging apk for $arch" + log "------------------------------------------------------------" + src_arch=$arch + if [ $arch == "armeabi-v7a" ]; then + src_arch=armv7-eabi + elif [ $arch == "x86_64" ]; then + src_arch=x86-64 + fi + + ls -lh ./build-android-$src_arch/install/lib/*.so + + cp -v ./build-android-$src_arch/install/lib/*.so ./android/SherpaOnnxAudioTaggingWearOs/app/src/main/jniLibs/$arch/ + + pushd ./android/SherpaOnnxAudioTaggingWearOs + sed -i.bak s/2048/9012/g ./gradle.properties + git diff ./gradle.properties + ./gradlew assembleRelease + popd + + mv android/SherpaOnnxAudioTaggingWearOs/app/build/outputs/apk/release/app-release-unsigned.apk ./apks/sherpa-onnx-${SHERPA_ONNX_VERSION}-$arch-audio-tagging-$short_name-wearos.apk + ls -lh apks + rm -v ./android/SherpaOnnxAudioTaggingWearOs/app/src/main/jniLibs/$arch/*.so +done + +rm -rf ./android/SherpaOnnxAudioTaggingWearOs/app/src/main/assets/$model_name +{% endfor %} + +git checkout . + +ls -lh apks/ diff --git a/scripts/apk/generate-audio-tagging-apk-script.py b/scripts/apk/generate-audio-tagging-apk-script.py index fdf21a9d..e5855ad2 100755 --- a/scripts/apk/generate-audio-tagging-apk-script.py +++ b/scripts/apk/generate-audio-tagging-apk-script.py @@ -77,7 +77,10 @@ def main(): d["model_list"].append(all_model_list[s]) print(f"{s}/{num_models}") - filename_list = ["./build-apk-audio-tagging.sh"] + filename_list = [ + "./build-apk-audio-tagging.sh", + "./build-apk-audio-tagging-wearos.sh", + ] for filename in filename_list: environment = jinja2.Environment() with open(f"{filename}.in") as f: diff --git a/scripts/dotnet/generate.py b/scripts/dotnet/generate.py index ed395f14..5268211b 100755 --- a/scripts/dotnet/generate.py +++ b/scripts/dotnet/generate.py @@ -40,8 +40,8 @@ def process_linux(s): "libpiper_phonemize.so.1", "libsherpa-onnx-c-api.so", "libsherpa-onnx-core.so", - "libsherpa-onnx-fstfar.so.16", - "libsherpa-onnx-fst.so.16", + "libsherpa-onnx-fstfar.so.7", + "libsherpa-onnx-fst.so.6", "libsherpa-onnx-kaldifst-core.so", "libucd.so", ] @@ -69,8 +69,8 @@ def process_macos(s): "libpiper_phonemize.1.dylib", "libsherpa-onnx-c-api.dylib", "libsherpa-onnx-core.dylib", - "libsherpa-onnx-fstfar.16.dylib", - "libsherpa-onnx-fst.16.dylib", + "libsherpa-onnx-fstfar.7.dylib", + "libsherpa-onnx-fst.6.dylib", "libsherpa-onnx-kaldifst-core.dylib", "libucd.dylib", ] diff --git a/wasm/asr/assets/README.md b/wasm/asr/assets/README.md index 2d4bb5c8..d37c431a 100644 --- a/wasm/asr/assets/README.md +++ b/wasm/asr/assets/README.md @@ -47,7 +47,7 @@ assets fangjun$ tree -L 1 ## Paraformer ``` -wget https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-streaming-paraformer-bilingual-zh-en.tar.bz2 +wget -q https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-streaming-paraformer-bilingual-zh-en.tar.bz2 tar xvf sherpa-onnx-streaming-paraformer-bilingual-zh-en.tar.bz2 rm sherpa-onnx-streaming-paraformer-bilingual-zh-en.tar.bz2