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

*: make internal pointer handling safer

Browse Source
This commit is contained in:
meh
2015-06-04 03:03:19 +02:00
parent b2c9dc3747
commit ff1b880be6
28 changed files with 683 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/codec/encoder/audio.rs
View File

@ -10,11 +10,11 @@ use ::frame;
pub struct Audio(pub Encoder);
impl Audio {
pub fn encode(&self, frame: &frame::Audio, out: &mut Packet) -> Result<bool, Error> {
pub fn encode(&mut self, frame: &frame::Audio, out: &mut Packet) -> Result<bool, Error> {
unsafe {
let mut got: c_int = 0;
match avcodec_encode_audio2(self.ptr, &mut out.val, frame.ptr, &mut got) {
match avcodec_encode_audio2(self.as_mut_ptr(), out.as_mut_ptr(), frame.as_ptr(), &mut got) {
e if e < 0 => Err(Error::from(e)),
_ => Ok(got != 0)
}

18
src/codec/encoder/mod.rs
View File

@ -62,29 +62,29 @@ impl Encoder {
pub fn set_rate(&mut self, value: usize) {
unsafe {
(*self.ptr).bit_rate = value as c_int;
(*self.as_mut_ptr()).bit_rate = value as c_int;
}
}
pub fn set_tolerance(&mut self, value: usize) {
unsafe {
(*self.ptr).bit_rate_tolerance = value as c_int;
(*self.as_mut_ptr()).bit_rate_tolerance = value as c_int;
}
}
pub fn set_quality(&mut self, value: usize) {
unsafe {
(*self.ptr).global_quality = value as c_int;
(*self.as_mut_ptr()).global_quality = value as c_int;
}
}
pub fn set_compression(&mut self, value: Option<usize>) {
unsafe {
if let Some(value) = value {
(*self.ptr).compression_level = value as c_int;
(*self.as_mut_ptr()).compression_level = value as c_int;
}
else {
(*self.ptr).compression_level = -1;
(*self.as_mut_ptr()).compression_level = -1;
}
}
}
@ -92,18 +92,18 @@ impl Encoder {
pub fn set_frame_rate(&mut self, value: Option<Rational>) {
unsafe {
if let Some(value) = value {
(*self.ptr).framerate = value.0;
(*self.as_mut_ptr()).framerate = value.0;
}
else {
(*self.ptr).framerate.num = 0;
(*self.ptr).framerate.den = 1;
(*self.as_mut_ptr()).framerate.num = 0;
(*self.as_mut_ptr()).framerate.den = 1;
}
}
}
pub fn set_time_base(&mut self, value: Rational) {
unsafe {
(*self.ptr).time_base = value.0;
(*self.as_mut_ptr()).time_base = value.0;
}
}
}

4
src/codec/encoder/subtitle.rs
View File

@ -9,9 +9,9 @@ use ::Error;
pub struct Subtitle(pub Encoder);
impl Subtitle {
pub fn encode(&self, subtitle: &::Subtitle, out: &mut [u8]) -> Result<bool, Error> {
pub fn encode(&mut self, subtitle: &::Subtitle, out: &mut [u8]) -> Result<bool, Error> {
unsafe {
match avcodec_encode_subtitle(self.ptr, out.as_mut_ptr(), out.len() as c_int, &subtitle.val) {
match avcodec_encode_subtitle(self.as_mut_ptr(), out.as_mut_ptr(), out.len() as c_int, subtitle.as_ptr()) {
e if e < 0 => Err(Error::from(e)),
_ => Ok(true)
}

70
src/codec/encoder/video.rs
View File

@ -11,11 +11,11 @@ use ::format;
pub struct Video(pub Encoder);
impl Video {
pub fn encode(&self, frame: &frame::Video, out: &mut Packet) -> Result<bool, Error> {
pub fn encode(&mut self, frame: &frame::Video, out: &mut Packet) -> Result<bool, Error> {
unsafe {
let mut got: c_int = 0;
match avcodec_encode_video2(self.ptr, &mut out.val, frame.ptr, &mut got) {
match avcodec_encode_video2(self.as_mut_ptr(), out.as_mut_ptr(), frame.as_ptr(), &mut got) {
e if e < 0 => Err(Error::from(e)),
_ => Ok(got != 0)
}
@ -24,179 +24,179 @@ impl Video {
pub fn set_width(&mut self, value: u32) {
unsafe {
(*self.ptr).width = value as c_int;
(*self.as_mut_ptr()).width = value as c_int;
}
}
pub fn set_height(&mut self, value: u32) {
unsafe {
(*self.ptr).height = value as c_int;
(*self.as_mut_ptr()).height = value as c_int;
}
}
pub fn set_gop(&mut self, value: u32) {
unsafe {
(*self.ptr).gop_size = value as c_int;
(*self.as_mut_ptr()).gop_size = value as c_int;
}
}
pub fn set_format(&mut self, value: format::Pixel) {
unsafe {
(*self.ptr).pix_fmt = value.into();
(*self.as_mut_ptr()).pix_fmt = value.into();
}
}
pub fn set_motion_estimation(&mut self, value: MotionEstimation) {
unsafe {
(*self.ptr).me_method = value.into();
(*self.as_mut_ptr()).me_method = value.into();
}
}
pub fn set_max_b_frames(&mut self, value: usize) {
unsafe {
(*self.ptr).max_b_frames = value as c_int;
(*self.as_mut_ptr()).max_b_frames = value as c_int;
}
}
pub fn set_b_quant_factor(&mut self, value: f32) {
unsafe {
(*self.ptr).b_quant_factor = value as c_float;
(*self.as_mut_ptr()).b_quant_factor = value as c_float;
}
}
pub fn set_b_quant_offset(&mut self, value: f32) {
unsafe {
(*self.ptr).b_quant_offset = value as c_float;
(*self.as_mut_ptr()).b_quant_offset = value as c_float;
}
}
pub fn set_i_quant_factor(&mut self, value: f32) {
unsafe {
(*self.ptr).i_quant_factor = value as c_float;
(*self.as_mut_ptr()).i_quant_factor = value as c_float;
}
}
pub fn set_i_quant_offset(&mut self, value: f32) {
unsafe {
(*self.ptr).i_quant_offset = value as c_float;
(*self.as_mut_ptr()).i_quant_offset = value as c_float;
}
}
pub fn set_lumi_masking(&mut self, value: f32) {
unsafe {
(*self.ptr).lumi_masking = value as c_float;
(*self.as_mut_ptr()).lumi_masking = value as c_float;
}
}
pub fn set_temporal_cplx_masking(&mut self, value: f32) {
unsafe {
(*self.ptr).temporal_cplx_masking = value as c_float;
(*self.as_mut_ptr()).temporal_cplx_masking = value as c_float;
}
}
pub fn set_spatial_cplx_masking(&mut self, value: f32) {
unsafe {
(*self.ptr).spatial_cplx_masking = value as c_float;
(*self.as_mut_ptr()).spatial_cplx_masking = value as c_float;
}
}
pub fn set_p_masking(&mut self, value: f32) {
unsafe {
(*self.ptr).p_masking = value as c_float;
(*self.as_mut_ptr()).p_masking = value as c_float;
}
}
pub fn set_dark_masking(&mut self, value: f32) {
unsafe {
(*self.ptr).dark_masking = value as c_float;
(*self.as_mut_ptr()).dark_masking = value as c_float;
}
}
pub fn set_prediction(&mut self, value: Prediction) {
unsafe {
(*self.ptr).prediction_method = value.into();
(*self.as_mut_ptr()).prediction_method = value.into();
}
}
pub fn set_aspect_ratio(&mut self, value: Rational) {
unsafe {
(*self.ptr).sample_aspect_ratio = value.0;
(*self.as_mut_ptr()).sample_aspect_ratio = value.0;
}
}
pub fn set_me_comparison(&mut self, value: Comparison) {
unsafe {
(*self.ptr).me_cmp = value.into();
(*self.as_mut_ptr()).me_cmp = value.into();
}
}
pub fn set_me_sub_comparison(&mut self, value: Comparison) {
unsafe {
(*self.ptr).me_sub_cmp = value.into();
(*self.as_mut_ptr()).me_sub_cmp = value.into();
}
}
pub fn set_mb_comparison(&mut self, value: Comparison) {
unsafe {
(*self.ptr).mb_cmp = value.into();
(*self.as_mut_ptr()).mb_cmp = value.into();
}
}
pub fn set_ildct_comparison(&mut self, value: Comparison) {
unsafe {
(*self.ptr).ildct_cmp = value.into();
(*self.as_mut_ptr()).ildct_cmp = value.into();
}
}
pub fn set_dia_size(&mut self, value: usize) {
unsafe {
(*self.ptr).dia_size = value as c_int;
(*self.as_mut_ptr()).dia_size = value as c_int;
}
}
pub fn set_last_predictors(&mut self, value: usize) {
unsafe {
(*self.ptr).last_predictor_count = value as c_int;
(*self.as_mut_ptr()).last_predictor_count = value as c_int;
}
}
pub fn set_pre_me(&mut self, value: MotionEstimation) {
unsafe {
(*self.ptr).pre_me = value.into();
(*self.as_mut_ptr()).pre_me = value.into();
}
}
pub fn set_me_pre_comparison(&mut self, value: Comparison) {
unsafe {
(*self.ptr).me_pre_cmp = value.into();
(*self.as_mut_ptr()).me_pre_cmp = value.into();
}
}
pub fn set_pre_dia_size(&mut self, value: usize) {
unsafe {
(*self.ptr).pre_dia_size = value as c_int;
(*self.as_mut_ptr()).pre_dia_size = value as c_int;
}
}
pub fn set_me_subpel_quality(&mut self, value: usize) {
unsafe {
(*self.ptr).me_subpel_quality = value as c_int;
(*self.as_mut_ptr()).me_subpel_quality = value as c_int;
}
}
pub fn set_me_range(&mut self, value: usize) {
unsafe {
(*self.ptr).me_range = value as c_int;
(*self.as_mut_ptr()).me_range = value as c_int;
}
}
pub fn set_intra_quant_bias(&mut self, value: Option<usize>) {
unsafe {
if let Some(value) = value {
(*self.ptr).intra_quant_bias = value as c_int;
(*self.as_mut_ptr()).intra_quant_bias = value as c_int;
}
else {
(*self.ptr).intra_quant_bias = FF_DEFAULT_QUANT_BIAS;
(*self.as_mut_ptr()).intra_quant_bias = FF_DEFAULT_QUANT_BIAS;
}
}
}
@ -204,17 +204,17 @@ impl Video {
pub fn set_inter_quant_bias(&mut self, value: Option<usize>) {
unsafe {
if let Some(value) = value {
(*self.ptr).inter_quant_bias = value as c_int;
(*self.as_mut_ptr()).inter_quant_bias = value as c_int;
}
else {
(*self.ptr).inter_quant_bias = FF_DEFAULT_QUANT_BIAS;
(*self.as_mut_ptr()).inter_quant_bias = FF_DEFAULT_QUANT_BIAS;
}
}
}
pub fn set_mb_decision(&mut self, value: Decision) {
unsafe {
(*self.ptr).mb_decision = value.into();
(*self.as_mut_ptr()).mb_decision = value.into();
}
}
}