X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-itu%2Fsrc%2Fcodecs%2Fh264%2Fdsp%2Fmc%2Fmod.rs;fp=nihav-itu%2Fsrc%2Fcodecs%2Fh264%2Fdsp%2Fmc%2Fmod.rs;h=55b124ee60e6d405cc5d7fcd6501c534e0ec4a35;hb=82f1307ee4a5a34978694f132076e86a11b26967;hp=e2036cc39e2a04da1542f5b7a10427dab62849d0;hpb=3c506c7a1c59ce83fea4fe8126ec05b098b7323d;p=nihav.git

diff --git a/nihav-itu/src/codecs/h264/dsp/mc/mod.rs b/nihav-itu/src/codecs/h264/dsp/mc/mod.rs
index e2036cc..55b124e 100644
--- a/nihav-itu/src/codecs/h264/dsp/mc/mod.rs
+++ b/nihav-itu/src/codecs/h264/dsp/mc/mod.rs
@@ -23,6 +23,7 @@ pub struct H264MC {
     avg_buf:    NAVideoBufferRef<u8>,
     pub put_block_weighted:     [fn (dst: &mut [u8], stride: usize, src: &[u8], h: usize, wparams: [i8; 3]); 4],
     pub put_block_weighted2:    [fn (dst: &mut [u8], stride: usize, src0: &[u8], src1: &[u8], h: usize, wparams: [i8; 5]); 4],
+    pub chroma_interp:          [fn (dst: &mut [u8], dstride: usize, src: &[u8], sstride: usize, dx: u16, dy: u16, h: usize); 3],
 }
 
 impl H264MC {
@@ -31,6 +32,7 @@ impl H264MC {
             avg_buf,
             put_block_weighted:     [put_blk_w_2, put_blk_w_4, put_blk_w_8, put_blk_w_16],
             put_block_weighted2:    [put_blk_w2_2, put_blk_w2_4, put_blk_w2_8, put_blk_w2_16],
+            chroma_interp:          [chroma_interp_2, chroma_interp_4, chroma_interp_8],
         };
         obj.register_simd();
         obj
@@ -85,7 +87,7 @@ impl H264MC {
             };
         for chroma in 1..3 {
             let off = frm.offset[chroma] + xpos / 2 + (ypos / 2) * frm.stride[chroma];
-            chroma_interp(&mut frm.data[off..], frm.stride[chroma], csrc[chroma - 1], cstride[chroma - 1], dx, dy, cbw, cbh);
+            (self.chroma_interp[wmode])(&mut frm.data[off..], frm.stride[chroma], csrc[chroma - 1], cstride[chroma - 1], dx, dy, cbh);
         }
     }
 
@@ -144,8 +146,8 @@ impl H264MC {
                  &src[svoff + (src_x as usize) + (src_y as usize) * svstride..]],
                  [sustride, svstride])
             };
-        chroma_interp(udst, 16, csrc[0], cstride[0], dx, dy, cbw, cbh);
-        chroma_interp(vdst, 16, csrc[1], cstride[1], dx, dy, cbw, cbh);
+        (self.chroma_interp[wmode])(udst, 16, csrc[0], cstride[0], dx, dy, cbh);
+        (self.chroma_interp[wmode])(vdst, 16, csrc[1], cstride[1], dx, dy, cbh);
     }
 
     pub fn avg(&mut self, dst: &mut [u8], dstride: usize, bw: usize, bh: usize, comp: usize) {