Commit 059d357a authored by David Michael Barr's avatar David Michael Barr
Browse files

Add speed setting for CDEF

parent d4446c6d
...@@ -132,7 +132,8 @@ pub struct SpeedSettings { ...@@ -132,7 +132,8 @@ pub struct SpeedSettings {
pub prediction_modes: PredictionModesSetting, pub prediction_modes: PredictionModesSetting,
pub include_near_mvs: bool, pub include_near_mvs: bool,
pub no_scene_detection: bool, pub no_scene_detection: bool,
pub diamond_me: bool pub diamond_me: bool,
pub cdef: bool
} }
impl Default for SpeedSettings { impl Default for SpeedSettings {
...@@ -150,6 +151,7 @@ impl Default for SpeedSettings { ...@@ -150,6 +151,7 @@ impl Default for SpeedSettings {
include_near_mvs: false, include_near_mvs: false,
no_scene_detection: false, no_scene_detection: false,
diamond_me: false, diamond_me: false,
cdef: false,
} }
} }
} }
...@@ -169,6 +171,7 @@ impl SpeedSettings { ...@@ -169,6 +171,7 @@ impl SpeedSettings {
include_near_mvs: Self::include_near_mvs_preset(speed), include_near_mvs: Self::include_near_mvs_preset(speed),
no_scene_detection: Self::no_scene_detection_preset(speed), no_scene_detection: Self::no_scene_detection_preset(speed),
diamond_me: Self::diamond_me_preset(speed), diamond_me: Self::diamond_me_preset(speed),
cdef: Self::cdef_preset(speed),
} }
} }
...@@ -243,6 +246,10 @@ impl SpeedSettings { ...@@ -243,6 +246,10 @@ impl SpeedSettings {
fn diamond_me_preset(_speed: usize) -> bool { fn diamond_me_preset(_speed: usize) -> bool {
true true
} }
fn cdef_preset(_speed: usize) -> bool {
true
}
} }
#[allow(dead_code, non_camel_case_types)] #[allow(dead_code, non_camel_case_types)]
......
...@@ -484,6 +484,9 @@ fn apply_speed_test_cfg(cfg: &mut EncoderConfig, setting: &str) { ...@@ -484,6 +484,9 @@ fn apply_speed_test_cfg(cfg: &mut EncoderConfig, setting: &str) {
"diamond_me" => { "diamond_me" => {
cfg.speed_settings.diamond_me = true; cfg.speed_settings.diamond_me = true;
} }
"cdef" => {
cfg.speed_settings.cdef = true;
}
setting => { setting => {
panic!("Unrecognized speed test setting {}", setting); panic!("Unrecognized speed test setting {}", setting);
} }
......
...@@ -310,7 +310,7 @@ impl Sequence { ...@@ -310,7 +310,7 @@ impl Sequence {
enable_ref_frame_mvs: false, enable_ref_frame_mvs: false,
enable_warped_motion: false, enable_warped_motion: false,
enable_superres: false, enable_superres: false,
enable_cdef: true, enable_cdef: config.speed_settings.cdef,
enable_restoration: config.chroma_sampling != ChromaSampling::Cs422 && enable_restoration: config.chroma_sampling != ChromaSampling::Cs422 &&
config.chroma_sampling != ChromaSampling::Cs444, // FIXME: not working yet config.chroma_sampling != ChromaSampling::Cs444, // FIXME: not working yet
operating_points_cnt_minus_1: 0, operating_points_cnt_minus_1: 0,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment