Kieran/ffmpeg-the-third
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

codec/picture: change width and height to u32

Browse Source
This commit is contained in:
meh 2015-05-18 23:32:11 +02:00
parent 18d91a9dd9
commit f0b11a960a
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/codec/picture.rs
View File

@ -10,16 +10,16 @@ use ::Error;
pub struct Picture<'a> {
pub ptr: *mut AVPicture,
pub format: format::Pixel,
pub width: usize,
pub height: usize,
format: format::Pixel,
width: u32,
height: u32,
_own: bool,
_marker: PhantomData<&'a ()>,
}
impl<'a> Picture<'a> {
pub fn size(format: format::Pixel, width: usize, height: usize) -> Result<usize, Error> {
pub fn size(format: format::Pixel, width: u32, height: u32) -> Result<usize, Error> {
unsafe {
match avpicture_get_size(format.into(), width as c_int, height as c_int) {
v if v >= 0 => Ok(v as usize),
@ -28,7 +28,7 @@ impl<'a> Picture<'a> {
}
}
pub fn new(format: format::Pixel, width: usize, height: usize) -> Result<Self, Error> {
pub fn new(format: format::Pixel, width: u32, height: u32) -> Result<Self, Error> {
unsafe {
let ptr = av_malloc(mem::size_of::<AVPicture>() as size_t) as *mut AVPicture;
@ -49,7 +49,7 @@ impl<'a> Picture<'a> {
}
}
pub fn wrap(ptr: *mut AVPicture, format: format::Pixel, width: usize, height: usize) -> Self {
pub fn wrap(ptr: *mut AVPicture, format: format::Pixel, width: u32, height: u32) -> Self {
Picture {
ptr: ptr,
@ -62,6 +62,18 @@ impl<'a> Picture<'a> {
}
}
pub fn format(&self) -> format::Pixel {
self.format
}
pub fn width(&self) -> u32 {
self.width
}
pub fn height(&self) -> u32 {
self.height
}
pub fn layout(&self, out: &mut [u8]) -> Result<usize, Error> {
unsafe {
match avpicture_layout(self.ptr, self.format.into(), self.width as c_int, self.height as c_int, out.as_mut_ptr(), out.len() as c_int) {
@ -71,7 +83,7 @@ impl<'a> Picture<'a> {
}
}
pub fn layout_as(&self, format: format::Pixel, width: usize, height: usize, out: &mut [u8]) -> Result<usize, Error> {
pub fn layout_as(&self, format: format::Pixel, width: u32, height: u32, out: &mut [u8]) -> Result<usize, Error> {
unsafe {
match avpicture_layout(self.ptr, format.into(), width as c_int, height as c_int, out.as_mut_ptr(), out.len() as c_int) {
s if s >= 0 => Ok(s as usize),
@ -80,7 +92,7 @@ impl<'a> Picture<'a> {
}
}
pub fn crop(&mut self, source: &Picture, top: usize, left: usize) -> Result<(), Error> {
pub fn crop(&mut self, source: &Picture, top: u32, left: u32) -> Result<(), Error> {
if self.format != source.format {
return Err(Error::new(AVERROR_BUG));
}