fix(codec/encoder): remove motion estimation settings, removed in 5.0

This commit is contained in:
tilpner
2023-05-24 17:22:59 +02:00
committed by Till Höppner
parent f71537aafb
commit 4bf4bfcbdd
3 changed files with 1 additions and 72 deletions
-3
View File
@@ -10,9 +10,6 @@ pub use self::audio::Encoder as Audio;
pub mod subtitle;
pub use self::subtitle::Encoder as Subtitle;
pub mod motion_estimation;
pub use self::motion_estimation::MotionEstimation;
pub mod comparison;
pub use self::comparison::Comparison;
-53
View File
@@ -1,53 +0,0 @@
use libc::c_int;
#[derive(Eq, PartialEq, Clone, Copy, Debug)]
#[cfg_attr(feature = "serde", derive(serde_derive::Serialize, serde_derive::Deserialize))]
#[cfg_attr(feature = "serde", serde(crate = "serde_", rename_all = "kebab-case"))]
pub enum MotionEstimation {
Zero,
Full,
Log,
Phods,
Epzs,
X1,
Hex,
Umh,
Iter,
Tesa,
}
impl From<c_int> for MotionEstimation {
fn from(value: c_int) -> MotionEstimation {
match value {
1 => MotionEstimation::Zero,
2 => MotionEstimation::Full,
3 => MotionEstimation::Log,
4 => MotionEstimation::Phods,
5 => MotionEstimation::Epzs,
6 => MotionEstimation::X1,
7 => MotionEstimation::Hex,
8 => MotionEstimation::Umh,
9 => MotionEstimation::Iter,
10 => MotionEstimation::Tesa,
_ => MotionEstimation::Zero,
}
}
}
impl Into<c_int> for MotionEstimation {
fn into(self) -> c_int {
match self {
MotionEstimation::Zero => 1,
MotionEstimation::Full => 2,
MotionEstimation::Log => 3,
MotionEstimation::Phods => 4,
MotionEstimation::Epzs => 5,
MotionEstimation::X1 => 6,
MotionEstimation::Hex => 7,
MotionEstimation::Umh => 8,
MotionEstimation::Iter => 9,
MotionEstimation::Tesa => 10,
}
}
}
+1 -16
View File
@@ -10,7 +10,7 @@ use crate::{
codec::{traits, Context},
color,
ffi::*,
format, frame, packet, Dictionary, Error, Rational,
format, Dictionary, Error, Rational,
};
pub struct Video(pub Super);
@@ -119,14 +119,6 @@ impl Video {
unsafe { format::Pixel::from((*self.as_ptr()).pix_fmt) }
}
#[inline]
#[cfg(feature = "ff_api_motion_est")]
pub fn set_motion_estimation(&mut self, value: MotionEstimation) {
unsafe {
(*self.as_mut_ptr()).me_method = value.into();
}
}
#[inline]
pub fn set_max_b_frames(&mut self, value: usize) {
unsafe {
@@ -246,13 +238,6 @@ impl Video {
}
}
#[inline]
pub fn set_pre_me(&mut self, value: MotionEstimation) {
unsafe {
(*self.as_mut_ptr()).pre_me = value.into();
}
}
#[inline]
pub fn set_me_pre_comparison(&mut self, value: Comparison) {
unsafe {