Skip to content

ao/pulse: fix ao_drain hang when underrun makes buf_diff negative #17652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dengzhongyuan365-dev wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −2
Open

ao/pulse: fix ao_drain hang when underrun makes buf_diff negative #17652

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions audio/out/ao_pulse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,8 +584,11 @@ static double get_delay_hackfixed(struct ao *ao)
GENERIC_ERR_MSG("pa_stream_get_sample_spec() failed");
return 0;
}
// data left in PulseAudio's main buffers (not written to sink yet)
int64_t latency = pa_bytes_to_usec(ti->write_index - ti->read_index, ss);
// data left in PulseAudio's main buffers (not written to sink yet).
// With prebuf=0, an underrun may make write_index < read_index (negative buf_diff),
// which breaks the pa_bytes_to_usec() conversion and can overflow into an infinite drain wait.
int64_t buf_diff = ti->write_index - ti->read_index;
int64_t latency = buf_diff > 0 ? pa_bytes_to_usec(buf_diff, ss) : 0;
// since this info may be from a while ago, playback has progressed since
latency -= ti->transport_usec;
// data already moved from buffers to sink, but not played yet
Expand Down
Loading