Enhance wake word detection and improve ADB connection stability

.gitignore

@@ -166,6 +166,8 @@ fabric.properties
 
 # End of https://www.toptal.com/developers/gitignore/api/android,androidstudio
 
-/*/release/
+app/release/*
+app/beta/*
+
 signing.properties
 *.keystore

README.md

@@ -176,16 +176,29 @@ Artifacts will be generated in `app/build/outputs/apk/<variant>/` following the
 
 ## Permissions Overview
 
-| Permission | Purpose |
-| :--- | :--- |
-| `RECORD_AUDIO` | Required for wake-word listening and voice sample recording. |
-| `FOREGROUND_SERVICE` / `FOREGROUND_SERVICE_MICROPHONE` | Keeps the hotword detector running reliably in the background. |
-| `SYSTEM_ALERT_WINDOW` | Enables launching assistant interfaces over active apps. |
-| `WRITE_SECURE_SETTINGS` | Configures system default assistant and voice interaction services. |
-| `RECEIVE_BOOT_COMPLETED` | Automatically restarts hotword service and secures settings on device boot. |
-| `REQUEST_IGNORE_BATTERY_OPTIMIZATIONS` | Prevents Android OS from killing background services in standby. |
-| `POST_NOTIFICATIONS` | Displays the foreground service notification on Android 13+. |
-| `INTERNET` | Used for local ADB loopback socket communication and wake-word model training. |
+| Permission                                             | Purpose                                                                        |
+|:-------------------------------------------------------|:-------------------------------------------------------------------------------|
+| `RECORD_AUDIO`                                         | Required for wake-word listening and voice sample recording.                   |
+| `FOREGROUND_SERVICE` / `FOREGROUND_SERVICE_MICROPHONE` | Keeps the hotword detector running reliably in the background.                 |
+| `SYSTEM_ALERT_WINDOW`                                  | Enables launching assistant interfaces over active apps.                       |
+| `WRITE_SECURE_SETTINGS`                                | Configures system default assistant and voice interaction services.            |
+| `RECEIVE_BOOT_COMPLETED`                               | Automatically restarts hotword service and secures settings on device boot.    |
+| `REQUEST_IGNORE_BATTERY_OPTIMIZATIONS`                 | Prevents Android OS from killing background services in standby.               |
+| `POST_NOTIFICATIONS`                                   | Displays the foreground service notification on Android 13+.                   |
+| `INTERNET`                                             | Used for local ADB loopback socket communication and wake-word model training. |
+
+---
+
+## Credits
+
+This project builds upon the following open-source libraries and projects:
+
+| Project                                                                                 | Author / Org | Description                                                                                                                                                                      |
+|:----------------------------------------------------------------------------------------|:-------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| [AndroidWakeWord](https://github.com/Suxsem/AndroidWakeWord)                            | Suxsem       | Android library implementing openWakeWord detection using ONNX Runtime and SpeexDSP.                                                                                             |
+| [dadb](https://github.com/mobile-dev-inc/dadb)                                          | mobile.dev   | A Kotlin library for communicating with Android devices over ADB directly from the device itself. Used here to automatically grant `WRITE_SECURE_SETTINGS` without needing a PC. |
+| [wakewords-collection](https://github.com/fwartner/home-assistant-wakewords-collection) | fwartner     | Community Collection of Wake-Words for Home Assistant                                                                                                                            |
+
 
 ---
 

androidwakeword/.gitignore

@@ -0,0 +1 @@
+/build

androidwakeword/build.gradle.kts

@@ -0,0 +1,37 @@
+plugins {
+    alias(libs.plugins.android.library)
+}
+
+android {
+    namespace = "com.suxsem.androidwakeword"
+    compileSdk {
+        version = release(37)
+    }
+
+    defaultConfig {
+        minSdk = 24
+        ndk {
+            abiFilters += listOf("arm64-v8a")
+        }
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    externalNativeBuild {
+        cmake {
+            path("src/main/cpp/CMakeLists.txt")
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+}
+
+dependencies {
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.onnxruntime.android)
+}

androidwakeword/src/main/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+</manifest>

androidwakeword/src/main/cpp/CMakeLists.txt

@@ -0,0 +1,42 @@
+cmake_minimum_required(VERSION 3.14)
+project("speex-wrapper" LANGUAGES C CXX)
+
+# Elenco dei file essenziali per il pre-processing e resample
+set(SPEEX_SOURCES
+        speex/libspeexdsp/preprocess.c
+        speex/libspeexdsp/resample.c
+        speex/libspeexdsp/filterbank.c
+        speex/libspeexdsp/fftwrap.c
+        speex/libspeexdsp/mdf.c
+        speex/libspeexdsp/kiss_fft.c
+        speex/libspeexdsp/kiss_fftr.c
+        speex/libspeexdsp/buffer.c
+        speex/libspeexdsp/jitter.c
+        speex/libspeexdsp/scal.c
+        speex/libspeexdsp/smallft.c
+)
+add_library(speex-lib SHARED speex-wrapper.cpp ${SPEEX_SOURCES})
+
+# Qui puntiamo alle cartelle che contengono gli header
+target_include_directories(speex-lib PRIVATE
+        speex/include
+        speex/include/speex
+        speex/libspeexdsp
+)
+
+target_compile_definitions(speex-lib PRIVATE
+        FIXED_POINT=1
+        EXPORT=
+        USE_KISS_FFT=1
+        HAVE_STDINT_H=1
+)
+
+find_library(log-lib log)
+target_link_libraries(speex-lib ${log-lib})
+
+target_compile_options(speex-lib PRIVATE -UHAVE_CONFIG_H)
+
+# Forza l'allineamento a 16KB per la compatibilità con Android 15+
+set_target_properties(speex-lib PROPERTIES
+        LINK_FLAGS "-Wl,-z,max-page-size=16384"
+)

androidwakeword/src/main/cpp/speex-wrapper.cpp

@@ -0,0 +1,85 @@
+#include <jni.h>
+#include <string>
+#include <vector>
+#include "speex/include/speex/speex_preprocess.h"
+
+// Puntatore globale allo stato del preprocessore
+// In un'app reale, gestiscilo in modo più sicuro (es. in una classe C++)
+static SpeexPreprocessState *st = nullptr;
+static int frame_size = 256;
+static int sample_rate = 16000;
+
+extern "C" {
+
+// Inizializzazione del preprocessore
+JNIEXPORT void JNICALL
+Java_com_suxsem_androidwakeword_SpeexWrapper_initSpeex(JNIEnv *env, jobject instance) {
+    if (st == nullptr) {
+        st = speex_preprocess_state_init(frame_size, sample_rate);
+
+        // 1. Denoise (Riduzione rumore)
+        int denoise = 1;
+        int noise_suppress = -25; // Più spinto di -25. Oltre -60 inizi a sentire artefatti metallici.
+        speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_DENOISE, &denoise);
+        speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_NOISE_SUPPRESS, &noise_suppress);
+
+        // 2. AGC (Guadagno automatico)
+        int agc = 1;
+        float agc_level = 24000; // Valore target alto (range tipico 0-32767)
+        int agc_max_gain = 25;   // Limita il guadagno massimo per non esagerare con il rumore di fondo
+        speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_AGC, &agc);
+        speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_AGC_LEVEL, &agc_level);
+        speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_AGC_MAX_GAIN, &agc_max_gain);
+
+        // 3. Dereverb (Soppressione dell'eco ambientale)
+        int dereverb = 1;
+        float dereverb_decay = 0.2f;
+        float dereverb_level = 0.3f;
+        speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_DEREVERB, &dereverb);
+        speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_DEREVERB_DECAY, &dereverb_decay);
+        speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_DEREVERB_LEVEL, &dereverb_level);
+
+        // 4. VAD
+        int vad = 1;
+        int prob_start = 95; // Percentuale di probabilità per far scattare il VAD (es. 80%)
+
+        speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_VAD, &vad);
+        speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_PROB_START, &prob_start);
+
+    }
+}
+
+// Elaborazione del buffer audio con ritorno Booleano (VAD)
+JNIEXPORT jboolean JNICALL
+Java_com_suxsem_androidwakeword_SpeexWrapper_processAudio(JNIEnv *env, jobject instance, jshortArray audioData) {
+    if (st == nullptr) return JNI_FALSE;
+
+    // Otteniamo il puntatore ai dati grezzi dell'array JNI
+    jshort *buffer = env->GetShortArrayElements(audioData, nullptr);
+    jsize len = env->GetArrayLength(audioData);
+
+    int is_speech = 0;
+
+    // Elaborazione (speex_preprocess_run lavora in-place e restituisce lo stato VAD)
+    if (len >= frame_size) {
+        // La firma restituisce 1 se c'è parlato, 0 se è silenzio/rumore
+        is_speech = speex_preprocess_run(st, buffer);
+    }
+
+    // Rilasciamo l'array comunicando al sistema che abbiamo finito
+    env->ReleaseShortArrayElements(audioData, buffer, 0);
+
+    // Convertiamo l'int di Speex nel jboolean di JNI
+    return (is_speech == 1) ? JNI_TRUE : JNI_FALSE;
+}
+
+// Distruzione dello stato (Chiamalo quando chiudi l'app)
+JNIEXPORT void JNICALL
+Java_com_suxsem_androidwakeword_SpeexWrapper_destroySpeex(JNIEnv *env, jobject instance) {
+    if (st != nullptr) {
+        speex_preprocess_state_destroy(st);
+        st = nullptr;
+    }
+}
+
+} // extern "C"

androidwakeword/src/main/cpp/speex/include/Makefile.am

@@ -0,0 +1,2 @@
+
+SUBDIRS = speex

androidwakeword/src/main/cpp/speex/include/speex/Makefile.am

@@ -0,0 +1,18 @@
+# Disable automatic dependency tracking if using other tools than gcc and gmake
+#AUTOMAKE_OPTIONS = no-dependencies
+
+# Historically, these headers were part of the speex package, so in order to
+# keep compatibility with existing software we need to keep installing them
+# in the same place as they were found then.  If new functionality, with new
+# headers, are added later, some thought should be given as to whether they
+# should instead go somewhere other than $prefix/include/speex.
+
+speexincludedir = $(includedir)/speex
+
+nodist_speexinclude_HEADERS = speexdsp_config_types.h
+
+speexinclude_HEADERS = speex_echo.h speex_jitter.h speex_preprocess.h speex_resampler.h \
+	speexdsp_types.h
+
+noinst_HEADERS=speex_buffer.h
+

androidwakeword/src/main/cpp/speex/include/speex/speex_buffer.h

@@ -0,0 +1,68 @@
+/* Copyright (C) 2007 Jean-Marc Valin
+
+   File: speex_buffer.h
+   This is a very simple ring buffer implementation. It is not thread-safe
+   so you need to do your own locking.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are
+   met:
+
+   1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   3. The name of the author may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+   IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+   DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+   ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef SPEEX_BUFFER_H
+#define SPEEX_BUFFER_H
+
+#include "speexdsp_types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct SpeexBuffer_;
+typedef struct SpeexBuffer_ SpeexBuffer;
+
+SpeexBuffer *speex_buffer_init(int size);
+
+void speex_buffer_destroy(SpeexBuffer *st);
+
+int speex_buffer_write(SpeexBuffer *st, void *data, int len);
+
+int speex_buffer_writezeros(SpeexBuffer *st, int len);
+
+int speex_buffer_read(SpeexBuffer *st, void *data, int len);
+
+int speex_buffer_get_available(SpeexBuffer *st);
+
+int speex_buffer_resize(SpeexBuffer *st, int len);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+
+
+