From 0cc75664f579f511681ee7000741484a1d849061 Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Thu, 14 Oct 2021 16:20:04 +0200 Subject: [PATCH] vp7: split off data for the upcoming VP8 decoder --- nihav-duck/src/codecs/mod.rs | 12 +- nihav-duck/src/codecs/vp7.rs | 328 ++----- nihav-duck/src/codecs/vp78.rs | 261 +++++ .../src/codecs/{vp7data.rs => vp78data.rs} | 79 +- .../src/codecs/{vp7dsp.rs => vp78dsp.rs} | 175 +--- nihav-duck/src/codecs/vp7dsp.rs | 892 ++++-------------- 6 files changed, 527 insertions(+), 1220 deletions(-) create mode 100644 nihav-duck/src/codecs/vp78.rs rename nihav-duck/src/codecs/{vp7data.rs => vp78data.rs} (79%) copy nihav-duck/src/codecs/{vp7dsp.rs => vp78dsp.rs} (74%) rewrite nihav-duck/src/codecs/vp7dsp.rs (74%) diff --git a/nihav-duck/src/codecs/mod.rs b/nihav-duck/src/codecs/mod.rs index 821334a..1153c13 100644 --- a/nihav-duck/src/codecs/mod.rs +++ b/nihav-duck/src/codecs/mod.rs @@ -44,13 +44,23 @@ mod vp6; #[allow(clippy::useless_let_if_seq)] mod vp7; #[cfg(feature="decoder_vp7")] -mod vp7data; +mod vp78data; #[cfg(feature="decoder_vp7")] #[allow(clippy::erasing_op)] #[allow(clippy::needless_range_loop)] #[allow(clippy::too_many_arguments)] #[allow(clippy::useless_let_if_seq)] mod vp7dsp; +#[cfg(feature="decoder_vp7")] +#[allow(clippy::needless_range_loop)] +#[allow(clippy::useless_let_if_seq)] +mod vp78; +#[cfg(feature="decoder_vp7")] +#[allow(clippy::erasing_op)] +#[allow(clippy::needless_range_loop)] +#[allow(clippy::too_many_arguments)] +#[allow(clippy::useless_let_if_seq)] +mod vp78dsp; #[cfg(any(feature="decoder_dk3_adpcm", feature="decoder_dk4_adpcm"))] mod dkadpcm; diff --git a/nihav-duck/src/codecs/vp7.rs b/nihav-duck/src/codecs/vp7.rs index b46cbad..95f2575 100644 --- a/nihav-duck/src/codecs/vp7.rs +++ b/nihav-duck/src/codecs/vp7.rs @@ -1,83 +1,12 @@ use nihav_core::codecs::*; use nihav_core::io::byteio::*; use nihav_codec_support::codecs::{MV, ZERO_MV}; -use nihav_codec_support::data::GenericCache; use super::vpcommon::*; -use super::vp7data::*; +use super::vp78::*; +use super::vp78data::*; +use super::vp78dsp::*; use super::vp7dsp::*; -enum VPTreeDef { - Index(u8), - Value(T), -} - -trait VPTreeReader { - fn read_tree(&mut self, tree_def: &[VPTreeDef], tree_prob: &[u8]) -> T; -} - -impl<'a> VPTreeReader for BoolCoder<'a> { - fn read_tree(&mut self, tree_def: &[VPTreeDef], tree_prob: &[u8]) -> T { - let mut idx = 0; - - loop { - let bit = self.read_prob(tree_prob[idx >> 1]); - match tree_def[idx + (bit as usize)] { - VPTreeDef::Value(v) => return v, - VPTreeDef::Index(ix) => { idx = ix as usize; }, - }; - } - } -} - -#[repr(u8)] -#[derive(Clone,Copy,PartialEq,Debug)] -enum PredMode { - DCPred, - HPred, - VPred, - TMPred, - BPred, - - //sub-block prediction modes - LDPred, - RDPred, - VRPred, - VLPred, - HDPred, - HUPred, - - Inter, -} - -impl Default for PredMode { - fn default() -> Self { PredMode::DCPred } -} - -impl PredMode { - fn to_b_mode(self) -> Self { - if self == PredMode::DCPred { - self - } else { - PredMode::TMPred - } - } - fn to_b_index(self) -> usize { - match self { - PredMode::DCPred => 0, - PredMode::TMPred => 1, - PredMode::VPred => 2, - PredMode::HPred => 3, - PredMode::LDPred => 4, - PredMode::RDPred => 5, - PredMode::VRPred => 6, - PredMode::VLPred => 7, - PredMode::HDPred => 8, - PredMode::HUPred => 9, - _ => unreachable!(), - } - } -} - const PITCH_MODE_NORMAL: u8 = 0; const PITCH_MODE_FOUR: u8 = 1; const PITCH_MODE_X2: u8 = 2; @@ -90,53 +19,6 @@ struct MBFeature { def_val: [u8; 4], } -#[derive(Clone,Copy,PartialEq)] -enum DCTToken { - Zero, - One, - Two, - Three, - Four, - Cat1, - Cat2, - Cat3, - Cat4, - Cat5, - Cat6, - EOB, -} - -fn expand_token(bc: &mut BoolCoder, token: DCTToken) -> i16 { - let cat; - match token { - DCTToken::Zero => return 0, - DCTToken::One => return if bc.read_bool() { -1 } else { 1 }, - DCTToken::Two => return if bc.read_bool() { -2 } else { 2 }, - DCTToken::Three => return if bc.read_bool() { -3 } else { 3 }, - DCTToken::Four => return if bc.read_bool() { -4 } else { 4 }, - DCTToken::Cat1 => cat = 0, - DCTToken::Cat2 => cat = 1, - DCTToken::Cat3 => cat = 2, - DCTToken::Cat4 => cat = 3, - DCTToken::Cat5 => cat = 4, - DCTToken::Cat6 => cat = 5, - _ => unreachable!(), - }; - let mut add = 0i16; - let add_probs = &VP56_COEF_ADD_PROBS[cat]; - for prob in add_probs.iter() { - if *prob == 128 { break; } - add = (add << 1) | (bc.read_prob(*prob) as i16); - } - let sign = bc.read_bool(); - let level = VP56_COEF_BASE[cat] + add; - if !sign { - level - } else { - -level - } -} - struct SBParams<'a> { coef_probs: &'a [[[[u8; 11]; 3]; 8]; 4], scan: &'a [usize; 16], @@ -218,22 +100,6 @@ impl DecoderState { } } -#[derive(Clone,Copy,Debug,PartialEq)] -enum MVSplitMode { - TopBottom, - LeftRight, - Quarters, - Sixteenths, -} - -#[derive(Clone,Copy,Debug,PartialEq)] -enum SubMVRef { - Left, - Above, - New, - Zero, -} - fn decode_mv_component(bc: &mut BoolCoder, probs: &[u8; 17]) -> i16 { const LONG_VECTOR_ORDER: [usize; 7] = [ 0, 1, 2, 7, 6, 5, 4 ]; @@ -259,54 +125,6 @@ fn decode_mv_component(bc: &mut BoolCoder, probs: &[u8; 17]) -> i16 { } } -struct PredCache { - y_pred: GenericCache, - u_pred: GenericCache, - v_pred: GenericCache, - y2_pred: GenericCache, - y_pred_left: [u8; 4], - u_pred_left: [u8; 2], - v_pred_left: [u8; 2], - y2_pred_left: u8, -} - -impl PredCache { - fn new() -> Self { - Self { - y_pred: GenericCache::new(1, 1, 0), - u_pred: GenericCache::new(1, 1, 0), - v_pred: GenericCache::new(1, 1, 0), - y2_pred: GenericCache::new(1, 1, 0), - y_pred_left: [0; 4], - u_pred_left: [0; 2], - v_pred_left: [0; 2], - y2_pred_left: 0, - } - } - fn resize(&mut self, mb_w: usize) { - self.y_pred = GenericCache::new(4, mb_w * 4 + 1, 0); - self.u_pred = GenericCache::new(2, mb_w * 2 + 1, 0); - self.v_pred = GenericCache::new(2, mb_w * 2 + 1, 0); - self.y2_pred = GenericCache::new(1, mb_w + 1, 0); - } - fn reset(&mut self) { - self.y_pred.reset(); - self.u_pred.reset(); - self.v_pred.reset(); - self.y2_pred.reset(); - self.y_pred_left = [0; 4]; - self.u_pred_left = [0; 2]; - self.v_pred_left = [0; 2]; - self.y2_pred_left = 0; - } - fn update_row(&mut self) { - self.y_pred.update_row(); - self.u_pred.update_row(); - self.v_pred.update_row(); - self.y2_pred.update_row(); - } -} - struct VP7Decoder { info: NACodecInfoRef, @@ -1467,90 +1285,74 @@ mod test { } } -/*const DEFAULT_ZIGZAG: [usize; 16] = [ - 0, 1, 5, 6, - 2, 4, 7, 12, - 3, 8, 11, 13, - 9, 10, 14, 15 -];*/ -const DEFAULT_SCAN_ORDER: [usize; 16] = [ - 0, 1, 4, 8, - 5, 2, 3, 6, - 9, 12, 13, 10, - 7, 11, 14, 15 +const MV_UPDATE_PROBS: [[u8; 17]; 2] = [ + [ 237, 246, 253, 253, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 250, 250, 252 ], + [ 231, 243, 245, 253, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 251, 251, 254 ] ]; - -const Y_MODE_TREE: &[VPTreeDef] = &[ - VPTreeDef::Value(PredMode::DCPred), VPTreeDef::Index(2), - VPTreeDef::Index(4), VPTreeDef::Index(6), - VPTreeDef::Value(PredMode::VPred), VPTreeDef::Value(PredMode::HPred), - VPTreeDef::Value(PredMode::TMPred), VPTreeDef::Value(PredMode::BPred), -]; -const KF_Y_MODE_TREE: &[VPTreeDef] = &[ - VPTreeDef::Value(PredMode::BPred), VPTreeDef::Index(2), - VPTreeDef::Index(4), VPTreeDef::Index(6), - VPTreeDef::Value(PredMode::DCPred), VPTreeDef::Value(PredMode::VPred), - VPTreeDef::Value(PredMode::HPred), VPTreeDef::Value(PredMode::TMPred), -]; -const UV_MODE_TREE: &[VPTreeDef] = &[ - VPTreeDef::Value(PredMode::DCPred), VPTreeDef::Index(2), - VPTreeDef::Value(PredMode::VPred), VPTreeDef::Index(4), - VPTreeDef::Value(PredMode::HPred), VPTreeDef::Value(PredMode::TMPred) -]; -const B_MODE_TREE: &[VPTreeDef] = &[ - VPTreeDef::Value(PredMode::DCPred), VPTreeDef::Index(2), - VPTreeDef::Value(PredMode::TMPred), VPTreeDef::Index(4), - VPTreeDef::Value(PredMode::VPred), VPTreeDef::Index(6), - VPTreeDef::Index(8), VPTreeDef::Index(12), - VPTreeDef::Value(PredMode::HPred), VPTreeDef::Index(10), - VPTreeDef::Value(PredMode::RDPred), VPTreeDef::Value(PredMode::VRPred), - VPTreeDef::Value(PredMode::LDPred), VPTreeDef::Index(14), - VPTreeDef::Value(PredMode::VLPred), VPTreeDef::Index(16), - VPTreeDef::Value(PredMode::HDPred), VPTreeDef::Value(PredMode::HUPred) +const DEFAULT_MV_PROBS: [[u8; 17]; 2] = [ + [ 162, 128, 225, 146, 172, 147, 214, 39, 156, 247, 210, 135, 68, 138, 220, 239, 246 ], + [ 164, 128, 204, 170, 119, 235, 140, 230, 228, 244, 184, 201, 44, 173, 221, 239, 253 ] ]; -const FEATURE_TREE: &[VPTreeDef] = &[ - VPTreeDef::Index(2), VPTreeDef::Index(4), - VPTreeDef::Value(0), VPTreeDef::Value(1), - VPTreeDef::Value(2), VPTreeDef::Value(3) +const SUB_MV_REF_PROBS: [u8; 3] = [ 180, 162, 25 ]; + +const Y_DC_QUANTS: [i16; 128] = [ + 4, 4, 5, 6, 6, 7, 8, 8, 9, 10, 11, 12, 13, 14, 15, 16, + 17, 18, 19, 20, 21, 22, 23, 23, 24, 25, 26, 27, 28, 29, 30, 31, + 32, 33, 33, 34, 35, 36, 36, 37, 38, 39, 39, 40, 41, 41, 42, 43, + 43, 44, 45, 45, 46, 47, 48, 48, 49, 50, 51, 52, 53, 53, 54, 56, + 57, 58, 59, 60, 62, 63, 65, 66, 68, 70, 72, 74, 76, 79, 81, 84, + 87, 90, 93, 96, 100, 104, 108, 112, 116, 121, 126, 131, 136, 142, 148, 154, + 160, 167, 174, 182, 189, 198, 206, 215, 224, 234, 244, 254, 265, 277, 288, 301, + 313, 327, 340, 355, 370, 385, 401, 417, 434, 452, 470, 489, 509, 529, 550, 572 ]; - -const COEF_TREE: &[VPTreeDef] = &[ - VPTreeDef::Value(DCTToken::EOB), VPTreeDef::Index(2), - VPTreeDef::Value(DCTToken::Zero), VPTreeDef::Index(4), - VPTreeDef::Value(DCTToken::One), VPTreeDef::Index(6), - VPTreeDef::Index(8), VPTreeDef::Index(12), - VPTreeDef::Value(DCTToken::Two), VPTreeDef::Index(10), - VPTreeDef::Value(DCTToken::Three), VPTreeDef::Value(DCTToken::Four), - VPTreeDef::Index(14), VPTreeDef::Index(16), - VPTreeDef::Value(DCTToken::Cat1), VPTreeDef::Value(DCTToken::Cat2), - VPTreeDef::Index(18), VPTreeDef::Index(20), - VPTreeDef::Value(DCTToken::Cat3), VPTreeDef::Value(DCTToken::Cat4), - VPTreeDef::Value(DCTToken::Cat5), VPTreeDef::Value(DCTToken::Cat6) +const Y_AC_QUANTS: [i16; 128] = [ + 4, 4, 5, 5, 6, 6, 7, 8, 9, 10, 11, 12, 13, 15, 16, 17, + 19, 20, 22, 23, 25, 26, 28, 29, 31, 32, 34, 35, 37, 38, 40, 41, + 42, 44, 45, 46, 48, 49, 50, 51, 53, 54, 55, 56, 57, 58, 59, 61, + 62, 63, 64, 65, 67, 68, 69, 70, 72, 73, 75, 76, 78, 80, 82, 84, + 86, 88, 91, 93, 96, 99, 102, 105, 109, 112, 116, 121, 125, 130, 135, 140, + 146, 152, 158, 165, 172, 180, 188, 196, 205, 214, 224, 234, 245, 256, 268, 281, + 294, 308, 322, 337, 353, 369, 386, 404, 423, 443, 463, 484, 506, 529, 553, 578, + 604, 631, 659, 688, 718, 749, 781, 814, 849, 885, 922, 960, 1000, 1041, 1083, 1127 ]; - -const MV_REF_TREE: &[VPTreeDef] = &[ - VPTreeDef::Value(VPMBType::InterNoMV), VPTreeDef::Index(2), - VPTreeDef::Value(VPMBType::InterNearest), VPTreeDef::Index(4), - VPTreeDef::Value(VPMBType::InterNear), VPTreeDef::Index(6), - VPTreeDef::Value(VPMBType::InterMV), VPTreeDef::Value(VPMBType::InterFourMV) +const Y2_DC_QUANTS: [i16; 128] = [ + 7, 9, 11, 13, 15, 17, 19, 21, 23, 26, 28, 30, 33, 35, 37, 39, + 42, 44, 46, 48, 51, 53, 55, 57, 59, 61, 63, 65, 67, 69, 70, 72, + 74, 75, 77, 78, 80, 81, 83, 84, 85, 87, 88, 89, 90, 92, 93, 94, + 95, 96, 97, 99, 100, 101, 102, 104, 105, 106, 108, 109, 111, 113, 114, 116, + 118, 120, 123, 125, 128, 131, 134, 137, 140, 144, 148, 152, 156, 161, 166, 171, + 176, 182, 188, 195, 202, 209, 217, 225, 234, 243, 253, 263, 274, 285, 297, 309, + 322, 336, 350, 365, 381, 397, 414, 432, 450, 470, 490, 511, 533, 556, 579, 604, + 630, 656, 684, 713, 742, 773, 805, 838, 873, 908, 945, 983, 1022, 1063, 1105, 1148 ]; -const SMALL_MV_TREE: &[VPTreeDef] = &[ - VPTreeDef::Index(2), VPTreeDef::Index(8), - VPTreeDef::Index(4), VPTreeDef::Index(6), - VPTreeDef::Value(0), VPTreeDef::Value(1), - VPTreeDef::Value(2), VPTreeDef::Value(3), - VPTreeDef::Index(10), VPTreeDef::Index(12), - VPTreeDef::Value(4), VPTreeDef::Value(5), - VPTreeDef::Value(6), VPTreeDef::Value(7) +const Y2_AC_QUANTS: [i16; 128] = [ + 7, 9, 11, 13, 16, 18, 21, 24, 26, 29, 32, 35, 38, 41, 43, 46, + 49, 52, 55, 58, 61, 64, 66, 69, 72, 74, 77, 79, 82, 84, 86, 88, + 91, 93, 95, 97, 98, 100, 102, 104, 105, 107, 109, 110, 112, 113, 115, 116, + 117, 119, 120, 122, 123, 125, 127, 128, 130, 132, 134, 136, 138, 141, 143, 146, + 149, 152, 155, 158, 162, 166, 171, 175, 180, 185, 191, 197, 204, 210, 218, 226, + 234, 243, 252, 262, 273, 284, 295, 308, 321, 335, 350, 365, 381, 398, 416, 435, + 455, 476, 497, 520, 544, 569, 595, 622, 650, 680, 711, 743, 776, 811, 848, 885, + 925, 965, 1008, 1052, 1097, 1144, 1193, 1244, 1297, 1351, 1407, 1466, 1526, 1588, 1652, 1719 ]; -const MV_SPLIT_MODE_TREE: &[VPTreeDef] = &[ - VPTreeDef::Value(MVSplitMode::Sixteenths), VPTreeDef::Index(2), - VPTreeDef::Value(MVSplitMode::Quarters), VPTreeDef::Index(4), - VPTreeDef::Value(MVSplitMode::TopBottom), VPTreeDef::Value(MVSplitMode::LeftRight) +const UV_DC_QUANTS: [i16; 128] = [ + 4, 4, 5, 6, 6, 7, 8, 8, 9, 10, 11, 12, 13, 14, 15, 16, + 17, 18, 19, 20, 21, 22, 23, 23, 24, 25, 26, 27, 28, 29, 30, 31, + 32, 33, 33, 34, 35, 36, 36, 37, 38, 39, 39, 40, 41, 41, 42, 43, + 43, 44, 45, 45, 46, 47, 48, 48, 49, 50, 51, 52, 53, 53, 54, 56, + 57, 58, 59, 60, 62, 63, 65, 66, 68, 70, 72, 74, 76, 79, 81, 84, + 87, 90, 93, 96, 100, 104, 108, 112, 116, 121, 126, 131, 132, 132, 132, 132, + 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, + 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132 ]; -const SUB_MV_REF_TREE: &[VPTreeDef] = &[ - VPTreeDef::Value(SubMVRef::Left), VPTreeDef::Index(2), - VPTreeDef::Value(SubMVRef::Above), VPTreeDef::Index(4), - VPTreeDef::Value(SubMVRef::Zero), VPTreeDef::Value(SubMVRef::New) +const UV_AC_QUANTS: [i16; 128] = [ + 4, 4, 5, 5, 6, 6, 7, 8, 9, 10, 11, 12, 13, 15, 16, 17, + 19, 20, 22, 23, 25, 26, 28, 29, 31, 32, 34, 35, 37, 38, 40, 41, + 42, 44, 45, 46, 48, 49, 50, 51, 53, 54, 55, 56, 57, 58, 59, 61, + 62, 63, 64, 65, 67, 68, 69, 70, 72, 73, 75, 76, 78, 80, 82, 84, + 86, 88, 91, 93, 96, 99, 102, 105, 109, 112, 116, 121, 125, 130, 135, 140, + 146, 152, 158, 165, 172, 180, 188, 196, 205, 214, 224, 234, 245, 256, 268, 281, + 294, 308, 322, 337, 353, 369, 386, 404, 423, 443, 463, 484, 506, 529, 553, 578, + 604, 631, 659, 688, 718, 749, 781, 814, 849, 885, 922, 960, 1000, 1041, 1083, 1127 ]; diff --git a/nihav-duck/src/codecs/vp78.rs b/nihav-duck/src/codecs/vp78.rs new file mode 100644 index 0000000..5f50e66 --- /dev/null +++ b/nihav-duck/src/codecs/vp78.rs @@ -0,0 +1,261 @@ +use nihav_codec_support::data::GenericCache; +use super::vpcommon::*; + +pub enum VPTreeDef { + Index(u8), + Value(T), +} + +pub trait VPTreeReader { + fn read_tree(&mut self, tree_def: &[VPTreeDef], tree_prob: &[u8]) -> T; +} + +impl<'a> VPTreeReader for BoolCoder<'a> { + fn read_tree(&mut self, tree_def: &[VPTreeDef], tree_prob: &[u8]) -> T { + let mut idx = 0; + + loop { + let bit = self.read_prob(tree_prob[idx >> 1]); + match tree_def[idx + (bit as usize)] { + VPTreeDef::Value(v) => return v, + VPTreeDef::Index(ix) => { idx = ix as usize; }, + }; + } + } +} + +#[repr(u8)] +#[derive(Clone,Copy,PartialEq,Debug)] +pub enum PredMode { + DCPred, + HPred, + VPred, + TMPred, + BPred, + + //sub-block prediction modes + LDPred, + RDPred, + VRPred, + VLPred, + HDPred, + HUPred, + + Inter, +} + +impl Default for PredMode { + fn default() -> Self { PredMode::DCPred } +} + +impl PredMode { + pub fn to_b_mode(self) -> Self { + if self == PredMode::DCPred { + self + } else { + PredMode::TMPred + } + } + pub fn to_b_index(self) -> usize { + match self { + PredMode::DCPred => 0, + PredMode::TMPred => 1, + PredMode::VPred => 2, + PredMode::HPred => 3, + PredMode::LDPred => 4, + PredMode::RDPred => 5, + PredMode::VRPred => 6, + PredMode::VLPred => 7, + PredMode::HDPred => 8, + PredMode::HUPred => 9, + _ => unreachable!(), + } + } +} + +#[derive(Clone,Copy,PartialEq)] +pub enum DCTToken { + Zero, + One, + Two, + Three, + Four, + Cat1, + Cat2, + Cat3, + Cat4, + Cat5, + Cat6, + EOB, +} + +pub fn expand_token(bc: &mut BoolCoder, token: DCTToken) -> i16 { + let cat; + match token { + DCTToken::Zero => return 0, + DCTToken::One => return if bc.read_bool() { -1 } else { 1 }, + DCTToken::Two => return if bc.read_bool() { -2 } else { 2 }, + DCTToken::Three => return if bc.read_bool() { -3 } else { 3 }, + DCTToken::Four => return if bc.read_bool() { -4 } else { 4 }, + DCTToken::Cat1 => cat = 0, + DCTToken::Cat2 => cat = 1, + DCTToken::Cat3 => cat = 2, + DCTToken::Cat4 => cat = 3, + DCTToken::Cat5 => cat = 4, + DCTToken::Cat6 => cat = 5, + _ => unreachable!(), + }; + let mut add = 0i16; + let add_probs = &VP56_COEF_ADD_PROBS[cat]; + for prob in add_probs.iter() { + if *prob == 128 { break; } + add = (add << 1) | (bc.read_prob(*prob) as i16); + } + let sign = bc.read_bool(); + let level = VP56_COEF_BASE[cat] + add; + if !sign { + level + } else { + -level + } +} + +#[derive(Clone,Copy,Debug,PartialEq)] +pub enum MVSplitMode { + TopBottom, + LeftRight, + Quarters, + Sixteenths, +} + +#[derive(Clone,Copy,Debug,PartialEq)] +pub enum SubMVRef { + Left, + Above, + New, + Zero, +} + +pub struct PredCache { + pub y_pred: GenericCache, + pub u_pred: GenericCache, + pub v_pred: GenericCache, + pub y2_pred: GenericCache, + pub y_pred_left: [u8; 4], + pub u_pred_left: [u8; 2], + pub v_pred_left: [u8; 2], + pub y2_pred_left: u8, +} + +impl PredCache { + pub fn new() -> Self { + Self { + y_pred: GenericCache::new(1, 1, 0), + u_pred: GenericCache::new(1, 1, 0), + v_pred: GenericCache::new(1, 1, 0), + y2_pred: GenericCache::new(1, 1, 0), + y_pred_left: [0; 4], + u_pred_left: [0; 2], + v_pred_left: [0; 2], + y2_pred_left: 0, + } + } + pub fn resize(&mut self, mb_w: usize) { + self.y_pred = GenericCache::new(4, mb_w * 4 + 1, 0); + self.u_pred = GenericCache::new(2, mb_w * 2 + 1, 0); + self.v_pred = GenericCache::new(2, mb_w * 2 + 1, 0); + self.y2_pred = GenericCache::new(1, mb_w + 1, 0); + } + pub fn reset(&mut self) { + self.y_pred.reset(); + self.u_pred.reset(); + self.v_pred.reset(); + self.y2_pred.reset(); + self.y_pred_left = [0; 4]; + self.u_pred_left = [0; 2]; + self.v_pred_left = [0; 2]; + self.y2_pred_left = 0; + } + pub fn update_row(&mut self) { + self.y_pred.update_row(); + self.u_pred.update_row(); + self.v_pred.update_row(); + self.y2_pred.update_row(); + } +} + +pub const Y_MODE_TREE: &[VPTreeDef] = &[ + VPTreeDef::Value(PredMode::DCPred), VPTreeDef::Index(2), + VPTreeDef::Index(4), VPTreeDef::Index(6), + VPTreeDef::Value(PredMode::VPred), VPTreeDef::Value(PredMode::HPred), + VPTreeDef::Value(PredMode::TMPred), VPTreeDef::Value(PredMode::BPred), +]; +pub const KF_Y_MODE_TREE: &[VPTreeDef] = &[ + VPTreeDef::Value(PredMode::BPred), VPTreeDef::Index(2), + VPTreeDef::Index(4), VPTreeDef::Index(6), + VPTreeDef::Value(PredMode::DCPred), VPTreeDef::Value(PredMode::VPred), + VPTreeDef::Value(PredMode::HPred), VPTreeDef::Value(PredMode::TMPred), +]; +pub const UV_MODE_TREE: &[VPTreeDef] = &[ + VPTreeDef::Value(PredMode::DCPred), VPTreeDef::Index(2), + VPTreeDef::Value(PredMode::VPred), VPTreeDef::Index(4), + VPTreeDef::Value(PredMode::HPred), VPTreeDef::Value(PredMode::TMPred) +]; +pub const B_MODE_TREE: &[VPTreeDef] = &[ + VPTreeDef::Value(PredMode::DCPred), VPTreeDef::Index(2), + VPTreeDef::Value(PredMode::TMPred), VPTreeDef::Index(4), + VPTreeDef::Value(PredMode::VPred), VPTreeDef::Index(6), + VPTreeDef::Index(8), VPTreeDef::Index(12), + VPTreeDef::Value(PredMode::HPred), VPTreeDef::Index(10), + VPTreeDef::Value(PredMode::RDPred), VPTreeDef::Value(PredMode::VRPred), + VPTreeDef::Value(PredMode::LDPred), VPTreeDef::Index(14), + VPTreeDef::Value(PredMode::VLPred), VPTreeDef::Index(16), + VPTreeDef::Value(PredMode::HDPred), VPTreeDef::Value(PredMode::HUPred) +]; + +pub const FEATURE_TREE: &[VPTreeDef] = &[ + VPTreeDef::Index(2), VPTreeDef::Index(4), + VPTreeDef::Value(0), VPTreeDef::Value(1), + VPTreeDef::Value(2), VPTreeDef::Value(3) +]; + +pub const COEF_TREE: &[VPTreeDef] = &[ + VPTreeDef::Value(DCTToken::EOB), VPTreeDef::Index(2), + VPTreeDef::Value(DCTToken::Zero), VPTreeDef::Index(4), + VPTreeDef::Value(DCTToken::One), VPTreeDef::Index(6), + VPTreeDef::Index(8), VPTreeDef::Index(12), + VPTreeDef::Value(DCTToken::Two), VPTreeDef::Index(10), + VPTreeDef::Value(DCTToken::Three), VPTreeDef::Value(DCTToken::Four), + VPTreeDef::Index(14), VPTreeDef::Index(16), + VPTreeDef::Value(DCTToken::Cat1), VPTreeDef::Value(DCTToken::Cat2), + VPTreeDef::Index(18), VPTreeDef::Index(20), + VPTreeDef::Value(DCTToken::Cat3), VPTreeDef::Value(DCTToken::Cat4), + VPTreeDef::Value(DCTToken::Cat5), VPTreeDef::Value(DCTToken::Cat6) +]; + +pub const MV_REF_TREE: &[VPTreeDef] = &[ + VPTreeDef::Value(VPMBType::InterNoMV), VPTreeDef::Index(2), + VPTreeDef::Value(VPMBType::InterNearest), VPTreeDef::Index(4), + VPTreeDef::Value(VPMBType::InterNear), VPTreeDef::Index(6), + VPTreeDef::Value(VPMBType::InterMV), VPTreeDef::Value(VPMBType::InterFourMV) +]; +pub const SMALL_MV_TREE: &[VPTreeDef] = &[ + VPTreeDef::Index(2), VPTreeDef::Index(8), + VPTreeDef::Index(4), VPTreeDef::Index(6), + VPTreeDef::Value(0), VPTreeDef::Value(1), + VPTreeDef::Value(2), VPTreeDef::Value(3), + VPTreeDef::Index(10), VPTreeDef::Index(12), + VPTreeDef::Value(4), VPTreeDef::Value(5), + VPTreeDef::Value(6), VPTreeDef::Value(7) +]; +pub const MV_SPLIT_MODE_TREE: &[VPTreeDef] = &[ + VPTreeDef::Value(MVSplitMode::Sixteenths), VPTreeDef::Index(2), + VPTreeDef::Value(MVSplitMode::Quarters), VPTreeDef::Index(4), + VPTreeDef::Value(MVSplitMode::TopBottom), VPTreeDef::Value(MVSplitMode::LeftRight) +]; +pub const SUB_MV_REF_TREE: &[VPTreeDef] = &[ + VPTreeDef::Value(SubMVRef::Left), VPTreeDef::Index(2), + VPTreeDef::Value(SubMVRef::Above), VPTreeDef::Index(4), + VPTreeDef::Value(SubMVRef::Zero), VPTreeDef::Value(SubMVRef::New) +]; + diff --git a/nihav-duck/src/codecs/vp7data.rs b/nihav-duck/src/codecs/vp78data.rs similarity index 79% rename from nihav-duck/src/codecs/vp7data.rs rename to nihav-duck/src/codecs/vp78data.rs index 8e60b3b..0d27b06 100644 --- a/nihav-duck/src/codecs/vp7data.rs +++ b/nihav-duck/src/codecs/vp78data.rs @@ -3,16 +3,7 @@ pub const KF_UV_MODE_TREE_PROBS: &[u8; 3] = &[ 142, 114, 183 ]; pub const Y_MODE_TREE_PROBS: &[u8; 4] = &[ 112, 86, 140, 37 ]; pub const UV_MODE_TREE_PROBS: &[u8; 3] = &[ 162, 101, 204 ]; -pub const MV_UPDATE_PROBS: [[u8; 17]; 2] = [ - [ 237, 246, 253, 253, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 250, 250, 252 ], - [ 231, 243, 245, 253, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 251, 251, 254 ] -]; -pub const DEFAULT_MV_PROBS: [[u8; 17]; 2] = [ - [ 162, 128, 225, 146, 172, 147, 214, 39, 156, 247, 210, 135, 68, 138, 220, 239, 246 ], - [ 164, 128, 204, 170, 119, 235, 140, 230, 228, 244, 184, 201, 44, 173, 221, 239, 253 ] -]; pub const MV_SPLIT_MODE_PROBS: [u8; 3] = [ 110, 111, 150 ]; -pub const SUB_MV_REF_PROBS: [u8; 3] = [ 180, 162, 25 ]; pub const INTER_MODE_PROBS: [[u8; 4]; 31] = [ [ 3, 3, 1, 246 ], @@ -442,63 +433,15 @@ pub const DEFAULT_DCT_PROBS: [[[[u8; 11]; 3]; 8]; 4] = [ ] ]; -pub const Y_DC_QUANTS: [i16; 128] = [ - 4, 4, 5, 6, 6, 7, 8, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 20, 21, 22, 23, 23, 24, 25, 26, 27, 28, 29, 30, 31, - 32, 33, 33, 34, 35, 36, 36, 37, 38, 39, 39, 40, 41, 41, 42, 43, - 43, 44, 45, 45, 46, 47, 48, 48, 49, 50, 51, 52, 53, 53, 54, 56, - 57, 58, 59, 60, 62, 63, 65, 66, 68, 70, 72, 74, 76, 79, 81, 84, - 87, 90, 93, 96, 100, 104, 108, 112, 116, 121, 126, 131, 136, 142, 148, 154, - 160, 167, 174, 182, 189, 198, 206, 215, 224, 234, 244, 254, 265, 277, 288, 301, - 313, 327, 340, 355, 370, 385, 401, 417, 434, 452, 470, 489, 509, 529, 550, 572 -]; -pub const Y_AC_QUANTS: [i16; 128] = [ - 4, 4, 5, 5, 6, 6, 7, 8, 9, 10, 11, 12, 13, 15, 16, 17, - 19, 20, 22, 23, 25, 26, 28, 29, 31, 32, 34, 35, 37, 38, 40, 41, - 42, 44, 45, 46, 48, 49, 50, 51, 53, 54, 55, 56, 57, 58, 59, 61, - 62, 63, 64, 65, 67, 68, 69, 70, 72, 73, 75, 76, 78, 80, 82, 84, - 86, 88, 91, 93, 96, 99, 102, 105, 109, 112, 116, 121, 125, 130, 135, 140, - 146, 152, 158, 165, 172, 180, 188, 196, 205, 214, 224, 234, 245, 256, 268, 281, - 294, 308, 322, 337, 353, 369, 386, 404, 423, 443, 463, 484, 506, 529, 553, 578, - 604, 631, 659, 688, 718, 749, 781, 814, 849, 885, 922, 960, 1000, 1041, 1083, 1127 -]; -pub const Y2_DC_QUANTS: [i16; 128] = [ - 7, 9, 11, 13, 15, 17, 19, 21, 23, 26, 28, 30, 33, 35, 37, 39, - 42, 44, 46, 48, 51, 53, 55, 57, 59, 61, 63, 65, 67, 69, 70, 72, - 74, 75, 77, 78, 80, 81, 83, 84, 85, 87, 88, 89, 90, 92, 93, 94, - 95, 96, 97, 99, 100, 101, 102, 104, 105, 106, 108, 109, 111, 113, 114, 116, - 118, 120, 123, 125, 128, 131, 134, 137, 140, 144, 148, 152, 156, 161, 166, 171, - 176, 182, 188, 195, 202, 209, 217, 225, 234, 243, 253, 263, 274, 285, 297, 309, - 322, 336, 350, 365, 381, 397, 414, 432, 450, 470, 490, 511, 533, 556, 579, 604, - 630, 656, 684, 713, 742, 773, 805, 838, 873, 908, 945, 983, 1022, 1063, 1105, 1148 -]; -pub const Y2_AC_QUANTS: [i16; 128] = [ - 7, 9, 11, 13, 16, 18, 21, 24, 26, 29, 32, 35, 38, 41, 43, 46, - 49, 52, 55, 58, 61, 64, 66, 69, 72, 74, 77, 79, 82, 84, 86, 88, - 91, 93, 95, 97, 98, 100, 102, 104, 105, 107, 109, 110, 112, 113, 115, 116, - 117, 119, 120, 122, 123, 125, 127, 128, 130, 132, 134, 136, 138, 141, 143, 146, - 149, 152, 155, 158, 162, 166, 171, 175, 180, 185, 191, 197, 204, 210, 218, 226, - 234, 243, 252, 262, 273, 284, 295, 308, 321, 335, 350, 365, 381, 398, 416, 435, - 455, 476, 497, 520, 544, 569, 595, 622, 650, 680, 711, 743, 776, 811, 848, 885, - 925, 965, 1008, 1052, 1097, 1144, 1193, 1244, 1297, 1351, 1407, 1466, 1526, 1588, 1652, 1719 -]; -pub const UV_DC_QUANTS: [i16; 128] = [ - 4, 4, 5, 6, 6, 7, 8, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 20, 21, 22, 23, 23, 24, 25, 26, 27, 28, 29, 30, 31, - 32, 33, 33, 34, 35, 36, 36, 37, 38, 39, 39, 40, 41, 41, 42, 43, - 43, 44, 45, 45, 46, 47, 48, 48, 49, 50, 51, 52, 53, 53, 54, 56, - 57, 58, 59, 60, 62, 63, 65, 66, 68, 70, 72, 74, 76, 79, 81, 84, - 87, 90, 93, 96, 100, 104, 108, 112, 116, 121, 126, 131, 132, 132, 132, 132, - 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, - 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132 -]; -pub const UV_AC_QUANTS: [i16; 128] = [ - 4, 4, 5, 5, 6, 6, 7, 8, 9, 10, 11, 12, 13, 15, 16, 17, - 19, 20, 22, 23, 25, 26, 28, 29, 31, 32, 34, 35, 37, 38, 40, 41, - 42, 44, 45, 46, 48, 49, 50, 51, 53, 54, 55, 56, 57, 58, 59, 61, - 62, 63, 64, 65, 67, 68, 69, 70, 72, 73, 75, 76, 78, 80, 82, 84, - 86, 88, 91, 93, 96, 99, 102, 105, 109, 112, 116, 121, 125, 130, 135, 140, - 146, 152, 158, 165, 172, 180, 188, 196, 205, 214, 224, 234, 245, 256, 268, 281, - 294, 308, 322, 337, 353, 369, 386, 404, 423, 443, 463, 484, 506, 529, 553, 578, - 604, 631, 659, 688, 718, 749, 781, 814, 849, 885, 922, 960, 1000, 1041, 1083, 1127 +/*const DEFAULT_ZIGZAG: [usize; 16] = [ + 0, 1, 5, 6, + 2, 4, 7, 12, + 3, 8, 11, 13, + 9, 10, 14, 15 +];*/ +pub const DEFAULT_SCAN_ORDER: [usize; 16] = [ + 0, 1, 4, 8, + 5, 2, 3, 6, + 9, 12, 13, 10, + 7, 11, 14, 15 ]; diff --git a/nihav-duck/src/codecs/vp7dsp.rs b/nihav-duck/src/codecs/vp78dsp.rs similarity index 74% copy from nihav-duck/src/codecs/vp7dsp.rs copy to nihav-duck/src/codecs/vp78dsp.rs index 57acc33..04545bd 100644 --- a/nihav-duck/src/codecs/vp7dsp.rs +++ b/nihav-duck/src/codecs/vp78dsp.rs @@ -55,56 +55,6 @@ impl Default for IPredContext { } } -const DCT_COEFFS: [i32; 16] = [ - 23170, 23170, 23170, 23170, - 30274, 12540, -12540, -30274, - 23170, -23170, -23170, 23170, - 12540, -30274, 30274, -12540 -]; - -pub fn idct4x4(coeffs: &mut [i16; 16]) { - let mut tmp = [0i16; 16]; - for (src, dst) in coeffs.chunks(4).zip(tmp.chunks_mut(4)) { - let s0 = i32::from(src[0]); - let s1 = i32::from(src[1]); - let s2 = i32::from(src[2]); - let s3 = i32::from(src[3]); - - let t0 = (s0 + s2).wrapping_mul(23170); - let t1 = (s0 - s2).wrapping_mul(23170); - let t2 = s1.wrapping_mul(30274) + s3.wrapping_mul(12540); - let t3 = s1.wrapping_mul(12540) - s3.wrapping_mul(30274); - - dst[0] = ((t0 + t2) >> 14) as i16; - dst[1] = ((t1 + t3) >> 14) as i16; - dst[2] = ((t1 - t3) >> 14) as i16; - dst[3] = ((t0 - t2) >> 14) as i16; - } - for i in 0..4 { - let s0 = i32::from(tmp[i + 4 * 0]); - let s1 = i32::from(tmp[i + 4 * 1]); - let s2 = i32::from(tmp[i + 4 * 2]); - let s3 = i32::from(tmp[i + 4 * 3]); - - let t0 = (s0 + s2).wrapping_mul(23170) + 0x20000; - let t1 = (s0 - s2).wrapping_mul(23170) + 0x20000; - let t2 = s1.wrapping_mul(30274) + s3.wrapping_mul(12540); - let t3 = s1.wrapping_mul(12540) - s3.wrapping_mul(30274); - - coeffs[i + 0 * 4] = ((t0 + t2) >> 18) as i16; - coeffs[i + 1 * 4] = ((t1 + t3) >> 18) as i16; - coeffs[i + 2 * 4] = ((t1 - t3) >> 18) as i16; - coeffs[i + 3 * 4] = ((t0 - t2) >> 18) as i16; - } -} - -pub fn idct4x4_dc(coeffs: &mut [i16; 16]) { - let dc = ((((i32::from(coeffs[0]) * DCT_COEFFS[0]) >> 14) * DCT_COEFFS[0] + 0x20000) >> 18) as i16; - for el in coeffs.iter_mut() { - *el = dc; - } -} - pub fn add_coeffs4x4(dst: &mut [u8], off: usize, stride: usize, coeffs: &[i16; 16]) { let dst = &mut dst[off..]; for (out, src) in dst.chunks_mut(stride).zip(coeffs.chunks(4)) { @@ -402,93 +352,6 @@ impl IPred4x4 { } } -fn delta(p1: i16, p0: i16, q0: i16, q1: i16) -> i16 { - (p1 - q1) + 3 * (q0 - p0) -} - -pub type LoopFilterFunc = fn(buf: &mut [u8], off: usize, step: usize, stride: usize, len: usize, thr: i16, thr_inner: i16, thr_hev: i16); - -pub fn simple_loop_filter(buf: &mut [u8], mut off: usize, step: usize, stride: usize, len: usize, thr: i16, _thr_inner: i16, _thr_hev: i16) { - for _ in 0..len { - let p1 = i16::from(buf[off - step * 2]); - let p0 = i16::from(buf[off - step * 1]); - let q0 = i16::from(buf[off + step * 0]); - let q1 = i16::from(buf[off + step * 1]); - let dpq = p0 - q0; - if dpq.abs() < thr { - let diff = delta(p1, p0, q0, q1); - let diffq0 = (diff.min(127) + 4) >> 3; - let diffp0 = diffq0 - if (diff & 7) == 4 { 1 } else { 0 }; - buf[off - step * 1] = clip_u8(p0 + diffp0); - buf[off + step * 0] = clip_u8(q0 - diffq0); - } - off += stride; - } -} - -fn normal_loop_filter(buf: &mut [u8], mut off: usize, step: usize, stride: usize, len: usize, thr: i16, thr_inner: i16, thr_hev: i16, edge: bool) { - for _ in 0..len { - let p0 = i16::from(buf[off - step * 1]); - let q0 = i16::from(buf[off + step * 0]); - let dpq = p0 - q0; - if dpq.abs() <= thr { - let p3 = i16::from(buf[off - step * 4]); - let p2 = i16::from(buf[off - step * 3]); - let p1 = i16::from(buf[off - step * 2]); - let q1 = i16::from(buf[off + step * 1]); - let q2 = i16::from(buf[off + step * 2]); - let q3 = i16::from(buf[off + step * 3]); - let dp2 = p3 - p2; - let dp1 = p2 - p1; - let dp0 = p1 - p0; - let dq0 = q1 - q0; - let dq1 = q2 - q1; - let dq2 = q3 - q2; - if (dp0.abs() <= thr_inner) && (dp1.abs() <= thr_inner) && - (dp2.abs() <= thr_inner) && (dq0.abs() <= thr_inner) && - (dq1.abs() <= thr_inner) && (dq2.abs() <= thr_inner) { - let high_edge_variation = (dp0.abs() > thr_hev) || (dq0.abs() > thr_hev); - if high_edge_variation { - let diff = delta(p1, p0, q0, q1); - let diffq0 = (diff.min(127) + 4) >> 3; - let diffp0 = diffq0 - if (diff & 7) == 4 { 1 } else { 0 }; - buf[off - step * 1] = clip_u8(p0 + diffp0); - buf[off + step * 0] = clip_u8(q0 - diffq0); - } else if edge { - let d = delta(p1, p0, q0, q1); - let diff0 = (d * 27 + 63) >> 7; - buf[off - step * 1] = clip_u8(p0 + diff0); - buf[off + step * 0] = clip_u8(q0 - diff0); - let diff1 = (d * 18 + 63) >> 7; - buf[off - step * 2] = clip_u8(p1 + diff1); - buf[off + step * 1] = clip_u8(q1 - diff1); - let diff2 = (d * 9 + 63) >> 7; - buf[off - step * 3] = clip_u8(p2 + diff2); - buf[off + step * 2] = clip_u8(q2 - diff2); - } else { - let diff = 3 * (q0 - p0); - let diffq0 = (diff.min(127) + 4) >> 3; - let diffp0 = diffq0 - if (diff & 7) == 4 { 1 } else { 0 }; - buf[off - step * 1] = clip_u8(p0 + diffp0); - buf[off + step * 0] = clip_u8(q0 - diffq0); - let diff2 = (diffq0 + 1) >> 1; - buf[off - step * 2] = clip_u8(p1 + diff2); - buf[off + step * 1] = clip_u8(q1 - diff2); - } - } - } - off += stride; - } -} - -pub fn normal_loop_filter_inner(buf: &mut [u8], off: usize, step: usize, stride: usize, len: usize, thr: i16, thr_inner: i16, thr_hev: i16) { - normal_loop_filter(buf, off, step, stride, len, thr, thr_inner, thr_hev, false); -} - -pub fn normal_loop_filter_edge(buf: &mut [u8], off: usize, step: usize, stride: usize, len: usize, thr: i16, thr_inner: i16, thr_hev: i16) { - normal_loop_filter(buf, off, step, stride, len, thr, thr_inner, thr_hev, true); -} - const VP7_BICUBIC_FILTERS: [[i16; 6]; 8] = [ [ 0, 0, 128, 0, 0, 0 ], [ 0, -6, 123, 12, -1, 0 ], @@ -582,7 +445,7 @@ fn mc_block(dst: &mut [u8], doff: usize, dstride: usize, xpos: usize, ypos: usiz let ref_y = (ypos as isize) + ((mvy >> 3) as isize) - (EDGE_PRE as isize); let (src, sstride) = if (ref_x < 0) || (ref_x + bsize > wa) || (ref_y < 0) || (ref_y + bsize > ha) { - edge_emu(&reffrm, ref_x, ref_y, bsize as usize, bsize as usize, mc_buf, 32, plane, 0); + edge_emu(&reffrm, ref_x, ref_y, bsize as usize, bsize as usize, mc_buf, 32, plane, 4); (mc_buf as &[u8], 32) } else { let off = reffrm.get_offset(plane); @@ -676,39 +539,3 @@ pub fn mc_block_special(dst: &mut [u8], doff: usize, dstride: usize, xpos: usize _ => unreachable!(), }; } - -pub fn fade_frame(srcfrm: NAVideoBufferRef, dstfrm: &mut NASimpleVideoFrame, alpha: u16, beta: u16) { - let mut fade_lut = [0u8; 256]; - for (i, el) in fade_lut.iter_mut().enumerate() { - let y = i as u16; - *el = (y + ((y * beta) >> 8) + alpha).max(0).min(255) as u8; - } - - let (w, h) = srcfrm.get_dimensions(0); - let (wa, ha) = ((w + 15) & !15, (h + 15) & !15); - let soff = srcfrm.get_offset(0); - let sstride = srcfrm.get_stride(0); - let sdata = srcfrm.get_data(); - let src = &sdata[soff..]; - let dstride = dstfrm.stride[0]; - let dst = &mut dstfrm.data[dstfrm.offset[0]..]; - for (src, dst) in src.chunks(sstride).zip(dst.chunks_mut(dstride)).take(ha) { - for (s, d) in src.iter().zip(dst.iter_mut()).take(wa) { - *d = fade_lut[*s as usize]; - } - } - - for plane in 1..3 { - let (w, h) = srcfrm.get_dimensions(plane); - let (wa, ha) = ((w + 7) & !7, (h + 7) & !7); - let soff = srcfrm.get_offset(plane); - let sstride = srcfrm.get_stride(plane); - let sdata = srcfrm.get_data(); - let src = &sdata[soff..]; - let dstride = dstfrm.stride[plane]; - let dst = &mut dstfrm.data[dstfrm.offset[plane]..]; - for (src, dst) in src.chunks(sstride).zip(dst.chunks_mut(dstride)).take(ha) { - (&mut dst[0..wa]).copy_from_slice(&src[0..wa]); - } - } -} diff --git a/nihav-duck/src/codecs/vp7dsp.rs b/nihav-duck/src/codecs/vp7dsp.rs dissimilarity index 74% index 57acc33..d4c06c6 100644 --- a/nihav-duck/src/codecs/vp7dsp.rs +++ b/nihav-duck/src/codecs/vp7dsp.rs @@ -1,714 +1,178 @@ -use nihav_core::frame::*; -use nihav_codec_support::codecs::blockdsp::edge_emu; - -fn clip_u8(val: i16) -> u8 { - val.max(0).min(255) as u8 -} - -pub struct IPredContext { - pub left: [u8; 16], - pub has_left: bool, - pub top: [u8; 16], - pub has_top: bool, - pub tl: u8, -} - -impl IPredContext { - pub fn fill(&mut self, src: &[u8], off: usize, stride: usize, tsize: usize, lsize: usize) { - if self.has_top { - for i in 0..tsize { - self.top[i] = src[off - stride + i]; - } - for i in tsize..16 { - self.top[i] = 0x80; - } - } else { - self.top = [0x80; 16]; - } - if self.has_left { - for i in 0..lsize { - self.left[i] = src[off - 1 + i * stride]; - } - for i in lsize..16 { - self.left[i] = 0x80; - } - } else { - self.left = [0x80; 16]; - } - if self.has_top && self.has_left { - self.tl = src[off - stride - 1]; - } else { - self.tl = 0x80; - } - } -} - -impl Default for IPredContext { - fn default() -> Self { - Self { - left: [0x80; 16], - top: [0x80; 16], - tl: 0x80, - has_left: false, - has_top: false, - } - } -} - -const DCT_COEFFS: [i32; 16] = [ - 23170, 23170, 23170, 23170, - 30274, 12540, -12540, -30274, - 23170, -23170, -23170, 23170, - 12540, -30274, 30274, -12540 -]; - -pub fn idct4x4(coeffs: &mut [i16; 16]) { - let mut tmp = [0i16; 16]; - for (src, dst) in coeffs.chunks(4).zip(tmp.chunks_mut(4)) { - let s0 = i32::from(src[0]); - let s1 = i32::from(src[1]); - let s2 = i32::from(src[2]); - let s3 = i32::from(src[3]); - - let t0 = (s0 + s2).wrapping_mul(23170); - let t1 = (s0 - s2).wrapping_mul(23170); - let t2 = s1.wrapping_mul(30274) + s3.wrapping_mul(12540); - let t3 = s1.wrapping_mul(12540) - s3.wrapping_mul(30274); - - dst[0] = ((t0 + t2) >> 14) as i16; - dst[1] = ((t1 + t3) >> 14) as i16; - dst[2] = ((t1 - t3) >> 14) as i16; - dst[3] = ((t0 - t2) >> 14) as i16; - } - for i in 0..4 { - let s0 = i32::from(tmp[i + 4 * 0]); - let s1 = i32::from(tmp[i + 4 * 1]); - let s2 = i32::from(tmp[i + 4 * 2]); - let s3 = i32::from(tmp[i + 4 * 3]); - - let t0 = (s0 + s2).wrapping_mul(23170) + 0x20000; - let t1 = (s0 - s2).wrapping_mul(23170) + 0x20000; - let t2 = s1.wrapping_mul(30274) + s3.wrapping_mul(12540); - let t3 = s1.wrapping_mul(12540) - s3.wrapping_mul(30274); - - coeffs[i + 0 * 4] = ((t0 + t2) >> 18) as i16; - coeffs[i + 1 * 4] = ((t1 + t3) >> 18) as i16; - coeffs[i + 2 * 4] = ((t1 - t3) >> 18) as i16; - coeffs[i + 3 * 4] = ((t0 - t2) >> 18) as i16; - } -} - -pub fn idct4x4_dc(coeffs: &mut [i16; 16]) { - let dc = ((((i32::from(coeffs[0]) * DCT_COEFFS[0]) >> 14) * DCT_COEFFS[0] + 0x20000) >> 18) as i16; - for el in coeffs.iter_mut() { - *el = dc; - } -} - -pub fn add_coeffs4x4(dst: &mut [u8], off: usize, stride: usize, coeffs: &[i16; 16]) { - let dst = &mut dst[off..]; - for (out, src) in dst.chunks_mut(stride).zip(coeffs.chunks(4)) { - for (oel, iel) in out.iter_mut().take(4).zip(src.iter()) { - *oel = clip_u8(i16::from(*oel) + *iel); - } - } -} -pub fn add_coeffs16x1(dst: &mut [u8], off: usize, coeffs: &[i16; 16]) { - let dst = &mut dst[off..]; - for (oel, iel) in dst.iter_mut().take(16).zip(coeffs.iter()) { - *oel = clip_u8(i16::from(*oel) + *iel); - } -} - -pub trait IntraPred { - const SIZE: usize; - fn ipred_dc(dst: &mut [u8], mut off: usize, stride: usize, ipred: &IPredContext) { - let dc; - if !ipred.has_left && !ipred.has_top { - dc = 0x80; - } else { - let mut dcsum = 0; - let mut dcshift = match Self::SIZE { - 16 => 3, - _ => 2, - }; - if ipred.has_left { - for el in ipred.left.iter().take(Self::SIZE) { - dcsum += u16::from(*el); - } - dcshift += 1; - } - if ipred.has_top { - for el in ipred.top.iter().take(Self::SIZE) { - dcsum += u16::from(*el); - } - dcshift += 1; - } - dc = ((dcsum + (1 << (dcshift - 1))) >> dcshift) as u8; - } - for _ in 0..Self::SIZE { - let out = &mut dst[off..][..Self::SIZE]; - for el in out.iter_mut() { - *el = dc; - } - off += stride; - } - } - fn ipred_v(dst: &mut [u8], mut off: usize, stride: usize, ipred: &IPredContext) { - for _ in 0..Self::SIZE { - let out = &mut dst[off..][..Self::SIZE]; - out.copy_from_slice(&ipred.top[0..Self::SIZE]); - off += stride; - } - } - fn ipred_h(dst: &mut [u8], mut off: usize, stride: usize, ipred: &IPredContext) { - for leftel in ipred.left.iter().take(Self::SIZE) { - let out = &mut dst[off..][..Self::SIZE]; - for el in out.iter_mut() { - *el = *leftel; - } - off += stride; - } - } - fn ipred_tm(dst: &mut [u8], mut off: usize, stride: usize, ipred: &IPredContext) { - let tl = i16::from(ipred.tl); - for m in 0..Self::SIZE { - for n in 0..Self::SIZE { - dst[off + n] = clip_u8(i16::from(ipred.left[m]) + i16::from(ipred.top[n]) - tl); - } - off += stride; - } - } -} - -pub struct IPred16x16 {} -impl IntraPred for IPred16x16 { const SIZE: usize = 16; } - -pub struct IPred8x8 {} -impl IntraPred for IPred8x8 { const SIZE: usize = 8; } - -macro_rules! load_pred4 { - (topleft; $ipred: expr) => {{ - let tl = u16::from($ipred.tl); - let a0 = u16::from($ipred.top[0]); - let l0 = u16::from($ipred.left[0]); - ((l0 + tl * 2 + a0 + 2) >> 2) as u8 - }}; - (top; $ipred: expr) => {{ - let tl = u16::from($ipred.tl); - let a0 = u16::from($ipred.top[0]); - let a1 = u16::from($ipred.top[1]); - let a2 = u16::from($ipred.top[2]); - let a3 = u16::from($ipred.top[3]); - let a4 = u16::from($ipred.top[4]); - let p0 = ((tl + a0 * 2 + a1 + 2) >> 2) as u8; - let p1 = ((a0 + a1 * 2 + a2 + 2) >> 2) as u8; - let p2 = ((a1 + a2 * 2 + a3 + 2) >> 2) as u8; - let p3 = ((a2 + a3 * 2 + a4 + 2) >> 2) as u8; - (p0, p1, p2, p3) - }}; - (top8; $ipred: expr) => {{ - let t3 = u16::from($ipred.top[3]); - let t4 = u16::from($ipred.top[4]); - let t5 = u16::from($ipred.top[5]); - let t6 = u16::from($ipred.top[6]); - let t7 = u16::from($ipred.top[7]); - let p4 = ((t3 + t4 * 2 + t5 + 2) >> 2) as u8; - let p5 = ((t4 + t5 * 2 + t6 + 2) >> 2) as u8; - let p6 = ((t5 + t6 * 2 + t7 + 2) >> 2) as u8; - let p7 = ((t6 + t7 * 2 + t7 + 2) >> 2) as u8; - (p4, p5, p6, p7) - }}; - (topavg; $ipred: expr) => {{ - let tl = u16::from($ipred.tl); - let a0 = u16::from($ipred.top[0]); - let a1 = u16::from($ipred.top[1]); - let a2 = u16::from($ipred.top[2]); - let a3 = u16::from($ipred.top[3]); - let p0 = ((tl + a0 + 1) >> 1) as u8; - let p1 = ((a0 + a1 + 1) >> 1) as u8; - let p2 = ((a1 + a2 + 1) >> 1) as u8; - let p3 = ((a2 + a3 + 1) >> 1) as u8; - (p0, p1, p2, p3) - }}; - (left; $ipred: expr) => {{ - let tl = u16::from($ipred.tl); - let l0 = u16::from($ipred.left[0]); - let l1 = u16::from($ipred.left[1]); - let l2 = u16::from($ipred.left[2]); - let l3 = u16::from($ipred.left[3]); - let l4 = u16::from($ipred.left[4]); - let p0 = ((tl + l0 * 2 + l1 + 2) >> 2) as u8; - let p1 = ((l0 + l1 * 2 + l2 + 2) >> 2) as u8; - let p2 = ((l1 + l2 * 2 + l3 + 2) >> 2) as u8; - let p3 = ((l2 + l3 * 2 + l4 + 2) >> 2) as u8; - (p0, p1, p2, p3) - }}; - (left8; $ipred: expr) => {{ - let l3 = u16::from($ipred.left[3]); - let l4 = u16::from($ipred.left[4]); - let l5 = u16::from($ipred.left[5]); - let l6 = u16::from($ipred.left[6]); - let l7 = u16::from($ipred.left[7]); - let p4 = ((l3 + l4 * 2 + l5 + 2) >> 2) as u8; - let p5 = ((l4 + l5 * 2 + l6 + 2) >> 2) as u8; - let p6 = ((l5 + l6 * 2 + l7 + 2) >> 2) as u8; - let p7 = ((l6 + l7 * 2 + l7 + 2) >> 2) as u8; - (p4, p5, p6, p7) - }}; - (leftavg; $ipred: expr) => {{ - let tl = u16::from($ipred.tl); - let l0 = u16::from($ipred.left[0]); - let l1 = u16::from($ipred.left[1]); - let l2 = u16::from($ipred.left[2]); - let l3 = u16::from($ipred.left[3]); - let p0 = ((tl + l0 + 1) >> 1) as u8; - let p1 = ((l0 + l1 + 1) >> 1) as u8; - let p2 = ((l1 + l2 + 1) >> 1) as u8; - let p3 = ((l2 + l3 + 1) >> 1) as u8; - (p0, p1, p2, p3) - }}; -} - -pub struct IPred4x4 {} -impl IPred4x4 { - pub fn ipred_dc(dst: &mut [u8], mut off: usize, stride: usize, ipred: &IPredContext) { - let dc; - let mut dcsum = 0; - for el in ipred.left.iter().take(4) { - dcsum += u16::from(*el); - } - for el in ipred.top.iter().take(4) { - dcsum += u16::from(*el); - } - dc = ((dcsum + (1 << 2)) >> 3) as u8; - for _ in 0..4 { - let out = &mut dst[off..][..4]; - for el in out.iter_mut() { - *el = dc; - } - off += stride; - } - } - pub fn ipred_tm(dst: &mut [u8], mut off: usize, stride: usize, ipred: &IPredContext) { - let tl = i16::from(ipred.tl); - for m in 0..4 { - for n in 0..4 { - dst[off + n] = clip_u8(i16::from(ipred.left[m]) + i16::from(ipred.top[n]) - tl); - } - off += stride; - } - } - pub fn ipred_ve(dst: &mut [u8], mut off: usize, stride: usize, ipred: &IPredContext) { - let (v0, v1, v2, v3) = load_pred4!(top; ipred); - let vert_pred = [v0, v1, v2, v3]; - for _ in 0..4 { - let out = &mut dst[off..][..4]; - out.copy_from_slice(&vert_pred); - off += stride; - } - } - pub fn ipred_he(dst: &mut [u8], mut off: usize, stride: usize, ipred: &IPredContext) { - let (p0, p1, p2, _) = load_pred4!(left; ipred); - let p3 = ((u16::from(ipred.left[2]) + u16::from(ipred.left[3]) * 3 + 2) >> 2) as u8; - let hor_pred = [p0, p1, p2, p3]; - for m in 0..4 { - for n in 0..4 { - dst[off + n] = hor_pred[m]; - } - off += stride; - } - } - pub fn ipred_ld(dst: &mut [u8], mut off: usize, stride: usize, ipred: &IPredContext) { - let (_, p0, p1, p2) = load_pred4!(top; ipred); - let (p3, p4, p5, p6) = load_pred4!(top8; ipred); - - dst[off + 0] = p0; dst[off + 1] = p1; dst[off + 2] = p2; dst[off + 3] = p3; - off += stride; - dst[off + 0] = p1; dst[off + 1] = p2; dst[off + 2] = p3; dst[off + 3] = p4; - off += stride; - dst[off + 0] = p2; dst[off + 1] = p3; dst[off + 2] = p4; dst[off + 3] = p5; - off += stride; - dst[off + 0] = p3; dst[off + 1] = p4; dst[off + 2] = p5; dst[off + 3] = p6; - } - pub fn ipred_rd(dst: &mut [u8], mut off: usize, stride: usize, ipred: &IPredContext) { - let tl = load_pred4!(topleft; ipred); - let (l0, l1, l2, _) = load_pred4!(left; ipred); - let (t0, t1, t2, _) = load_pred4!(top; ipred); - - dst[off + 0] = tl; dst[off + 1] = t0; dst[off + 2] = t1; dst[off + 3] = t2; - off += stride; - dst[off + 0] = l0; dst[off + 1] = tl; dst[off + 2] = t0; dst[off + 3] = t1; - off += stride; - dst[off + 0] = l1; dst[off + 1] = l0; dst[off + 2] = tl; dst[off + 3] = t0; - off += stride; - dst[off + 0] = l2; dst[off + 1] = l1; dst[off + 2] = l0; dst[off + 3] = tl; - } - pub fn ipred_vr(dst: &mut [u8], mut off: usize, stride: usize, ipred: &IPredContext) { - let tl = load_pred4!(topleft; ipred); - let (l0, l1, _, _) = load_pred4!(left; ipred); - let (t0, t1, t2, _) = load_pred4!(top; ipred); - let (m0, m1, m2, m3) = load_pred4!(topavg; ipred); - - dst[off + 0] = m0; dst[off + 1] = m1; dst[off + 2] = m2; dst[off + 3] = m3; - off += stride; - dst[off + 0] = tl; dst[off + 1] = t0; dst[off + 2] = t1; dst[off + 3] = t2; - off += stride; - dst[off + 0] = l0; dst[off + 1] = m0; dst[off + 2] = m1; dst[off + 3] = m2; - off += stride; - dst[off + 0] = l1; dst[off + 1] = tl; dst[off + 2] = t0; dst[off + 3] = t1; - } - pub fn ipred_vl(dst: &mut [u8], mut off: usize, stride: usize, ipred: &IPredContext) { - let (_, t1, t2, t3) = load_pred4!(top; ipred); - let (t4, t5, t6, _) = load_pred4!(top8; ipred); - let (_, m1, m2, m3) = load_pred4!(topavg; ipred); - let m4 = ((u16::from(ipred.top[3]) + u16::from(ipred.top[4]) + 1) >> 1) as u8; - - dst[off + 0] = m1; dst[off + 1] = m2; dst[off + 2] = m3; dst[off + 3] = m4; - off += stride; - dst[off + 0] = t1; dst[off + 1] = t2; dst[off + 2] = t3; dst[off + 3] = t4; - off += stride; - dst[off + 0] = m2; dst[off + 1] = m3; dst[off + 2] = m4; dst[off + 3] = t5; - off += stride; - dst[off + 0] = t2; dst[off + 1] = t3; dst[off + 2] = t4; dst[off + 3] = t6; - } - pub fn ipred_hd(dst: &mut [u8], mut off: usize, stride: usize, ipred: &IPredContext) { - let tl = load_pred4!(topleft; ipred); - let (l0, l1, l2, _) = load_pred4!(left; ipred); - let (m0, m1, m2, m3) = load_pred4!(leftavg; ipred); - let (t0, t1, _, _) = load_pred4!(top; ipred); - - dst[off + 0] = m0; dst[off + 1] = tl; dst[off + 2] = t0; dst[off + 3] = t1; - off += stride; - dst[off + 0] = m1; dst[off + 1] = l0; dst[off + 2] = m0; dst[off + 3] = tl; - off += stride; - dst[off + 0] = m2; dst[off + 1] = l1; dst[off + 2] = m1; dst[off + 3] = l0; - off += stride; - dst[off + 0] = m3; dst[off + 1] = l2; dst[off + 2] = m2; dst[off + 3] = l1; - } - pub fn ipred_hu(dst: &mut [u8], mut off: usize, stride: usize, ipred: &IPredContext) { - let (_, m1, m2, m3) = load_pred4!(leftavg; ipred); - let (_, l1, l2, _) = load_pred4!(left; ipred); - let l3 = ((u16::from(ipred.left[2]) + u16::from(ipred.left[3]) * 3 + 2) >> 2) as u8; - let p3 = ipred.left[3]; - - dst[off + 0] = m1; dst[off + 1] = l1; dst[off + 2] = m2; dst[off + 3] = l2; - off += stride; - dst[off + 0] = m2; dst[off + 1] = l2; dst[off + 2] = m3; dst[off + 3] = l3; - off += stride; - dst[off + 0] = m3; dst[off + 1] = l3; dst[off + 2] = p3; dst[off + 3] = p3; - off += stride; - dst[off + 0] = p3; dst[off + 1] = p3; dst[off + 2] = p3; dst[off + 3] = p3; - } -} - -fn delta(p1: i16, p0: i16, q0: i16, q1: i16) -> i16 { - (p1 - q1) + 3 * (q0 - p0) -} - -pub type LoopFilterFunc = fn(buf: &mut [u8], off: usize, step: usize, stride: usize, len: usize, thr: i16, thr_inner: i16, thr_hev: i16); - -pub fn simple_loop_filter(buf: &mut [u8], mut off: usize, step: usize, stride: usize, len: usize, thr: i16, _thr_inner: i16, _thr_hev: i16) { - for _ in 0..len { - let p1 = i16::from(buf[off - step * 2]); - let p0 = i16::from(buf[off - step * 1]); - let q0 = i16::from(buf[off + step * 0]); - let q1 = i16::from(buf[off + step * 1]); - let dpq = p0 - q0; - if dpq.abs() < thr { - let diff = delta(p1, p0, q0, q1); - let diffq0 = (diff.min(127) + 4) >> 3; - let diffp0 = diffq0 - if (diff & 7) == 4 { 1 } else { 0 }; - buf[off - step * 1] = clip_u8(p0 + diffp0); - buf[off + step * 0] = clip_u8(q0 - diffq0); - } - off += stride; - } -} - -fn normal_loop_filter(buf: &mut [u8], mut off: usize, step: usize, stride: usize, len: usize, thr: i16, thr_inner: i16, thr_hev: i16, edge: bool) { - for _ in 0..len { - let p0 = i16::from(buf[off - step * 1]); - let q0 = i16::from(buf[off + step * 0]); - let dpq = p0 - q0; - if dpq.abs() <= thr { - let p3 = i16::from(buf[off - step * 4]); - let p2 = i16::from(buf[off - step * 3]); - let p1 = i16::from(buf[off - step * 2]); - let q1 = i16::from(buf[off + step * 1]); - let q2 = i16::from(buf[off + step * 2]); - let q3 = i16::from(buf[off + step * 3]); - let dp2 = p3 - p2; - let dp1 = p2 - p1; - let dp0 = p1 - p0; - let dq0 = q1 - q0; - let dq1 = q2 - q1; - let dq2 = q3 - q2; - if (dp0.abs() <= thr_inner) && (dp1.abs() <= thr_inner) && - (dp2.abs() <= thr_inner) && (dq0.abs() <= thr_inner) && - (dq1.abs() <= thr_inner) && (dq2.abs() <= thr_inner) { - let high_edge_variation = (dp0.abs() > thr_hev) || (dq0.abs() > thr_hev); - if high_edge_variation { - let diff = delta(p1, p0, q0, q1); - let diffq0 = (diff.min(127) + 4) >> 3; - let diffp0 = diffq0 - if (diff & 7) == 4 { 1 } else { 0 }; - buf[off - step * 1] = clip_u8(p0 + diffp0); - buf[off + step * 0] = clip_u8(q0 - diffq0); - } else if edge { - let d = delta(p1, p0, q0, q1); - let diff0 = (d * 27 + 63) >> 7; - buf[off - step * 1] = clip_u8(p0 + diff0); - buf[off + step * 0] = clip_u8(q0 - diff0); - let diff1 = (d * 18 + 63) >> 7; - buf[off - step * 2] = clip_u8(p1 + diff1); - buf[off + step * 1] = clip_u8(q1 - diff1); - let diff2 = (d * 9 + 63) >> 7; - buf[off - step * 3] = clip_u8(p2 + diff2); - buf[off + step * 2] = clip_u8(q2 - diff2); - } else { - let diff = 3 * (q0 - p0); - let diffq0 = (diff.min(127) + 4) >> 3; - let diffp0 = diffq0 - if (diff & 7) == 4 { 1 } else { 0 }; - buf[off - step * 1] = clip_u8(p0 + diffp0); - buf[off + step * 0] = clip_u8(q0 - diffq0); - let diff2 = (diffq0 + 1) >> 1; - buf[off - step * 2] = clip_u8(p1 + diff2); - buf[off + step * 1] = clip_u8(q1 - diff2); - } - } - } - off += stride; - } -} - -pub fn normal_loop_filter_inner(buf: &mut [u8], off: usize, step: usize, stride: usize, len: usize, thr: i16, thr_inner: i16, thr_hev: i16) { - normal_loop_filter(buf, off, step, stride, len, thr, thr_inner, thr_hev, false); -} - -pub fn normal_loop_filter_edge(buf: &mut [u8], off: usize, step: usize, stride: usize, len: usize, thr: i16, thr_inner: i16, thr_hev: i16) { - normal_loop_filter(buf, off, step, stride, len, thr, thr_inner, thr_hev, true); -} - -const VP7_BICUBIC_FILTERS: [[i16; 6]; 8] = [ - [ 0, 0, 128, 0, 0, 0 ], - [ 0, -6, 123, 12, -1, 0 ], - [ 2, -11, 108, 36, -8, 1 ], - [ 0, -9, 93, 50, -6, 0 ], - [ 3, -16, 77, 77, -16, 3 ], - [ 0, -6, 50, 93, -9, 0 ], - [ 1, -8, 36, 108, -11, 2 ], - [ 0, -1, 12, 123, -6, 0 ] -]; - -macro_rules! interpolate { - ($src: expr, $off: expr, $step: expr, $mode: expr) => {{ - let s0 = i32::from($src[$off + 0 * $step]); - let s1 = i32::from($src[$off + 1 * $step]); - let s2 = i32::from($src[$off + 2 * $step]); - let s3 = i32::from($src[$off + 3 * $step]); - let s4 = i32::from($src[$off + 4 * $step]); - let s5 = i32::from($src[$off + 5 * $step]); - let filt = &VP7_BICUBIC_FILTERS[$mode]; - let src = [s0, s1, s2, s3, s4, s5]; - let mut val = 64; - for (s, c) in src.iter().zip(filt.iter()) { - val += s * i32::from(*c); - } - clip_u8((val >> 7) as i16) - }} -} - -const EDGE_PRE: usize = 2; -const EDGE_POST: usize = 4; -const TMP_STRIDE: usize = 16; - -fn mc_block_common(dst: &mut [u8], mut doff: usize, dstride: usize, src: &[u8], sstride: usize, size: usize, mx: usize, my: usize) { - if (mx == 0) && (my == 0) { - let dst = &mut dst[doff..]; - let src = &src[EDGE_PRE + EDGE_PRE * sstride..]; - for (out, src) in dst.chunks_mut(dstride).take(size).zip(src.chunks(sstride)) { - (&mut out[0..size]).copy_from_slice(&src[0..size]); - } - } else if my == 0 { - let src = &src[EDGE_PRE * sstride..]; - for src in src.chunks(sstride).take(size) { - for x in 0..size { - dst[doff + x] = interpolate!(src, x, 1, mx); - } - doff += dstride; - } - } else if mx == 0 { - let src = &src[EDGE_PRE..]; - for y in 0..size { - for x in 0..size { - dst[doff + x] = interpolate!(src, x + y * sstride, sstride, my); - } - doff += dstride; - } - } else { - let mut tmp = [0u8; TMP_STRIDE * (16 + EDGE_PRE + EDGE_POST)]; - for (y, dst) in tmp.chunks_mut(TMP_STRIDE).take(size + EDGE_PRE + EDGE_POST).enumerate() { - for x in 0..size { - dst[x] = interpolate!(src, x + y * sstride, 1, mx); - } - } - for y in 0..size { - for x in 0..size { - dst[doff + x] = interpolate!(tmp, x + y * TMP_STRIDE, TMP_STRIDE, my); - } - doff += dstride; - } - } -} -fn mc_block(dst: &mut [u8], doff: usize, dstride: usize, xpos: usize, ypos: usize, - mvx: i16, mvy: i16, reffrm: NAVideoBufferRef, plane: usize, - mc_buf: &mut [u8], size: usize) { - if (mvx == 0) && (mvy == 0) { - let dst = &mut dst[doff..]; - let sstride = reffrm.get_stride(plane); - let srcoff = reffrm.get_offset(plane) + xpos + ypos * sstride; - let src = &reffrm.get_data(); - let src = &src[srcoff..]; - for (out, src) in dst.chunks_mut(dstride).take(size).zip(src.chunks(sstride)) { - (&mut out[0..size]).copy_from_slice(&src[0..size]); - } - return; - } - let (w, h) = reffrm.get_dimensions(plane); - let wa = if plane == 0 { (w + 15) & !15 } else { (w + 7) & !7 } as isize; - let ha = if plane == 0 { (h + 15) & !15 } else { (h + 7) & !7 } as isize; - let bsize = (size as isize) + (EDGE_PRE as isize) + (EDGE_POST as isize); - let ref_x = (xpos as isize) + ((mvx >> 3) as isize) - (EDGE_PRE as isize); - let ref_y = (ypos as isize) + ((mvy >> 3) as isize) - (EDGE_PRE as isize); - - let (src, sstride) = if (ref_x < 0) || (ref_x + bsize > wa) || (ref_y < 0) || (ref_y + bsize > ha) { - edge_emu(&reffrm, ref_x, ref_y, bsize as usize, bsize as usize, mc_buf, 32, plane, 0); - (mc_buf as &[u8], 32) - } else { - let off = reffrm.get_offset(plane); - let stride = reffrm.get_stride(plane); - let data = reffrm.get_data(); - (&data[off + (ref_x as usize) + (ref_y as usize) * stride..], stride) - }; - let mx = (mvx & 7) as usize; - let my = (mvy & 7) as usize; - mc_block_common(dst, doff, dstride, src, sstride, size, mx, my); -} -pub fn mc_block16x16(dst: &mut [u8], doff: usize, dstride: usize, xpos: usize, ypos: usize, - mvx: i16, mvy: i16, src: NAVideoBufferRef, plane: usize, mc_buf: &mut [u8]) { - mc_block(dst, doff, dstride, xpos, ypos, mvx, mvy, src, plane, mc_buf, 16); -} -pub fn mc_block8x8(dst: &mut [u8], doff: usize, dstride: usize, xpos: usize, ypos: usize, - mvx: i16, mvy: i16, src: NAVideoBufferRef, plane: usize, mc_buf: &mut [u8]) { - mc_block(dst, doff, dstride, xpos, ypos, mvx, mvy, src, plane, mc_buf, 8); -} -pub fn mc_block4x4(dst: &mut [u8], doff: usize, dstride: usize, xpos: usize, ypos: usize, - mvx: i16, mvy: i16, src: NAVideoBufferRef, plane: usize, mc_buf: &mut [u8]) { - mc_block(dst, doff, dstride, xpos, ypos, mvx, mvy, src, plane, mc_buf, 4); -} -pub fn mc_block_special(dst: &mut [u8], doff: usize, dstride: usize, xpos: usize, ypos: usize, - mvx: i16, mvy: i16, reffrm: NAVideoBufferRef, plane: usize, - mc_buf: &mut [u8], size: usize, pitch_mode: u8) { - const Y_MUL: [isize; 8] = [ 1, 0, 2, 4, 1, 1, 2, 2 ]; - const Y_OFF: [isize; 8] = [ 0, 4, 0, 0, 1, -1, 1, -1 ]; - const ILACE_CHROMA: [bool; 8] = [ false, false, true, true, false, false, true, true ]; // mode&2 != 0 - - let pitch_mode = (pitch_mode & 7) as usize; - let (xstep, ymul) = if plane == 0 { - (Y_OFF[pitch_mode], Y_MUL[pitch_mode]) - } else { - (0, if ILACE_CHROMA[pitch_mode] { 2 } else { 1 }) - }; - - let (w, h) = reffrm.get_dimensions(plane); - let wa = if plane == 0 { (w + 15) & !15 } else { (w + 7) & !7 } as isize; - let ha = if plane == 0 { (h + 15) & !15 } else { (h + 7) & !7 } as isize; - let mut start_x = (xpos as isize) + ((mvx >> 3) as isize) - (EDGE_PRE as isize); - let mut end_x = (xpos as isize) + ((mvx >> 3) as isize) + ((size + EDGE_POST) as isize); - if xstep < 0 { - start_x -= (size + EDGE_POST) as isize; - } else if xstep > 0 { - end_x += (size as isize) * xstep; - } - let mut start_y = (ypos as isize) + ((mvy >> 3) as isize) - (EDGE_PRE as isize) * ymul; - let mut end_y = (ypos as isize) + ((mvy >> 3) as isize) + ((size + EDGE_POST) as isize) * ymul; - if ymul == 0 { - start_y -= EDGE_PRE as isize; - end_y += (EDGE_POST + 1) as isize; - } - let off = reffrm.get_offset(plane); - let stride = reffrm.get_stride(plane); - let (src, sstride) = if (start_x >= 0) && (end_x <= wa) && (start_y >= 0) && (end_y <= ha) { - let data = reffrm.get_data(); - (&data[off + (start_x as usize) + (start_y as usize) * stride..], - ((stride as isize) + xstep) as usize) - } else { - let add = (size + EDGE_PRE + EDGE_POST) * (xstep.abs() as usize); - let bw = size + EDGE_PRE + EDGE_POST + add; - let bh = (end_y - start_y) as usize; - let bo = if xstep >= 0 { 0 } else { add }; - edge_emu(&reffrm, start_x + (bo as isize), start_y, bw, bh, mc_buf, 128, plane, 0); - (&mc_buf[bo..], (128 + xstep) as usize) - }; - let mx = (mvx & 7) as usize; - let my = (mvy & 7) as usize; - match ymul { - 0 => unimplemented!(), - 1 => mc_block_common(dst, doff, dstride, src, sstride, size, mx, my), - 2 => { - let hsize = size / 2; - for y in 0..2 { - for x in 0..2 { - mc_block_common(dst, doff + x * hsize + y * hsize * dstride, dstride, - &src[x * hsize + y * sstride..], sstride * 2, hsize, mx, my); - } - } - }, - 4 => { - let qsize = size / 4; - for y in 0..4 { - for x in 0..4 { - mc_block_common(dst, doff + x * qsize + y * qsize * dstride, dstride, - &src[x * qsize + y * sstride..], sstride * 4, qsize, mx, my); - } - } - }, - _ => unreachable!(), - }; -} - -pub fn fade_frame(srcfrm: NAVideoBufferRef, dstfrm: &mut NASimpleVideoFrame, alpha: u16, beta: u16) { - let mut fade_lut = [0u8; 256]; - for (i, el) in fade_lut.iter_mut().enumerate() { - let y = i as u16; - *el = (y + ((y * beta) >> 8) + alpha).max(0).min(255) as u8; - } - - let (w, h) = srcfrm.get_dimensions(0); - let (wa, ha) = ((w + 15) & !15, (h + 15) & !15); - let soff = srcfrm.get_offset(0); - let sstride = srcfrm.get_stride(0); - let sdata = srcfrm.get_data(); - let src = &sdata[soff..]; - let dstride = dstfrm.stride[0]; - let dst = &mut dstfrm.data[dstfrm.offset[0]..]; - for (src, dst) in src.chunks(sstride).zip(dst.chunks_mut(dstride)).take(ha) { - for (s, d) in src.iter().zip(dst.iter_mut()).take(wa) { - *d = fade_lut[*s as usize]; - } - } - - for plane in 1..3 { - let (w, h) = srcfrm.get_dimensions(plane); - let (wa, ha) = ((w + 7) & !7, (h + 7) & !7); - let soff = srcfrm.get_offset(plane); - let sstride = srcfrm.get_stride(plane); - let sdata = srcfrm.get_data(); - let src = &sdata[soff..]; - let dstride = dstfrm.stride[plane]; - let dst = &mut dstfrm.data[dstfrm.offset[plane]..]; - for (src, dst) in src.chunks(sstride).zip(dst.chunks_mut(dstride)).take(ha) { - (&mut dst[0..wa]).copy_from_slice(&src[0..wa]); - } - } -} +use nihav_core::frame::*; + +fn clip_u8(val: i16) -> u8 { + val.max(0).min(255) as u8 +} + +const DCT_COEFFS: [i32; 16] = [ + 23170, 23170, 23170, 23170, + 30274, 12540, -12540, -30274, + 23170, -23170, -23170, 23170, + 12540, -30274, 30274, -12540 +]; + +pub fn idct4x4(coeffs: &mut [i16; 16]) { + let mut tmp = [0i16; 16]; + for (src, dst) in coeffs.chunks(4).zip(tmp.chunks_mut(4)) { + let s0 = i32::from(src[0]); + let s1 = i32::from(src[1]); + let s2 = i32::from(src[2]); + let s3 = i32::from(src[3]); + + let t0 = (s0 + s2).wrapping_mul(23170); + let t1 = (s0 - s2).wrapping_mul(23170); + let t2 = s1.wrapping_mul(30274) + s3.wrapping_mul(12540); + let t3 = s1.wrapping_mul(12540) - s3.wrapping_mul(30274); + + dst[0] = ((t0 + t2) >> 14) as i16; + dst[1] = ((t1 + t3) >> 14) as i16; + dst[2] = ((t1 - t3) >> 14) as i16; + dst[3] = ((t0 - t2) >> 14) as i16; + } + for i in 0..4 { + let s0 = i32::from(tmp[i + 4 * 0]); + let s1 = i32::from(tmp[i + 4 * 1]); + let s2 = i32::from(tmp[i + 4 * 2]); + let s3 = i32::from(tmp[i + 4 * 3]); + + let t0 = (s0 + s2).wrapping_mul(23170) + 0x20000; + let t1 = (s0 - s2).wrapping_mul(23170) + 0x20000; + let t2 = s1.wrapping_mul(30274) + s3.wrapping_mul(12540); + let t3 = s1.wrapping_mul(12540) - s3.wrapping_mul(30274); + + coeffs[i + 0 * 4] = ((t0 + t2) >> 18) as i16; + coeffs[i + 1 * 4] = ((t1 + t3) >> 18) as i16; + coeffs[i + 2 * 4] = ((t1 - t3) >> 18) as i16; + coeffs[i + 3 * 4] = ((t0 - t2) >> 18) as i16; + } +} + +pub fn idct4x4_dc(coeffs: &mut [i16; 16]) { + let dc = ((((i32::from(coeffs[0]) * DCT_COEFFS[0]) >> 14) * DCT_COEFFS[0] + 0x20000) >> 18) as i16; + for el in coeffs.iter_mut() { + *el = dc; + } +} + +fn delta(p1: i16, p0: i16, q0: i16, q1: i16) -> i16 { + (p1 - q1) + 3 * (q0 - p0) +} + +pub type LoopFilterFunc = fn(buf: &mut [u8], off: usize, step: usize, stride: usize, len: usize, thr: i16, thr_inner: i16, thr_hev: i16); + +pub fn simple_loop_filter(buf: &mut [u8], mut off: usize, step: usize, stride: usize, len: usize, thr: i16, _thr_inner: i16, _thr_hev: i16) { + for _ in 0..len { + let p1 = i16::from(buf[off - step * 2]); + let p0 = i16::from(buf[off - step * 1]); + let q0 = i16::from(buf[off + step * 0]); + let q1 = i16::from(buf[off + step * 1]); + let dpq = p0 - q0; + if dpq.abs() < thr { + let diff = delta(p1, p0, q0, q1); + let diffq0 = (diff.min(127) + 4) >> 3; + let diffp0 = diffq0 - if (diff & 7) == 4 { 1 } else { 0 }; + buf[off - step * 1] = clip_u8(p0 + diffp0); + buf[off + step * 0] = clip_u8(q0 - diffq0); + } + off += stride; + } +} + +fn normal_loop_filter(buf: &mut [u8], mut off: usize, step: usize, stride: usize, len: usize, thr: i16, thr_inner: i16, thr_hev: i16, edge: bool) { + for _ in 0..len { + let p0 = i16::from(buf[off - step * 1]); + let q0 = i16::from(buf[off + step * 0]); + let dpq = p0 - q0; + if dpq.abs() <= thr { + let p3 = i16::from(buf[off - step * 4]); + let p2 = i16::from(buf[off - step * 3]); + let p1 = i16::from(buf[off - step * 2]); + let q1 = i16::from(buf[off + step * 1]); + let q2 = i16::from(buf[off + step * 2]); + let q3 = i16::from(buf[off + step * 3]); + let dp2 = p3 - p2; + let dp1 = p2 - p1; + let dp0 = p1 - p0; + let dq0 = q1 - q0; + let dq1 = q2 - q1; + let dq2 = q3 - q2; + if (dp0.abs() <= thr_inner) && (dp1.abs() <= thr_inner) && + (dp2.abs() <= thr_inner) && (dq0.abs() <= thr_inner) && + (dq1.abs() <= thr_inner) && (dq2.abs() <= thr_inner) { + let high_edge_variation = (dp0.abs() > thr_hev) || (dq0.abs() > thr_hev); + if high_edge_variation { + let diff = delta(p1, p0, q0, q1); + let diffq0 = (diff.min(127) + 4) >> 3; + let diffp0 = diffq0 - if (diff & 7) == 4 { 1 } else { 0 }; + buf[off - step * 1] = clip_u8(p0 + diffp0); + buf[off + step * 0] = clip_u8(q0 - diffq0); + } else if edge { + let d = delta(p1, p0, q0, q1); + let diff0 = (d * 27 + 63) >> 7; + buf[off - step * 1] = clip_u8(p0 + diff0); + buf[off + step * 0] = clip_u8(q0 - diff0); + let diff1 = (d * 18 + 63) >> 7; + buf[off - step * 2] = clip_u8(p1 + diff1); + buf[off + step * 1] = clip_u8(q1 - diff1); + let diff2 = (d * 9 + 63) >> 7; + buf[off - step * 3] = clip_u8(p2 + diff2); + buf[off + step * 2] = clip_u8(q2 - diff2); + } else { + let diff = 3 * (q0 - p0); + let diffq0 = (diff.min(127) + 4) >> 3; + let diffp0 = diffq0 - if (diff & 7) == 4 { 1 } else { 0 }; + buf[off - step * 1] = clip_u8(p0 + diffp0); + buf[off + step * 0] = clip_u8(q0 - diffq0); + let diff2 = (diffq0 + 1) >> 1; + buf[off - step * 2] = clip_u8(p1 + diff2); + buf[off + step * 1] = clip_u8(q1 - diff2); + } + } + } + off += stride; + } +} + +pub fn normal_loop_filter_inner(buf: &mut [u8], off: usize, step: usize, stride: usize, len: usize, thr: i16, thr_inner: i16, thr_hev: i16) { + normal_loop_filter(buf, off, step, stride, len, thr, thr_inner, thr_hev, false); +} + +pub fn normal_loop_filter_edge(buf: &mut [u8], off: usize, step: usize, stride: usize, len: usize, thr: i16, thr_inner: i16, thr_hev: i16) { + normal_loop_filter(buf, off, step, stride, len, thr, thr_inner, thr_hev, true); +} + +pub fn fade_frame(srcfrm: NAVideoBufferRef, dstfrm: &mut NASimpleVideoFrame, alpha: u16, beta: u16) { + let mut fade_lut = [0u8; 256]; + for (i, el) in fade_lut.iter_mut().enumerate() { + let y = i as u16; + *el = (y + ((y * beta) >> 8) + alpha).max(0).min(255) as u8; + } + + let (w, h) = srcfrm.get_dimensions(0); + let (wa, ha) = ((w + 15) & !15, (h + 15) & !15); + let soff = srcfrm.get_offset(0); + let sstride = srcfrm.get_stride(0); + let sdata = srcfrm.get_data(); + let src = &sdata[soff..]; + let dstride = dstfrm.stride[0]; + let dst = &mut dstfrm.data[dstfrm.offset[0]..]; + for (src, dst) in src.chunks(sstride).zip(dst.chunks_mut(dstride)).take(ha) { + for (s, d) in src.iter().zip(dst.iter_mut()).take(wa) { + *d = fade_lut[*s as usize]; + } + } + + for plane in 1..3 { + let (w, h) = srcfrm.get_dimensions(plane); + let (wa, ha) = ((w + 7) & !7, (h + 7) & !7); + let soff = srcfrm.get_offset(plane); + let sstride = srcfrm.get_stride(plane); + let sdata = srcfrm.get_data(); + let src = &sdata[soff..]; + let dstride = dstfrm.stride[plane]; + let dst = &mut dstfrm.data[dstfrm.offset[plane]..]; + for (src, dst) in src.chunks(sstride).zip(dst.chunks_mut(dstride)).take(ha) { + (&mut dst[0..wa]).copy_from_slice(&src[0..wa]); + } + } +} -- 2.30.2