[ALSA] Improve stream setup parameters.

* Always set period before setting buffer size, even if
  `BufferSize::Fixed`.
* Set `start_threshold` based on `alsa::Direction` to avoid underruns on
  playback streams.

Also refactor the return values of the set params functions to reflect their
actual use and resolve some clippy warnings (including a logic error in
`stream_timestamp()`).
This commit is contained in:
Alex Moon 2020-12-11 10:20:32 -07:00 • committed by Matěj Laitl
parent 47ef62d413
commit c349eb1477

View file

@ -251,11 +251,8 @@ impl Device {
Err((e, _)) => return Err(e.into()), Err((e, _)) => return Err(e.into()),
Ok(handle) => handle, Ok(handle) => handle,
}; };
let can_pause = { let can_pause = set_hw_params_from_format(&handle, conf, sample_format)?;
let hw_params = set_hw_params_from_format(&handle, conf, sample_format)?; let period_len = set_sw_params_from_format(&handle, conf, stream_type)?;
hw_params.can_pause()
};
let (_buffer_len, period_len) = set_sw_params_from_format(&handle, conf)?;
handle.prepare()?; handle.prepare()?;
@ -277,7 +274,9 @@ impl Device {
_ => None, _ => None,
}; };
handle.start()?; if let alsa::Direction::Capture = stream_type {
handle.start()?;
}
let stream_inner = StreamInner { let stream_inner = StreamInner {
channel: handle, channel: handle,
@ -420,10 +419,10 @@ impl Device {
supported_formats.len() * supported_channels.len() * sample_rates.len(), supported_formats.len() * supported_channels.len() * sample_rates.len(),
); );
for &sample_format in supported_formats.iter() { for &sample_format in supported_formats.iter() {
for channels in supported_channels.iter() { for &channels in supported_channels.iter() {
for &(min_rate, max_rate) in sample_rates.iter() { for &(min_rate, max_rate) in sample_rates.iter() {
output.push(SupportedStreamConfigRange { output.push(SupportedStreamConfigRange {
channels: *channels, channels,
min_sample_rate: SampleRate(min_rate as u32), min_sample_rate: SampleRate(min_rate as u32),
max_sample_rate: SampleRate(max_rate as u32), max_sample_rate: SampleRate(max_rate as u32),
buffer_size: buffer_size_range.clone(), buffer_size: buffer_size_range.clone(),
@ -856,14 +855,13 @@ fn stream_timestamp(
None => { None => {
let trigger_ts = status.get_trigger_htstamp(); let trigger_ts = status.get_trigger_htstamp();
let ts = status.get_htstamp(); let ts = status.get_htstamp();
let nanos = timespec_diff_nanos(ts, trigger_ts) let nanos = timespec_diff_nanos(ts, trigger_ts);
.try_into() if nanos < 0 {
.unwrap_or_else(|_| { panic!(
panic!( "get_htstamp `{:?}` was earlier than get_trigger_htstamp `{:?}`",
"get_htstamp `{:?}` was earlier than get_trigger_htstamp `{:?}`", ts, trigger_ts
ts, trigger_ts );
); }
});
Ok(crate::StreamInstant::from_nanos(nanos)) Ok(crate::StreamInstant::from_nanos(nanos))
} }
Some(creation) => { Some(creation) => {
@ -966,11 +964,11 @@ impl StreamTrait for Stream {
} }
} }
fn set_hw_params_from_format<'a>( fn set_hw_params_from_format(
pcm_handle: &'a alsa::pcm::PCM, pcm_handle: &alsa::pcm::PCM,
config: &StreamConfig, config: &StreamConfig,
sample_format: SampleFormat, sample_format: SampleFormat,
) -> Result<alsa::pcm::HwParams<'a>, BackendSpecificError> { ) -> Result<bool, BackendSpecificError> {
let hw_params = alsa::pcm::HwParams::any(pcm_handle)?; let hw_params = alsa::pcm::HwParams::any(pcm_handle)?;
hw_params.set_access(alsa::pcm::Access::RWInterleaved)?; hw_params.set_access(alsa::pcm::Access::RWInterleaved)?;
@ -993,7 +991,10 @@ fn set_hw_params_from_format<'a>(
hw_params.set_channels(config.channels as u32)?; hw_params.set_channels(config.channels as u32)?;
match config.buffer_size { match config.buffer_size {
BufferSize::Fixed(v) => hw_params.set_buffer_size(v as alsa::pcm::Frames)?, BufferSize::Fixed(v) => {
hw_params.set_period_size_near((v / 4) as alsa::pcm::Frames, alsa::ValueOr::Nearest)?;
hw_params.set_buffer_size(v as alsa::pcm::Frames)?;
}
BufferSize::Default => { BufferSize::Default => {
// These values together represent a moderate latency and wakeup interval. // These values together represent a moderate latency and wakeup interval.
// Without them we are at the mercy of the device // Without them we are at the mercy of the device
@ -1004,17 +1005,17 @@ fn set_hw_params_from_format<'a>(
pcm_handle.hw_params(&hw_params)?; pcm_handle.hw_params(&hw_params)?;
Ok(hw_params) Ok(hw_params.can_pause())
} }
fn set_sw_params_from_format( fn set_sw_params_from_format(
pcm_handle: &alsa::pcm::PCM, pcm_handle: &alsa::pcm::PCM,
config: &StreamConfig, config: &StreamConfig,
) -> Result<(usize, usize), BackendSpecificError> { stream_type: alsa::Direction,
) -> Result<usize, BackendSpecificError> {
let sw_params = pcm_handle.sw_params_current()?; let sw_params = pcm_handle.sw_params_current()?;
sw_params.set_start_threshold(0)?;
let (buffer_len, period_len) = { let period_len = {
let (buffer, period) = pcm_handle.get_params()?; let (buffer, period) = pcm_handle.get_params()?;
if buffer == 0 { if buffer == 0 {
return Err(BackendSpecificError { return Err(BackendSpecificError {
@ -1022,19 +1023,22 @@ fn set_sw_params_from_format(
}); });
} }
sw_params.set_avail_min(period as alsa::pcm::Frames)?; sw_params.set_avail_min(period as alsa::pcm::Frames)?;
let buffer = buffer as usize * config.channels as usize;
let period = period as usize * config.channels as usize; let start_threshold = match stream_type {
(buffer, period) alsa::Direction::Playback => buffer - period,
alsa::Direction::Capture => 1,
};
sw_params.set_start_threshold(start_threshold.try_into().unwrap())?;
period as usize * config.channels as usize
}; };
sw_params.set_tstamp_mode(true)?; sw_params.set_tstamp_mode(true)?;
// TODO: sw_params.set_tstamp_type(alsa::pcm::TstampType::MonotonicRaw)?;
// Pending new version of alsa-sys and alsa-rs getting published.
// sw_params.set_tstamp_type(alsa::pcm::TstampType::MonotonicRaw)?;
pcm_handle.sw_params(&sw_params)?; pcm_handle.sw_params(&sw_params)?;
Ok((buffer_len, period_len)) Ok(period_len)
} }
impl From<alsa::Error> for BackendSpecificError { impl From<alsa::Error> for BackendSpecificError {