Commit 70477dc9 authored by Yushin Cho's avatar Yushin Cho Committed by Thomas Daede

Fix for 32x16, 32x8, etc. rect tx functions to have idtx tx_type as well

parent 49a73a03
......@@ -2120,16 +2120,24 @@ pub fn fht16x32(
input: &[i16], output: &mut [i32], stride: usize, tx_type: TxType,
bit_depth: usize
) {
assert!(tx_type == TxType::DCT_DCT);
Block16x32::fwd_txfm2d(input, output, stride, tx_type, bit_depth);
assert!(tx_type == TxType::DCT_DCT || tx_type == TxType::IDTX);
if tx_type == TxType::DCT_DCT {
Block16x32::fwd_txfm2d(input, output, stride, tx_type, bit_depth);
} else {
Block16x32::fwd_txfm2d_rs(input, output, stride, tx_type, bit_depth);
}
}
pub fn fht32x16(
input: &[i16], output: &mut [i32], stride: usize, tx_type: TxType,
bit_depth: usize
) {
assert!(tx_type == TxType::DCT_DCT);
Block32x16::fwd_txfm2d(input, output, stride, tx_type, bit_depth);
assert!(tx_type == TxType::DCT_DCT || tx_type == TxType::IDTX);
if tx_type == TxType::DCT_DCT {
Block32x16::fwd_txfm2d(input, output, stride, tx_type, bit_depth);
} else {
Block32x16::fwd_txfm2d_rs(input, output, stride, tx_type, bit_depth);
}
}
pub fn fht32x64(
......@@ -2192,15 +2200,23 @@ pub fn fht8x32(
input: &[i16], output: &mut [i32], stride: usize, tx_type: TxType,
bit_depth: usize
) {
assert!(tx_type == TxType::DCT_DCT);
Block8x32::fwd_txfm2d(input, output, stride, tx_type, bit_depth);
assert!(tx_type == TxType::DCT_DCT || tx_type == TxType::IDTX);
if tx_type == TxType::DCT_DCT {
Block8x32::fwd_txfm2d(input, output, stride, tx_type, bit_depth);
} else {
Block8x32::fwd_txfm2d_rs(input, output, stride, tx_type, bit_depth);
}
}
pub fn fht32x8(
input: &[i16], output: &mut [i32], stride: usize, tx_type: TxType,
bit_depth: usize
) {
assert!(tx_type == TxType::DCT_DCT);
Block32x8::fwd_txfm2d(input, output, stride, tx_type, bit_depth);
assert!(tx_type == TxType::DCT_DCT || tx_type == TxType::IDTX);
if tx_type == TxType::DCT_DCT {
Block32x8::fwd_txfm2d(input, output, stride, tx_type, bit_depth);
} else {
Block32x8::fwd_txfm2d_rs(input, output, stride, tx_type, bit_depth);
}
}
pub fn fht16x64(
......
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