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

util/frame/audio: use ChannelLayout

Browse Source
This commit is contained in:
meh 2015-06-01 18:34:42 +02:00
parent 7ac2d29718
commit 956ed014d7
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/util/frame/audio.rs
View File

@ -2,8 +2,9 @@ use libc::c_int;
use std::mem; use std::mem;
use std::ops::{Deref, DerefMut}; use std::ops::{Deref, DerefMut};
use libc::{int64_t, c_ulonglong};
use ffi::*; use ffi::*;
use ::Samples; use ::{ChannelLayout, Samples};
use ::util::format; use ::util::format;
use super::Frame; use super::Frame;
@ -17,7 +18,7 @@ impl Audio {
} }
} }
pub fn new(format: format::Sample, samples: usize, layout: i64) -> Self { pub fn new(format: format::Sample, samples: usize, layout: ChannelLayout) -> Self {
unsafe { unsafe {
let mut frame = Audio::empty(); let mut frame = Audio::empty();
@ -48,15 +49,15 @@ impl Audio {
} }
} }
pub fn channel_layout(&self) -> i64 { pub fn channel_layout(&self) -> ChannelLayout {
unsafe { unsafe {
av_frame_get_channel_layout(self.ptr) ChannelLayout::from_bits_truncate(av_frame_get_channel_layout(self.ptr) as c_ulonglong)
} }
} }
pub fn set_channel_layout(&mut self, value: i64) { pub fn set_channel_layout(&mut self, value: ChannelLayout) {
unsafe { unsafe {
av_frame_set_channel_layout(self.ptr, value); av_frame_set_channel_layout(self.ptr, value.bits() as int64_t);
} }
} }