mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2024-11-26 05:21:00 +00:00
Code Issues Projects Releases Wiki Activity

Some more RingBufferIterator cleanup

Browse source
This commit is contained in:
Sebastian Dröge 2017-10-07 11:38:35 +03:00
parent 20f1666bc9
commit 7cf784a9fc
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst-plugin-audiofx/src/audioecho.rs
View file

@ -341,7 +341,8 @@ impl RingBuffer {
} }
struct RingBufferIter<'a> { struct RingBufferIter<'a> {
buffer: &'a mut RingBuffer, buffer: &'a mut [f64],
buffer_pos: &'a mut usize,
read_pos: usize, read_pos: usize,
write_pos: usize, write_pos: usize,
size: usize, size: usize,
@ -357,8 +358,12 @@ impl<'a> RingBufferIter<'a> {
let read_pos = (size - delay + buffer.pos) % size; let read_pos = (size - delay + buffer.pos) % size;
let write_pos = buffer.pos % size; let write_pos = buffer.pos % size;
let buffer_pos = &mut buffer.pos;
let buffer = &mut buffer.buffer;
RingBufferIter { RingBufferIter {
buffer: buffer, buffer: buffer,
buffer_pos: buffer_pos,
read_pos: read_pos, read_pos: read_pos,
write_pos: write_pos, write_pos: write_pos,
size: size, size: size,
@ -371,8 +376,8 @@ impl<'a> Iterator for RingBufferIter<'a> {
fn next(&mut self) -> Option<Self::Item> { fn next(&mut self) -> Option<Self::Item> {
let res = unsafe { let res = unsafe {
let r = *self.buffer.buffer.get_unchecked(self.read_pos); let r = *self.buffer.get_unchecked(self.read_pos);
let w = self.buffer.buffer.get_unchecked_mut(self.write_pos); let w = self.buffer.get_unchecked_mut(self.write_pos);
// Cast needed to get from &mut f64 to &'a mut f64 // Cast needed to get from &mut f64 to &'a mut f64
(&mut *(w as *mut f64), r) (&mut *(w as *mut f64), r)
}; };
@ -386,6 +391,6 @@ impl<'a> Iterator for RingBufferIter<'a> {
impl<'a> Drop for RingBufferIter<'a> { impl<'a> Drop for RingBufferIter<'a> {
fn drop(&mut self) { fn drop(&mut self) {
self.buffer.pos = self.write_pos; *self.buffer_pos = self.write_pos;
} }
} }