realmedia/rv40dsp: fix typos in loop filters

[nihav.git] / nihav-duck / src / codecs / vpcommon.rs

diff --git a/nihav-duck/src/codecs/vpcommon.rs b/nihav-duck/src/codecs/vpcommon.rs
index 699109143a00026fc5426c27dd372f5510386c09..f41b89b1b5ebaefefe7f9c5b39c71eb93aed40a0 100644 (file)
--- a/nihav-duck/src/codecs/vpcommon.rs
+++ b/nihav-duck/src/codecs/vpcommon.rs
@@ -1,5 +1,21 @@
 use nihav_core::codecs::*;
-use nihav_core::codecs::blockdsp::*;
+use nihav_codec_support::codecs::blockdsp;
+use nihav_codec_support::codecs::blockdsp::*;
+
+pub const VP_YUVA420_FORMAT: NAPixelFormaton = NAPixelFormaton{
+        model:      ColorModel::YUV(YUVSubmodel::YUVJ),
+        components: 4,
+        comp_info:  [
+                Some(NAPixelChromaton{ h_ss: 0, v_ss: 0, packed: false, depth: 8, shift: 0, comp_offs: 0, next_elem: 1}),
+                Some(NAPixelChromaton{ h_ss: 1, v_ss: 1, packed: false, depth: 8, shift: 0, comp_offs: 1, next_elem: 1}),
+                Some(NAPixelChromaton{ h_ss: 1, v_ss: 1, packed: false, depth: 8, shift: 0, comp_offs: 2, next_elem: 1}),
+                Some(NAPixelChromaton{ h_ss: 0, v_ss: 0, packed: false, depth: 8, shift: 0, comp_offs: 3, next_elem: 1}),
+                None ],
+        elem_size:  0,
+        be:         false,
+        alpha:      true,
+        palette:    false
+    };
 
 #[derive(Clone,Copy,Debug,PartialEq)]
 #[allow(dead_code)]
@@ -182,7 +198,6 @@ pub fn rescale_prob(prob: u8, weights: &[i16; 2], maxval: i32) -> u8 {
     ((((prob as i32) * (weights[0] as i32) + 128) >> 8) + (weights[1] as i32)).min(maxval).max(1) as u8
 }
 
-#[macro_export]
 macro_rules! vp_tree {
     ($bc: expr, $prob: expr, $node1: expr, $node2: expr) => {
         if !$bc.read_prob($prob) {