kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 04:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

chan_console: don't read and write at the same time

Browse Source 
It seems that the ALSA backend of PortAudio doesn't know how to both
read and write at the same time by adding a per-device mutex.

FIXME: currently only a draft version. Need to either auto-detect
we work with the ALSA backend or add an extra configuration option
to use this mutex.

ASTERISK-27426 #close

Change-Id: I635eacee45f5413faa18f5a3b606af03b926dacb
This commit is contained in:
Oron Peled
2017-12-19 10:52:54 +02:00
committed by Joshua Colp
parent 42290f9a45
commit 0fc3e831a7
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
channels/chan_console.c
View File

@@ -280,7 +280,9 @@ static void *stream_monitor(void *data)
for (;;) { for (;;) {
pthread_testcancel(); pthread_testcancel();
console_pvt_lock(pvt);
res = Pa_ReadStream(pvt->stream, buf, sizeof(buf) / sizeof(int16_t)); res = Pa_ReadStream(pvt->stream, buf, sizeof(buf) / sizeof(int16_t));
console_pvt_unlock(pvt);
pthread_testcancel(); pthread_testcancel();
if (!pvt->owner) { if (!pvt->owner) {
@@ -613,7 +615,9 @@ static int console_write(struct ast_channel *chan, struct ast_frame *f)
{ {
struct console_pvt *pvt = ast_channel_tech_pvt(chan); struct console_pvt *pvt = ast_channel_tech_pvt(chan);
console_pvt_lock(pvt);
Pa_WriteStream(pvt->stream, f->data.ptr, f->samples); Pa_WriteStream(pvt->stream, f->data.ptr, f->samples);
console_pvt_unlock(pvt);
return 0; return 0;
} }