Merge pull request #470 from exrook/master

Handle ALSA overruns/underruns by resetting the PCM device
This commit is contained in:
est31 2020-09-11 20:57:58 +02:00 • committed by GitHub
commit 5fec80e344
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -504,7 +504,13 @@ fn input_stream_worker(
.unwrap_or(PollDescriptorsFlow::Continue); .unwrap_or(PollDescriptorsFlow::Continue);
match flow { match flow {
PollDescriptorsFlow::Continue => continue, PollDescriptorsFlow::Continue => {
continue;
}
PollDescriptorsFlow::XRun => {
report_error(stream.channel.prepare(), error_callback);
continue;
}
PollDescriptorsFlow::Return => return, PollDescriptorsFlow::Return => return,
PollDescriptorsFlow::Ready { PollDescriptorsFlow::Ready {
status, status,
@ -545,7 +551,14 @@ fn output_stream_worker(
.unwrap_or(PollDescriptorsFlow::Continue); .unwrap_or(PollDescriptorsFlow::Continue);
match flow { match flow {
PollDescriptorsFlow::Continue => continue, PollDescriptorsFlow::Continue => {
report_error(stream.channel.prepare(), error_callback);
continue;
}
PollDescriptorsFlow::XRun => {
report_error(stream.channel.prepare(), error_callback);
continue;
}
PollDescriptorsFlow::Return => return, PollDescriptorsFlow::Return => return,
PollDescriptorsFlow::Ready { PollDescriptorsFlow::Ready {
status, status,
@ -598,6 +611,7 @@ enum PollDescriptorsFlow {
avail_frames: usize, avail_frames: usize,
delay_frames: usize, delay_frames: usize,
}, },
XRun,
} }
// This block is shared between both input and output stream worker functions. // This block is shared between both input and output stream worker functions.
@ -656,7 +670,12 @@ fn poll_descriptors_and_prepare_buffer(
}; };
let status = stream.channel.status()?; let status = stream.channel.status()?;
let avail_frames = status.get_avail() as usize; let avail_frames = match stream.channel.avail() {
Err(err) if err.errno() == Some(nix::errno::Errno::EPIPE) => {
return Ok(PollDescriptorsFlow::XRun)
}
res => res,
}? as usize;
let delay_frames = match status.get_delay() { let delay_frames = match status.get_delay() {
// Buffer underrun. TODO: Notify the user. // Buffer underrun. TODO: Notify the user.
d if d < 0 => 0, d if d < 0 => 0,