Merge pull request #1 from RustAudio/master

Merge with Rustaudio/cpal
This commit is contained in:
dheijl 2020-09-12 12:53:46 +02:00 • committed by GitHub
commit 1f4d7b04c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 13 deletions

View file

@ -504,7 +504,13 @@ fn input_stream_worker(
.unwrap_or(PollDescriptorsFlow::Continue);
match flow {
PollDescriptorsFlow::Continue => continue,
PollDescriptorsFlow::Continue => {
continue;
}
PollDescriptorsFlow::XRun => {
report_error(stream.channel.prepare(), error_callback);
continue;
}
PollDescriptorsFlow::Return => return,
PollDescriptorsFlow::Ready {
status,
@ -545,7 +551,14 @@ fn output_stream_worker(
.unwrap_or(PollDescriptorsFlow::Continue);
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::Ready {
status,
@ -598,6 +611,7 @@ enum PollDescriptorsFlow {
avail_frames: usize,
delay_frames: usize,
},
XRun,
}
// 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 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() {
// Buffer underrun. TODO: Notify the user.
d if d < 0 => 0,

View file

@ -103,13 +103,13 @@ impl Device {
fn default_output_config(&self) -> Result<SupportedStreamConfig, DefaultStreamConfigError> {
const EXPECT: &str = "expected at least one valid webaudio stream config";
let mut configs: Vec<_> = self.supported_output_configs().expect(EXPECT).collect();
configs.sort_by(|a, b| a.cmp_default_heuristics(b));
let config = configs
.into_iter()
.next()
let config = self
.supported_output_configs()
.expect(EXPECT)
.max_by(|a, b| a.cmp_default_heuristics(b))
.unwrap()
.with_sample_rate(DEFAULT_SAMPLE_RATE);
Ok(config)
}
}

View file

@ -121,13 +121,13 @@ impl Device {
#[inline]
fn default_output_config(&self) -> Result<SupportedStreamConfig, DefaultStreamConfigError> {
const EXPECT: &str = "expected at least one valid webaudio stream config";
let mut configs: Vec<_> = self.supported_output_configs().expect(EXPECT).collect();
configs.sort_by(|a, b| a.cmp_default_heuristics(b));
let config = configs
.into_iter()
.next()
let config = self
.supported_output_configs()
.expect(EXPECT)
.max_by(|a, b| a.cmp_default_heuristics(b))
.unwrap()
.with_sample_rate(DEFAULT_SAMPLE_RATE);
Ok(config)
}
}