vp56: move DCT coeffs base and probabilities to common

diff --git a/nihav-duck/src/codecs/vp56.rs b/nihav-duck/src/codecs/vp56.rs
index 54c84a040a80157331fc7e4ec0effbf19df905d8..c626be82ac7d9e08c986a25442b1f70076ae2de6 100644 (file)
--- a/nihav-duck/src/codecs/vp56.rs
+++ b/nihav-duck/src/codecs/vp56.rs
@@ -381,17 +381,7 @@ fn map_mb_type(mbtype: VPMBType) -> usize {
     }
 }
 
-pub const VP56_COEF_BASE: [i16; 6] = [ 5, 7, 11, 19, 35, 67 ];
 pub fn expand_token_bc(bc: &mut BoolCoder, val_probs: &[u8; 11], token: u8, version: u8) -> i16 {
-    const COEF_ADD_PROBS: [[u8; 12]; 6] = [
-        [ 159, 128,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0 ],
-        [ 165, 145, 128,   0,   0,   0,   0,   0,   0,   0,   0,   0 ],
-        [ 173, 148, 140, 128,   0,   0,   0,   0,   0,   0,   0,   0 ],
-        [ 176, 155, 140, 135, 128,   0,   0,   0,   0,   0,   0,   0 ],
-        [ 180, 157, 141, 134, 130, 128,   0,   0,   0,   0,   0,   0 ],
-        [ 254, 254, 243, 230, 196, 177, 153, 140, 133, 130, 129, 128 ],
-    ];
-
     let mut sign = false;
     let level;
     if token < TOKEN_LARGE {
@@ -409,7 +399,7 @@ pub fn expand_token_bc(bc: &mut BoolCoder, val_probs: &[u8; 11], token: u8, vers
             sign                                = bc.read_bool();
         }
         let mut add = 0i16;
-        let add_probs = &COEF_ADD_PROBS[cat];
+        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);

diff --git a/nihav-duck/src/codecs/vpcommon.rs b/nihav-duck/src/codecs/vpcommon.rs
index 0392a383b5248a4647e3b734b43534668e07c4f2..3caf56997f6d96aed2f7361e909fd191fde4f9c4 100644 (file)
--- a/nihav-duck/src/codecs/vpcommon.rs
+++ b/nihav-duck/src/codecs/vpcommon.rs
@@ -70,6 +70,16 @@ impl VPShuffler {
     }
 }
 
+pub const VP56_COEF_BASE: [i16; 6] = [ 5, 7, 11, 19, 35, 67 ];
+pub const VP56_COEF_ADD_PROBS: [[u8; 12]; 6] = [
+    [ 159, 128,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0 ],
+    [ 165, 145, 128,   0,   0,   0,   0,   0,   0,   0,   0,   0 ],
+    [ 173, 148, 140, 128,   0,   0,   0,   0,   0,   0,   0,   0 ],
+    [ 176, 155, 140, 135, 128,   0,   0,   0,   0,   0,   0,   0 ],
+    [ 180, 157, 141, 134, 130, 128,   0,   0,   0,   0,   0,   0 ],
+    [ 254, 254, 243, 230, 196, 177, 153, 140, 133, 130, 129, 128 ],
+];
+
 #[allow(dead_code)]
 pub struct BoolCoder<'a> {
     pub src:    &'a [u8],