Commit c5d838cc authored by Thomas Daede's avatar Thomas Daede

Revert "Add smooth-hv support."

parent 83d0b06e
......@@ -23,7 +23,7 @@ cargo run --bin rav1e -- input.y4m -o output.ivf
```
mkdir aom_test
cd aom_test
../aom_build/aom/configure --disable-av1-encoder --enable-debug --enable-experimental --disable-unit-tests --disable-aom_qm --disable-ext-intra --disable-loop_restoration --disable-ext_partition --disable-ext_partition_types --disable-loopfilter_level --disable-intra_edge --disable-cfl --disable-kf-ctx --disable-striped_loop_restoration --disable-max_tile --disable-ext-intra-mod --disable-frame_size --disable-q_adapt_probs --disable-simplify_tx_mode --disable-obu
../aom_build/aom/configure --enable-debug --enable-experimental --enable-new_multisymbol --disable-unit-tests --disable-smooth_hv --disable-aom_qm --disable-ext-intra --disable-loop_restoration --disable-ext_partition --disable-ext_partition_types --disable-loopfilter_level --disable-intra_edge --disable-cfl --disable-kf-ctx --disable-striped_loop_restoration --disable-max_tile --disable-ext-intra-mod --disable-frame_size
make -j8
./aomdec ../output.ivf -o output.y4m
```
Subproject commit 22e4bfd977cc5ac1dae5330cf6c3e0234a28e32c
Subproject commit f8126e003b983654d5afdba11ac405733b4cc997
......@@ -158,7 +158,7 @@
#define CONFIG_AOM_QM 0
#define CONFIG_ONE_SIDED_COMPOUND 1
#define CONFIG_EXT_COMP_REFS 0
#define CONFIG_SMOOTH_HV 1
#define CONFIG_SMOOTH_HV 0
#define CONFIG_VAR_REFS 0
#define CONFIG_RECT_INTRA_PRED 0
#define CONFIG_LGT 0
......
......@@ -24,8 +24,8 @@ const MAX_SB_SIZE_LOG2: usize = 6;
const MAX_SB_SIZE: usize = (1 << MAX_SB_SIZE_LOG2);
const MAX_SB_SQUARE: usize = (MAX_SB_SIZE * MAX_SB_SIZE);
const INTRA_MODES: usize = 13;
const UV_INTRA_MODES: usize = 13;
const INTRA_MODES: usize = 11;
const UV_INTRA_MODES: usize = 11;
const b_width_log2_lookup: [u8; 20] = [0, 0, 0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 0, 2, 1, 3];
const b_height_log2_lookup: [u8; 20] = [ 0, 0, 0, 0, 1, 0, 1, 2, 1, 2, 3, 2, 3, 4, 3, 4, 2, 0, 3, 1];
......
......@@ -192,7 +192,7 @@ pub fn write_ivf_header(output_file: &mut Write, width: usize, height: usize) {
output_file.write_u16::<LittleEndian>(width as u16).unwrap();
output_file.write_u16::<LittleEndian>(height as u16).unwrap();
output_file.write_u32::<LittleEndian>(60).unwrap();
output_file.write_u32::<LittleEndian>(1).unwrap();
output_file.write_u32::<LittleEndian>(0).unwrap();
output_file.write_u32::<LittleEndian>(0).unwrap();
output_file.write_u32::<LittleEndian>(0).unwrap();
}
......
......@@ -76,32 +76,30 @@ pub enum TxType {
#[derive(Copy, Clone, Debug, PartialEq)]
pub enum PredictionMode {
DC_PRED, // Average of above and left pixels
V_PRED, // Vertical
H_PRED, // Horizontal
D45_PRED, // Directional 45 deg = round(arctan(1/1) * 180/pi)
D135_PRED, // Directional 135 deg = 180 - 45
D117_PRED, // Directional 117 deg = 180 - 63
D153_PRED, // Directional 153 deg = 180 - 27
D207_PRED, // Directional 207 deg = 180 + 27
D63_PRED, // Directional 63 deg = round(arctan(2/1) * 180/pi)
SMOOTH_PRED, // Combination of horizontal and vertical interpolation
SMOOTH_V_PRED,
SMOOTH_H_PRED,
TM_PRED, // True-motion
NEARESTMV,
NEARMV,
ZEROMV,
NEWMV,
// Compound ref compound modes
NEAREST_NEARESTMV,
NEAR_NEARMV,
NEAREST_NEWMV,
NEW_NEARESTMV,
NEAR_NEWMV,
NEW_NEARMV,
ZERO_ZEROMV,
NEW_NEWMV,
DC_PRED, // Average of above and left pixels
V_PRED, // Vertical
H_PRED, // Horizontal
D45_PRED, // Directional 45 deg = round(arctan(1/1) * 180/pi)
D135_PRED, // Directional 135 deg = 180 - 45
D117_PRED, // Directional 117 deg = 180 - 63
D153_PRED, // Directional 153 deg = 180 - 27
D207_PRED, // Directional 207 deg = 180 + 27
D63_PRED, // Directional 63 deg = round(arctan(2/1) * 180/pi)
SMOOTH_PRED, // Combination of horizontal and vertical interpolation
TM_PRED, // True-motion
NEARESTMV,
NEARMV,
ZEROMV,
NEWMV,
// Compound ref compound modes
NEAREST_NEARESTMV,
NEAR_NEARMV,
NEAREST_NEWMV,
NEW_NEARESTMV,
NEAR_NEWMV,
NEW_NEARMV,
ZERO_ZEROMV,
NEW_NEWMV,
}
use plane::*;
......
extern {
static dc_qlookup_Q3: [i16; 256];
static ac_qlookup_Q3: [i16; 256];
static dc_qlookup: [i16; 256];
static ac_qlookup: [i16; 256];
}
pub fn dc_q(qindex: usize) -> i16 {
unsafe {
dc_qlookup_Q3[qindex]
dc_qlookup[qindex]
}
}
pub fn ac_q(qindex: usize) -> i16 {
unsafe {
ac_qlookup_Q3[qindex]
ac_qlookup[qindex]
}
}
......
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