From 65d5ab89bb549af9b278e4d023f7b6b9bae98c5b Mon Sep 17 00:00:00 2001 From: meh Date: Mon, 26 Oct 2015 14:44:26 +0100 Subject: [PATCH] util/frame/audio: refactor data() and data_mut() --- src/util/frame/audio.rs | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/src/util/frame/audio.rs b/src/util/frame/audio.rs index 0875b63..b2fbe1b 100644 --- a/src/util/frame/audio.rs +++ b/src/util/frame/audio.rs @@ -181,33 +181,27 @@ impl Audio { } #[inline] - pub fn data(&self) -> Vec<&[u8]> { - let mut result = Vec::new(); - - unsafe { - for i in 0 .. self.planes() { - result.push(slice::from_raw_parts( - (*self.as_ptr()).data[i], - (*self.as_ptr()).linesize[0] as usize)); - } + pub fn data(&self, index: usize) -> &[u8] { + if index >= self.planes() { + panic!("out of bounds"); } - result + unsafe { + slice::from_raw_parts((*self.as_ptr()).data[index], + (*self.as_ptr()).linesize[index] as usize) + } } #[inline] - pub fn data_mut(&mut self) -> Vec<&mut [u8]> { - let mut result = Vec::new(); - - unsafe { - for i in 0 .. self.planes() { - result.push(slice::from_raw_parts_mut( - (*self.as_mut_ptr()).data[i], - (*self.as_ptr()).linesize[0] as usize)); - } + pub fn data_mut(&mut self, index: usize) -> &mut [u8] { + if index >= self.planes() { + panic!("out of bounds"); } - result + unsafe { + slice::from_raw_parts_mut((*self.as_mut_ptr()).data[index], + (*self.as_ptr()).linesize[index] as usize) + } } }