GitHub/rhasspy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Not closing audio device by default

Browse Source
This commit is contained in:
Michael Hansen
2019-12-23 10:27:18 -05:00
parent f32cd5c93a
commit ad2e208fc2
3 changed files with 54 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app.py
+3 -6
View File
@@ -7,11 +7,11 @@ import logging
import os
import re
import time
from collections import defaultdict
from pathlib import Path
from typing import Any, Dict, List, Tuple, Union
from uuid import uuid4
import attr
from quart import (
Quart,
Response,
@@ -24,8 +24,6 @@ from quart import (
)
from quart_cors import cors
from swagger_ui import quart_api_doc
import rhasspynlu
import attr
from rhasspy.actor import ActorSystem, ConfigureEvent, RhasspyActor
from rhasspy.core import RhasspyCore
@@ -34,12 +32,12 @@ from rhasspy.intent import IntentRecognized
from rhasspy.utils import (
FunctionLoggingHandler,
buffer_to_wav,
get_all_intents,
get_ini_paths,
get_wav_duration,
load_phoneme_examples,
read_dict,
recursive_remove,
get_ini_paths,
get_all_intents,
)
# -----------------------------------------------------------------------------
@@ -959,7 +957,6 @@ def api_intents():
add_type(item.rule_body, item_dict["rule_body"])
# Convert to dictionary
replacements = defaultdict(list)
intents_dict = {}
for intent_name, intent_sentences in intents.items():
sentence_dicts = []
profiles/defaults.json
+4 -2
View File
@@ -81,11 +81,13 @@
"microphone": {
"arecord": {
"chunk_size": 960,
"device": ""
"device": "",
"keep_device_open": true
},
"pyaudio": {
"device": "",
"frames_per_buffer": 480
"frames_per_buffer": 480,
"keep_device_open": true
},
"stdin": {
"auto_start": true,
rhasspy/audio_recorder.py
+47 -19
View File
@@ -149,6 +149,7 @@ class PyAudioRecorder(RhasspyActor):
self.buffers: Dict[str, bytes] = defaultdict(bytes)
self.device_index = None
self.frames_per_buffer = 480
self.keep_device_open = True
def to_started(self, from_state: str) -> None:
"""Transition to started state."""
@@ -170,6 +171,10 @@ class PyAudioRecorder(RhasspyActor):
self.profile.get("microphone.pyaudio.frames_per_buffer", 480)
)
self.keep_device_open = self.profile.get(
"microphone.pyaudio.keep_device_open", True
)
def in_started(self, message: Any, sender: RhasspyActor) -> None:
"""Handle messages in started state."""
if isinstance(message, StartStreaming):
@@ -192,21 +197,25 @@ class PyAudioRecorder(RhasspyActor):
return (data, pyaudio.paContinue)
self.audio = pyaudio.PyAudio()
assert self.audio is not None
data_format = self.audio.get_format_from_width(2) # 16-bit
self.mic = self.audio.open(
format=data_format,
channels=1,
rate=16000,
input_device_index=self.device_index,
input=True,
stream_callback=stream_callback,
frames_per_buffer=self.frames_per_buffer,
)
if self.audio is None:
self.audio = pyaudio.PyAudio()
assert self.audio is not None
data_format = self.audio.get_format_from_width(2) # 16-bit
if self.mic is None:
self.mic = self.audio.open(
format=data_format,
channels=1,
rate=16000,
input_device_index=self.device_index,
input=True,
stream_callback=stream_callback,
frames_per_buffer=self.frames_per_buffer,
)
assert self.mic is not None
self.mic.start_stream()
assert self.mic is not None
self.mic.start_stream()
self._logger.debug(
"Recording from microphone (PyAudio, device=%s)", self.device_index
)
@@ -246,7 +255,11 @@ class PyAudioRecorder(RhasspyActor):
self.send(message.receiver or sender, AudioData(buffer))
# Check to see if anyone is still listening
if (len(self.receivers) == 0) and (len(self.buffers) == 0):
if (
(not self.keep_device_open)
and (len(self.receivers) == 0)
and (len(self.buffers) == 0)
):
# Terminate audio recording
if self.mic is not None:
self.mic.stop_stream()
@@ -367,6 +380,7 @@ class ARecordAudioRecorder(RhasspyActor):
self.is_recording: bool = True
self.device_name: Optional[str] = None
self.chunk_size: int = 960
self.keep_device_open = True
def to_started(self, from_state: str) -> None:
"""Transition to started state."""
@@ -383,6 +397,10 @@ class ARecordAudioRecorder(RhasspyActor):
self.profile.get("microphone.arecord.chunk_size", self.chunk_size)
)
self.keep_device_open = self.profile.get(
"microphone.arecord.keep_device_open", True
)
def in_started(self, message: Any, sender: RhasspyActor) -> None:
"""Handle messages in started state."""
if isinstance(message, StartStreaming):
@@ -430,9 +448,13 @@ class ARecordAudioRecorder(RhasspyActor):
# Start recording
try:
self.is_recording = True
self.recording_thread = threading.Thread(target=process_data, daemon=True)
assert self.recording_thread is not None
self.recording_thread.start()
if self.recording_thread is None:
self.recording_thread = threading.Thread(
target=process_data, daemon=True
)
assert self.recording_thread is not None
self.recording_thread.start()
self._logger.debug("Recording from microphone (arecord)")
except Exception:
@@ -471,11 +493,16 @@ class ARecordAudioRecorder(RhasspyActor):
self.send(message.receiver or sender, AudioData(buffer))
# Check to see if anyone is still listening
if (len(self.receivers) == 0) and (len(self.buffers) == 0):
if (
(not self.keep_device_open)
and (len(self.receivers) == 0)
and (len(self.buffers) == 0)
):
# Terminate audio recording
self.is_recording = False
self.record_proc.terminate()
self.record_proc = None
self.recording_thread = None
self.transition("started")
self._logger.debug("Stopped recording from microphone (arecord)")
@@ -485,6 +512,7 @@ class ARecordAudioRecorder(RhasspyActor):
self.is_recording = False
if self.record_proc is not None:
self.record_proc.terminate()
self.recording_thread = None
self._logger.debug("Stopped recording from microphone (arecord)")
# -------------------------------------------------------------------------