Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-25 23:07:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] audio/pw: properly manage the stream state

Browse Source
This commit is contained in:
Geoffrey McRae 2021-12-25 09:40:41 +11:00
parent 11ef94c134
commit f403033ab1
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
client/audiodevs/PipeWire/pipewire.c
View File

@ -35,6 +35,7 @@ struct PipeWire
int stride; int stride;
RingBuffer buffer; RingBuffer buffer;
bool active;
}; };
static struct PipeWire pw = {0}; static struct PipeWire pw = {0};
@ -133,7 +134,7 @@ static void pipewire_free(void)
pw_deinit(); pw_deinit();
} }
static void pipewire_stop(void) static void pipewire_stop_stream(void)
{ {
if (!pw.stream) if (!pw.stream)
return; return;
@ -156,7 +157,7 @@ static void pipewire_start(int channels, int sampleRate)
.process = pipewire_on_process .process = pipewire_on_process
}; };
pipewire_stop(); pipewire_stop_stream();
pw.channels = channels; pw.channels = channels;
pw.stride = sizeof(uint16_t) * channels; pw.stride = sizeof(uint16_t) * channels;
@ -197,7 +198,8 @@ static void pipewire_start(int channels, int sampleRate)
PW_ID_ANY, PW_ID_ANY,
PW_STREAM_FLAG_AUTOCONNECT | PW_STREAM_FLAG_AUTOCONNECT |
PW_STREAM_FLAG_MAP_BUFFERS | PW_STREAM_FLAG_MAP_BUFFERS |
PW_STREAM_FLAG_RT_PROCESS, PW_STREAM_FLAG_RT_PROCESS |
PW_STREAM_FLAG_INACTIVE,
params, 1); params, 1);
pw_thread_loop_unlock(pw.thread); pw_thread_loop_unlock(pw.thread);
@ -210,11 +212,25 @@ static void pipewire_play(uint8_t * data, int size)
for(int i = 0; i < size; i += pw.stride) for(int i = 0; i < size; i += pw.stride)
ringbuffer_push(pw.buffer, data + i); ringbuffer_push(pw.buffer, data + i);
if (!pw.active)
{
pw_thread_loop_lock(pw.thread);
pw_stream_set_active(pw.stream, true);
pw.active = true;
pw_thread_loop_unlock(pw.thread);
}
} }
static void pipewire_stop_nop(void) static void pipewire_stop(void)
{ {
// we ignore the stop message to avoid messing up any audio graph if (!pw.active)
return;
pw_thread_loop_lock(pw.thread);
pw_stream_set_active(pw.stream, false);
pw.active = false;
pw_thread_loop_unlock(pw.thread);
} }
struct LG_AudioDevOps LGAD_PipeWire = struct LG_AudioDevOps LGAD_PipeWire =
@ -224,5 +240,5 @@ struct LG_AudioDevOps LGAD_PipeWire =
.free = pipewire_free, .free = pipewire_free,
.start = pipewire_start, .start = pipewire_start,
.play = pipewire_play, .play = pipewire_play,
.stop = pipewire_stop_nop .stop = pipewire_stop
}; };