rob
/
cpal
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #267 from ishitatsuyuki/254-segfault 

Fix #254, logic error in frame/sample size
This commit is contained in:
mitchmindtree 2019-04-29 22:21:48 +10:00 committed by GitHub
parent 0b6df67085 af88cd87e2
commit 0354548426
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/alsa/mod.rs
View File

@ -517,7 +517,7 @@ impl EventLoop {
} }
// Determine the number of samples that are available to read/write. // Determine the number of samples that are available to read/write.
let available = { let available_samples = {
let available = alsa::snd_pcm_avail(stream_inner.channel); // TODO: what about snd_pcm_avail_update? let available = alsa::snd_pcm_avail(stream_inner.channel); // TODO: what about snd_pcm_avail_update?
if available == -32 { if available == -32 {
@ -533,7 +533,7 @@ impl EventLoop {
} }
}; };
if available < stream_inner.period_len { if available_samples < stream_inner.period_len {
i_descriptor += stream_inner.num_descriptors as isize; i_descriptor += stream_inner.num_descriptors as isize;
i_stream += 1; i_stream += 1;
continue; continue;
@ -541,19 +541,19 @@ impl EventLoop {
let stream_id = stream_inner.id.clone(); let stream_id = stream_inner.id.clone();
let available_frames = available_samples / stream_inner.num_channels as usize;
match stream_type { match stream_type {
StreamType::Input => { StreamType::Input => {
// Simplify shared logic across the sample format branches. // Simplify shared logic across the sample format branches.
macro_rules! read_buffer { macro_rules! read_buffer {
($T:ty, $Variant:ident) => {{ ($T:ty, $Variant:ident) => {{
// The buffer to read into. // The buffer to read into.
let mut buffer: Vec<$T> = iter::repeat(mem::uninitialized()) let mut buffer: Vec<$T> = vec![Default::default(); available_samples];
.take(available)
.collect();
let err = alsa::snd_pcm_readi( let err = alsa::snd_pcm_readi(
stream_inner.channel, stream_inner.channel,
buffer.as_mut_ptr() as *mut _, buffer.as_mut_ptr() as *mut _,
available as _, available_frames as alsa::snd_pcm_uframes_t,
); );
check_errors(err as _).expect("snd_pcm_readi error"); check_errors(err as _).expect("snd_pcm_readi error");
let input_buffer = InputBuffer { let input_buffer = InputBuffer {
@ -579,9 +579,7 @@ impl EventLoop {
SampleFormat::I16 => { SampleFormat::I16 => {
let buffer = OutputBuffer { let buffer = OutputBuffer {
stream_inner: stream_inner, stream_inner: stream_inner,
buffer: iter::repeat(mem::uninitialized()) buffer: vec![Default::default(); available_samples],
.take(available)
.collect(),
}; };
UnknownTypeOutputBuffer::I16(::OutputBuffer { target: Some(buffer) }) UnknownTypeOutputBuffer::I16(::OutputBuffer { target: Some(buffer) })
@ -589,9 +587,7 @@ impl EventLoop {
SampleFormat::U16 => { SampleFormat::U16 => {
let buffer = OutputBuffer { let buffer = OutputBuffer {
stream_inner: stream_inner, stream_inner: stream_inner,
buffer: iter::repeat(mem::uninitialized()) buffer: vec![Default::default(); available_samples],
.take(available)
.collect(),
}; };
UnknownTypeOutputBuffer::U16(::OutputBuffer { target: Some(buffer) }) UnknownTypeOutputBuffer::U16(::OutputBuffer { target: Some(buffer) })
@ -599,8 +595,7 @@ impl EventLoop {
SampleFormat::F32 => { SampleFormat::F32 => {
let buffer = OutputBuffer { let buffer = OutputBuffer {
stream_inner: stream_inner, stream_inner: stream_inner,
// Note that we don't use `mem::uninitialized` because of sNaN. buffer: vec![Default::default(); available_samples]
buffer: iter::repeat(0.0).take(available).collect(),
}; };
UnknownTypeOutputBuffer::F32(::OutputBuffer { target: Some(buffer) }) UnknownTypeOutputBuffer::F32(::OutputBuffer { target: Some(buffer) })