X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Fvpcommon.rs;h=e6446afc436830029323a1c05a1d4c000a0b4f98;hb=586ea1879dd193fa71d16302e1c54deb269bc732;hp=699109143a00026fc5426c27dd372f5510386c09;hpb=900c9c5715b78643c6a3b739205ffb2f4166dd3b;p=nihav.git

diff --git a/nihav-duck/src/codecs/vpcommon.rs b/nihav-duck/src/codecs/vpcommon.rs
index 6991091..e6446af 100644
--- 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) {
@@ -381,7 +396,7 @@ pub fn vp_copy_block(dst: &mut NASimpleVideoFrame<u8>, src: NAVideoBufferRef<u8>
     let src_y = sy - (pre as isize);
     {
         let tmp_buf = NASimpleVideoFrame::from_video_buf(&mut mc_buf).unwrap();
-        edge_emu(src.as_ref(), src_x, src_y, bsize, bsize, &mut tmp_buf.data[tmp_buf.offset[comp]..], tmp_buf.stride[comp], comp);
+        edge_emu(src.as_ref(), src_x, src_y, bsize, bsize, &mut tmp_buf.data[tmp_buf.offset[comp]..], tmp_buf.stride[comp], comp, 0);
 //        copy_block(&mut tmp_buf, src, comp, 0, 0, src_x as i16, src_y as i16,
 //                   bsize, bsize, 0, 0, 0, interp);
         if (sx & 7) != 0 {