diff --git a/src/util/frame/video.rs b/src/util/frame/video.rs index 8a4aa33..8e447a9 100644 --- a/src/util/frame/video.rs +++ b/src/util/frame/video.rs @@ -267,32 +267,26 @@ impl Video { } } - pub fn data(&self) -> Vec<&[u8]> { - let mut result = Vec::new(); - - unsafe { - for (i, length) in (*self.as_ptr()).linesize.iter().take_while(|l| **l > 0).enumerate() { - result.push(slice::from_raw_parts( - (*self.as_ptr()).data[i], - *length as usize * self.height() 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 * self.height() as usize) + } } - pub fn data_mut(&mut self) -> Vec<&mut [u8]> { - let mut result = Vec::new(); - - unsafe { - for (i, length) in (*self.as_ptr()).linesize.iter().take_while(|l| **l > 0).enumerate() { - result.push(slice::from_raw_parts_mut( - (*self.as_mut_ptr()).data[i], - *length as usize * self.height() 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 * self.height() as usize) + } } }