From: Kostya Shishkov <kostya.shishkov@gmail.com>
Date: Wed, 31 Aug 2022 16:56:32 +0000 (+0200)
Subject: h264: cache frame width/height
X-Git-Url: https://git.nihav.org/?a=commitdiff_plain;h=306c604f0d9888a7eadbd34a70520ba0d819d4f3;p=nihav.git

h264: cache frame width/height
---

diff --git a/nihav-itu/src/codecs/h264/dsp/mc/mod.rs b/nihav-itu/src/codecs/h264/dsp/mc/mod.rs
index 55b124e..aa275ae 100644
--- a/nihav-itu/src/codecs/h264/dsp/mc/mod.rs
+++ b/nihav-itu/src/codecs/h264/dsp/mc/mod.rs
@@ -24,6 +24,9 @@ pub struct H264MC {
     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],
+
+    width:      usize,
+    height:     usize,
 }
 
 impl H264MC {
@@ -33,10 +36,15 @@ impl H264MC {
             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],
+            width: 0, height: 0,
         };
         obj.register_simd();
         obj
     }
+    pub fn set_dimensions(&mut self, width: usize, height: usize) {
+        self.width  = width;
+        self.height = height;
+    }
     pub fn do_mc(&mut self, frm: &mut NASimpleVideoFrame<u8>, refpic: NAVideoBufferRef<u8>, xpos: usize, ypos: usize, w: usize, h: usize, mv: MV) {
         let mut ebuf = [0u8; 22 * 22];
         let mvx = mv.x >> 2;
@@ -44,7 +52,7 @@ impl H264MC {
         let mode = ((mv.x & 3) + (mv.y & 3) * 4) as usize;
         let pre  = if mode != 0 { 2isize } else { 0 };
         let post = if mode != 0 { 3isize } else { 0 };
-        let (yw, yh) = refpic.get_dimensions(0);
+        let (yw, yh) = (self.width, self.height);
         let src = refpic.get_data();
         let systride = refpic.get_stride(0);
         let src_x = (xpos as isize) + (mvx as isize);
@@ -63,7 +71,7 @@ impl H264MC {
             };
         (H264_LUMA_INTERP[wmode][mode])(&mut frm.data[frm.offset[0] + xpos + ypos * frm.stride[0]..], frm.stride[0], ysrc, ystride, h);
 
-        let (cw, ch) = refpic.get_dimensions(1);
+        let (cw, ch) = (self.width >> 1, self.height >> 1);
         let mvx = mv.x >> 3;
         let mvy = mv.y >> 3;
         let dx = (mv.x & 7) as u16;
@@ -96,7 +104,7 @@ impl H264MC {
 
         let pre  = if mode != 0 { 2 } else { 0 };
         let post = if mode != 0 { 3 } else { 0 };
-        let (width, height) = refpic.get_dimensions(0);
+        let (width, height) = (self.width, self.height);
         let sx = (xpos as isize) + ((mv.x >> 2) as isize);
         let sy = (ypos as isize) + ((mv.y >> 2) as isize);
 
@@ -123,7 +131,7 @@ impl H264MC {
             (H264_LUMA_INTERP[wmode][mode])(ydst, 16, &sbuf[saddr..], sstride, h);
         }
 
-        let (cw, ch) = refpic.get_dimensions(1);
+        let (cw, ch) = (self.width >> 1, self.height >> 1);
         let mvx = mv.x >> 3;
         let mvy = mv.y >> 3;
         let dx = (mv.x & 7) as u16;
diff --git a/nihav-itu/src/codecs/h264/mod.rs b/nihav-itu/src/codecs/h264/mod.rs
index 20224d3..a0a94a4 100644
--- a/nihav-itu/src/codecs/h264/mod.rs
+++ b/nihav-itu/src/codecs/h264/mod.rs
@@ -315,6 +315,7 @@ println!(" chroma fmt {} bits {}/{}", sps.chroma_format_idc, sps.bit_depth_luma,
                     self.width  = sps.pic_width_in_mbs  << 4;
                     self.height = sps.pic_height_in_mbs << 4;
                     self.num_mbs = sps.pic_width_in_mbs * sps.pic_height_in_mbs;
+                    self.mc_dsp.set_dimensions(self.width, self.height);
 
                     self.is_mbaff = sps.mb_adaptive_frame_field && !slice_hdr.field_pic;
                     if self.is_mbaff {