forked from Blendman974/faceclaw
[verified] merge upstream c162c8e6 into all-features
This commit is contained in:
commit
5790e98d27
176 files changed
+5311
-2307
No files matched your search
@@ -272,15 +272,21 @@ if (faceclawVersionFile.exists()) {
|
||||
faceclawVersionName = faceclawVersionMatch.group(1)
|
||||
}
|
||||
}
|
||||
def faceclawBuildRevision = System.getenv("FACECLAW_ANDROID_BUILD_REVISION") ?: "0"
|
||||
if (!(faceclawBuildRevision ==~ /[0-4]/)) {
|
||||
throw new GradleException("FACECLAW_ANDROID_BUILD_REVISION must be an integer from 0 to 4")
|
||||
}
|
||||
def faceclawVersionCode = {
|
||||
// Prerelease labels belong in versionName, not the numeric versionCode.
|
||||
def parts = (faceclawVersionName.split('-')[0].tokenize('.') + ["0", "0"]).take(3)*.toInteger()
|
||||
return parts[0] * 10000 + parts[1] * 100 + parts[2]
|
||||
// Last digit: build revision * 2, plus form factor (phone 0, Wear OS 1).
|
||||
// Play requires distinct version codes even on separate form-factor tracks.
|
||||
return (parts[0] * 10000 + parts[1] * 100 + parts[2]) * 10 + faceclawBuildRevision.toInteger() * 2
|
||||
}()
|
||||
|
||||
android {
|
||||
compileSdkVersion 35
|
||||
buildToolsVersion "35"
|
||||
compileSdkVersion 36
|
||||
buildToolsVersion "36.0.0"
|
||||
// ndkVersion ""
|
||||
|
||||
sourceSets.main {
|
||||
@@ -290,7 +296,7 @@ android {
|
||||
|
||||
defaultConfig {
|
||||
minSdkVersion 24
|
||||
targetSdkVersion 35
|
||||
targetSdkVersion 36
|
||||
ndk {
|
||||
// The NativeScript platform build.gradle has already added all four
|
||||
// ABIs by the time app.gradle is applied, and abiFilters is additive,
|
||||
|
||||
@@ -127,8 +127,6 @@ class FaceclawVoiceController(context: Context) {
|
||||
override fun release() {}
|
||||
}
|
||||
}
|
||||
|
||||
override fun recordingSink(): RecordingSink = RecordingSink { pcmBytes, sampleRate -> saveRecording(pcmBytes, sampleRate) }
|
||||
}
|
||||
|
||||
private val session = VoiceCaptureSession(host)
|
||||
@@ -146,11 +144,6 @@ class FaceclawVoiceController(context: Context) {
|
||||
session.setUsePhoneMic(usePhoneMic)
|
||||
}
|
||||
|
||||
/** When true, the decoded mic PCM for each session is saved as a WAV. */
|
||||
fun setSaveRecordings(saveRecordings: Boolean) {
|
||||
session.setSaveRecordings(saveRecordings)
|
||||
}
|
||||
|
||||
/**
|
||||
* Which on-device model {@link #start}("onboard") should load: "whisper"
|
||||
* selects the second on-device model (sherpa-onnx offline Whisper); any
|
||||
@@ -235,29 +228,6 @@ class FaceclawVoiceController(context: Context) {
|
||||
stop()
|
||||
}
|
||||
|
||||
/** Save the session's decoded mic PCM as a 16 kHz mono 16-bit WAV. */
|
||||
private fun saveRecording(pcmBytes: ByteArray, sampleRate: Int) {
|
||||
try {
|
||||
val dir = File(appContext.getExternalFilesDir(null), "voice-recordings")
|
||||
if (!dir.exists() && !dir.mkdirs()) {
|
||||
Log.w(TAG, "could not create voice-recordings dir")
|
||||
return
|
||||
}
|
||||
val stamp = java.text.SimpleDateFormat("yyyyMMdd-HHmmss-SSS", java.util.Locale.US)
|
||||
.format(java.util.Date())
|
||||
val file = File(dir, "voice-$stamp.wav")
|
||||
java.io.FileOutputStream(file).use { fos ->
|
||||
fos.write(BinaryEncoding.wavHeader(pcmBytes.size, sampleRate, 1))
|
||||
fos.write(pcmBytes)
|
||||
}
|
||||
Log.i(TAG, "saved voice recording " + file.absolutePath
|
||||
+ " samples=" + (pcmBytes.size / 2)
|
||||
+ " sec=" + String.format(java.util.Locale.US, "%.2f", pcmBytes.size / 2.0 / sampleRate))
|
||||
} catch (t: Throwable) {
|
||||
Log.w(TAG, "failed to save voice recording", t)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* The on-device model directory for the given kind, populated by the
|
||||
* download flow in asr-model.ts (releases before 0.5.0 copied the
|
||||
|
||||
@@ -62,7 +62,7 @@ class PreviewBitmapUtil private constructor() {
|
||||
/**
|
||||
* A white-on-transparent bitmap of an 8bpp glasses icon (gray becomes
|
||||
* alpha; black, which the glasses show as unlit, is transparent), for
|
||||
* showing glasses artwork on the phone's dark action bar.
|
||||
* showing glasses artwork in the phone UI, which tints it to suit.
|
||||
*/
|
||||
@JvmStatic
|
||||
fun whiteIconFromGray(gray: ByteBuffer?, width: Int, height: Int): Bitmap {
|
||||
|
||||
+3
-3
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Keyboard icon for the main page's tab-bar keyboard-dialog button (beside
|
||||
the mic button). Material Design "keyboard" glyph (Apache 2.0); base fill
|
||||
is overridden by tint-color in app.css. -->
|
||||
<!-- Keyboard icon for the main page's keyboard-dialog button (beside the mic
|
||||
button). Material Design "keyboard" glyph (Apache 2.0); base fill is
|
||||
overridden by tint-color in remote-controls.css. -->
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Microphone icon for the main page's tab-bar wakeword button.
|
||||
<!-- Microphone icon for the main page's voice-input (wakeword) button.
|
||||
Converted from ~/Downloads/noun-microphone-1368757.svg (Noun Project
|
||||
icon #1368757); base fill is overridden by tint-color in app.css. -->
|
||||
icon #1368757); base fill is overridden by tint-color in remote-controls.css. -->
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
@@ -0,0 +1,13 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Gear icon for the main page's Settings button (beside the mic and keyboard
|
||||
buttons). Material Design "settings" glyph (Apache 2.0); base fill is
|
||||
overridden by tint-color in remote-controls.css. -->
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="#FF333333"
|
||||
android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z" />
|
||||
</vector>
|
||||
Reference in new issue
Block a user