vp7enc: remove duplicate tables

[nihav.git] / nihav-duck / src / codecs / vp7enc / frame_coder.rs

diff --git a/nihav-duck/src/codecs/vp7enc/frame_coder.rs b/nihav-duck/src/codecs/vp7enc/frame_coder.rs
index 080ab95cec4090b13a2c24582d07c815da440268..b9ba73edaf8208eefc0c2aed4e33eb26a1131c46 100644 (file)
--- a/nihav-duck/src/codecs/vp7enc/frame_coder.rs
+++ b/nihav-duck/src/codecs/vp7enc/frame_coder.rs
@@ -2,6 +2,7 @@ use nihav_core::codecs::*;
 use nihav_codec_support::codecs::ZERO_MV;
 use super::super::vp78::PredMode;
 use super::super::vp78dsp::*;
+use super::super::vp7data::HIGH_EDGE_VAR_THR;
 use super::super::vp7dsp::*;
 use super::blocks::*;
 use super::coder::*;
@@ -147,6 +148,10 @@ impl FrameEncoder {
                     self.features.push(0);
                 }
             }
+        } else {
+            for _ in 0..(self.mb_w * self.mb_h) {
+                self.features.push(0);
+            }
         }
 
         let mut imctx = IntraModePredCtx {
@@ -540,19 +545,6 @@ impl FrameEncoder {
 }
 
 fn loop_filter_mb(dframe: &mut NASimpleVideoFrame<u8>, mb_x: usize, mb_y: usize, loop_str: u8, loop_params: &LoopParams, is_intra: bool) {
-    const HIGH_EDGE_VAR_THR: [[u8; 64]; 2] = [
-      [
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
-        1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-        2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3,
-        3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3
-      ], [
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2,
-        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
-      ]];
-
     let edge_thr    = i16::from(loop_str) + 2;
     let luma_thr    = i16::from(loop_str);
     let chroma_thr  = i16::from(loop_str) * 2;