Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Android interrupt fix #36

Merged
merged 3 commits into from
Jan 2, 2025
Merged

Android interrupt fix #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8a2ec8
fixed interrupt
matt200-ok Dec 27, 2024
4012436
fixed spelling
matt200-ok Dec 27, 2024
109294a
Updated UI
matt200-ok Jan 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion recipes/llm-voice-assistant/android/llm-voice-assistant/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,6 @@ dependencies {
implementation 'ai.picovoice:android-voice-processor:1.0.2'
implementation 'ai.picovoice:porcupine-android:3.0.1'
implementation 'ai.picovoice:cheetah-android:2.0.0'
implementation 'ai.picovoice:picollm-android:1.2.0'
implementation 'ai.picovoice:picollm-android:1.2.3'
implementation 'ai.picovoice:orca-android:1.0.0'
}
37 changes: 25 additions & 12 deletions ...ndroid/llm-voice-assistant/src/main/java/ai/picovoice/llmvoiceassistant/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
import android.Manifest;
import android.annotation.SuppressLint;
import android.content.pm.PackageManager;
import android.media.AudioAttributes;
import android.media.AudioFormat;
import android.media.AudioManager;
import android.media.AudioTrack;
import android.net.Uri;
import android.os.Bundle;
Expand Down Expand Up @@ -293,6 +293,8 @@ private void runWakeWordSTT(short[] frame) {
try {
int keywordIndex = porcupine.process(frame);
if (keywordIndex == 0) {
interrupt();

llmPromptText = new StringBuilder();
updateUIState(UIState.STT);
}
Expand Down Expand Up @@ -509,16 +511,26 @@ private void runLLM(String prompt) {

ttsPlaybackExecutor.submit(() -> {
try {
AudioAttributes audioAttributes = new AudioAttributes.Builder()
.setUsage(AudioAttributes.USAGE_MEDIA)
.setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
.build();

AudioFormat audioFormat = new AudioFormat.Builder()
.setSampleRate(orca.getSampleRate())
.setEncoding(AudioFormat.ENCODING_PCM_16BIT)
.setChannelMask(AudioFormat.CHANNEL_OUT_MONO)
.build();

ttsOutput = new AudioTrack(
AudioManager.STREAM_MUSIC,
orca.getSampleRate(),
AudioFormat.CHANNEL_OUT_MONO,
AudioFormat.ENCODING_PCM_16BIT,
audioAttributes,
audioFormat,
AudioTrack.getMinBufferSize(
orca.getSampleRate(),
AudioFormat.CHANNEL_OUT_MONO,
AudioFormat.ENCODING_PCM_16BIT),
AudioTrack.MODE_STREAM);
AudioTrack.MODE_STREAM,
0);

ttsOutput.play();
} catch (Exception e) {
Expand All @@ -535,22 +547,24 @@ private void runLLM(String prompt) {

while (isQueueingPcm.get() || !pcmQueue.isEmpty()) {
short[] pcm = pcmQueue.poll();
if (pcm != null && pcm.length > 0 && currentState == UIState.LLM_TTS) {
if (pcm != null && pcm.length > 0 && ttsOutput.getPlayState() == AudioTrack.PLAYSTATE_PLAYING) {
ttsOutput.write(pcm, 0, pcm.length);
}
}

ttsOutput.stop();
if (ttsOutput.getPlayState() == AudioTrack.PLAYSTATE_PLAYING) {
ttsOutput.flush();
ttsOutput.stop();
}
ttsOutput.release();
});
}

private void interrupt() {
try {
picollm.interrupt();
if (ttsOutput != null) {
if (ttsOutput != null && ttsOutput.getPlayState() == AudioTrack.PLAYSTATE_PLAYING) {
ttsOutput.stop();
ttsOutput.release();
}
} catch (PicoLLMException e) {
onEngineProcessError(e.getMessage());
Expand Down Expand Up @@ -584,7 +598,6 @@ private void onEngineProcessError(String message) {
mainHandler.post(() -> chatText.setText(message));
}


private void startWakeWordListening() {
if (voiceProcessor.hasRecordAudioPermission(this)) {
try {
Expand Down Expand Up @@ -708,7 +721,7 @@ private void updateUIState(UIState state) {
chatText.setText("");
statusProgress.setVisibility(View.VISIBLE);
statusText.setVisibility(View.VISIBLE);
statusText.setText("Generating...");
statusText.setText("Generating...\nSay 'Picovoice' to interrupt");
clearTextButton.setEnabled(false);
clearTextButton.setImageDrawable(
ResourcesCompat.getDrawable(
Expand Down
1 change: 1 addition & 0 deletions res/.lint/spell-check/dict.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ pico
picollm
picovoice
pids
playstate
pllm
psutil
pvcheetah
Expand Down
Loading