Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-08-09 20:24:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "[client] audio: allow the audiodev to return the periodFrames"

Browse Source 
This reverts commit 41884bfcc5.

PipeWire can change it's period size on the fly on us making this
approach invalid.
This commit is contained in:
Geoffrey McRae
2022-01-28 09:58:57 +11:00
parent c2a766c2ee
commit a0477466d2
4 changed files with 49 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,17 +104,6 @@ static void pipewire_onPlaybackProcess(void * userdata)
if (pw.playback.rateMatch && pw.playback.rateMatch->size > 0)
frames = min(frames, pw.playback.rateMatch->size);
/* pipewire doesn't provide a way to access the quantum, so we start the
* stream and stop it immediately at setup to get this value */
if (pw.playback.startFrames == -1)
{
sbuf->datas[0].chunk->size = 0;
pw_stream_queue_buffer(pw.playback.stream, pbuf);
pw_stream_set_active(pw.playback.stream, false);
pw.playback.startFrames = frames;
return;
}
frames = pw.playback.pullFn(dst, frames);
if (!frames)
{
@@ -190,7 +179,7 @@ static void pipewire_playbackStopStream(void)
}
static void pipewire_playbackSetup(int channels, int sampleRate,
LG_AudioPullFn pullFn, int * periodFrames)
LG_AudioPullFn pullFn)
{
const struct spa_pod * params[1];
uint8_t buffer[1024];
@@ -220,7 +209,7 @@ static void pipewire_playbackSetup(int channels, int sampleRate,
pw.playback.sampleRate = sampleRate;
pw.playback.stride = sizeof(float) * channels;
pw.playback.pullFn = pullFn;
pw.playback.startFrames = -1;
pw.playback.startFrames = maxLatencyFrames;
pw_thread_loop_lock(pw.thread);
pw.playback.stream = pw_stream_new_simple(
@@ -258,22 +247,19 @@ static void pipewire_playbackSetup(int channels, int sampleRate,
PW_ID_ANY,
PW_STREAM_FLAG_AUTOCONNECT |
PW_STREAM_FLAG_MAP_BUFFERS |
PW_STREAM_FLAG_RT_PROCESS,
PW_STREAM_FLAG_RT_PROCESS |
PW_STREAM_FLAG_INACTIVE,
params, 1);
pw_thread_loop_unlock(pw.thread);
/* wait for the stream to start and set this value */
while(pw.playback.startFrames == -1)
pw_thread_loop_wait(pw.thread);
*periodFrames = pw.playback.startFrames;
}
static void pipewire_playbackStart(void)
static bool pipewire_playbackStart(int framesBuffered)
{
if (!pw.playback.stream)
return;
return false;
bool start = false;
if (pw.playback.state != STREAM_STATE_ACTIVE)
{
@@ -282,8 +268,12 @@ static void pipewire_playbackStart(void)
switch (pw.playback.state)
{
case STREAM_STATE_INACTIVE:
pw_stream_set_active(pw.playback.stream, true);
pw.playback.state = STREAM_STATE_ACTIVE;
if (framesBuffered >= pw.playback.startFrames)
{
pw_stream_set_active(pw.playback.stream, true);
pw.playback.state = STREAM_STATE_ACTIVE;
start = true;
}
break;
case STREAM_STATE_DRAINING:
@@ -297,6 +287,8 @@ static void pipewire_playbackStart(void)
pw_thread_loop_unlock(pw.thread);
}
return start;
}
static void pipewire_playbackStop(void)

14
client/audiodevs/PulseAudio/pulseaudio.c
View File

@@ -37,6 +37,7 @@ struct PulseAudio
int sinkIndex;
bool sinkCorked;
bool sinkMuted;
int sinkStart;
int sinkSampleRate;
int sinkChannels;
int sinkStride;
@@ -245,7 +246,7 @@ static void pulseaudio_overflow_cb(pa_stream * p, void * userdata)
}
static void pulseaudio_setup(int channels, int sampleRate,
LG_AudioPullFn pullFn, int * periodFrames)
LG_AudioPullFn pullFn)
{
if (pa.sink && pa.sinkChannels == channels && pa.sinkSampleRate == sampleRate)
return;
@@ -285,21 +286,26 @@ static void pulseaudio_setup(int channels, int sampleRate,
pa.sinkStride = channels * sizeof(float);
pa.sinkPullFn = pullFn;
pa.sinkStart = attribs.tlength / pa.sinkStride;
pa.sinkCorked = true;
*periodFrames = attribs.tlength / pa.sinkStride;
pa_threaded_mainloop_unlock(pa.loop);
}
static void pulseaudio_start(void)
static bool pulseaudio_start(int framesBuffered)
{
if (!pa.sink)
return;
return false;
if (framesBuffered < pa.sinkStart)
return false;
pa_threaded_mainloop_lock(pa.loop);
pa_stream_cork(pa.sink, 0, NULL, NULL);
pa.sinkCorked = false;
pa_threaded_mainloop_unlock(pa.loop);
return true;
}
static void pulseaudio_stop(void)