public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[porcupineks] concurrency fix (#12801)

Browse Source 
Signed-off-by: Miguel Álvarez Díez <miguelwork92@gmail.com>
This commit is contained in:
GiviMAD 2022-05-24 20:14:02 +02:00 committed by GitHub
parent 723d09b96d
commit 98af136e4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bundles/org.openhab.voice.porcupineks/src/main/java/org/openhab/voice/porcupineks/internal/PorcupineKSService.java
View File

@ -34,6 +34,7 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Level; import java.util.logging.Level;
import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.NonNullByDefault;
@ -78,7 +79,6 @@ public class PorcupineKSService implements KSService {
private final Logger logger = LoggerFactory.getLogger(PorcupineKSService.class); private final Logger logger = LoggerFactory.getLogger(PorcupineKSService.class);
private final ScheduledExecutorService executor = ThreadPoolManager.getScheduledPool("OH-voice-porcupineks"); private final ScheduledExecutorService executor = ThreadPoolManager.getScheduledPool("OH-voice-porcupineks");
private PorcupineKSConfiguration config = new PorcupineKSConfiguration(); private PorcupineKSConfiguration config = new PorcupineKSConfiguration();
private boolean loop = false;
private @Nullable BundleContext bundleContext; private @Nullable BundleContext bundleContext;
static { static {
@ -193,12 +193,14 @@ public class PorcupineKSService implements KSService {
} catch (PorcupineException | IOException e) { } catch (PorcupineException | IOException e) {
throw new KSException(e); throw new KSException(e);
} }
Future<?> scheduledTask = executor.submit(() -> processInBackground(porcupine, ksListener, audioStream)); final AtomicBoolean aborted = new AtomicBoolean(false);
Future<?> scheduledTask = executor
.submit(() -> processInBackground(porcupine, ksListener, audioStream, aborted));
return new KSServiceHandle() { return new KSServiceHandle() {
@Override @Override
public void abort() { public void abort() {
logger.debug("stopping service"); logger.debug("stopping service");
loop = false; aborted.set(true);
try { try {
Thread.sleep(100); Thread.sleep(100);
} catch (InterruptedException e) { } catch (InterruptedException e) {
@ -305,19 +307,19 @@ public class PorcupineKSService implements KSService {
} }
} }
private void processInBackground(Porcupine porcupine, KSListener ksListener, AudioStream audioStream) { private void processInBackground(Porcupine porcupine, KSListener ksListener, AudioStream audioStream,
AtomicBoolean aborted) {
int numBytesRead; int numBytesRead;
// buffers for processing audio // buffers for processing audio
int frameLength = porcupine.getFrameLength(); int frameLength = porcupine.getFrameLength();
ByteBuffer captureBuffer = ByteBuffer.allocate(frameLength * 2); ByteBuffer captureBuffer = ByteBuffer.allocate(frameLength * 2);
captureBuffer.order(ByteOrder.LITTLE_ENDIAN); captureBuffer.order(ByteOrder.LITTLE_ENDIAN);
short[] porcupineBuffer = new short[frameLength]; short[] porcupineBuffer = new short[frameLength];
this.loop = true; while (!aborted.get()) {
while (loop) {
try { try {
// read a buffer of audio // read a buffer of audio
numBytesRead = audioStream.read(captureBuffer.array(), 0, captureBuffer.capacity()); numBytesRead = audioStream.read(captureBuffer.array(), 0, captureBuffer.capacity());
if (!loop) { if (aborted.get()) {
break; break;
} }
// don't pass to porcupine if we don't have a full buffer // don't pass to porcupine if we don't have a full buffer