X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-rad%2Fsrc%2Fcodecs%2Fbink2.rs;h=e56bff7fc192bc6137e82eab93074c98221b37ea;hb=f9be4e750dccff762b9a3d894faec50ffdb59233;hp=d57f8bdaf337b872e622323e1708a25792ca91de;hpb=171860fcc4a4ba3ec28bc4b720b9f582377be4cf;p=nihav.git

diff --git a/nihav-rad/src/codecs/bink2.rs b/nihav-rad/src/codecs/bink2.rs
index d57f8bd..e56bff7 100644
--- a/nihav-rad/src/codecs/bink2.rs
+++ b/nihav-rad/src/codecs/bink2.rs
@@ -53,7 +53,7 @@ macro_rules! idct {
     };
     (float; $src: expr, $sstep: expr, $off: expr, $dst: expr, $dstep: expr, $doff: expr, $bias: expr, $shift: expr) => {
         let t00 =  $src[$off + $sstep * 2] + $src[$off + $sstep * 6];
-        let t01 = ($src[$off + $sstep * 2] - $src[$off + $sstep * 6]) * 1.4142135 - t00;
+        let t01 = ($src[$off + $sstep * 2] - $src[$off + $sstep * 6]) * std::f32::consts::SQRT_2 - t00;
         let t02 = $src[$off + $sstep * 0] + $src[$off + $sstep * 4];
         let t03 = $src[$off + $sstep * 0] - $src[$off + $sstep * 4];
         let t04 = $src[$off + $sstep * 3] + $src[$off + $sstep * 5];
@@ -65,7 +65,7 @@ macro_rules! idct {
         let t10 = t03 + t01;
         let t11 = t03 - t01;
         let t12 = t06 + t04;
-        let t13 = (t06 - t04) * 1.4142135;
+        let t13 = (t06 - t04) * std::f32::consts::SQRT_2;
         let t14 = (t07 - t05) * 1.847759;
         let t15 = t05 * 2.613126 + t14 - t12;
         let t16 = t13 - t15;
@@ -82,6 +82,7 @@ macro_rules! idct {
     };
 }
 
+#[allow(clippy::erasing_op)]
 fn bink2_idct(coeffs: &mut [i32; 64]) {
     let mut tmp: [i32; 64] = [0; 64];
     for i in 0..8 {
@@ -92,6 +93,7 @@ fn bink2_idct(coeffs: &mut [i32; 64]) {
     }
 }
 
+#[allow(clippy::erasing_op)]
 fn bink2_idct_old(coeffs: &mut [f32; 64]) {
     let mut tmp: [f32; 64] = [0.0; 64];
     coeffs[0] += 512.5;
@@ -148,6 +150,7 @@ macro_rules! avg_tree {
     ($a: expr, $b: expr, $c: expr, $d: expr) => (avg_tree!(avg_tree!($a, $b), avg_tree!($c, $d)));
 }
 
+#[allow(clippy::erasing_op)]
 impl Bink2DSP {
     fn calc_dc(src: &[u8], stride: usize) -> i32 {
         let mut sums = [0u16; 8];
@@ -1017,6 +1020,7 @@ struct Bink2Decoder {
     codes:      Bink2Codes,
 }
 
+#[allow(clippy::erasing_op)]
 impl Bink2Decoder {
     fn new() -> Self {
         Self::default()
@@ -1709,11 +1713,11 @@ fn decode_cbp_luma_old(br: &mut BitReader, prev_cbp: u32) -> DecoderResult<u32>
         if !br.read_bool()? {
             nib1                                = br.read(4)?;
         }
-        new_cbp = new_cbp | (nib1 << 4);
+        new_cbp |= nib1 << 4;
         if !br.read_bool()? {
             nib1                                = br.read(4)?;
         }
-        new_cbp = new_cbp | (nib1 << 8);
+        new_cbp |= nib1 << 8;
         if !br.read_bool()? {
             nib1                                = br.read(4)?;
         }
@@ -1858,7 +1862,7 @@ fn decode_acs_4blocks_old(br: &mut BitReader, codes: &Bink2Codes, dst: &mut [[f3
 const KB2H_NUM_SLICES: [usize; 4] = [ 2, 3, 4, 8 ];
 
 impl NADecoder for Bink2Decoder {
-    fn init(&mut self, info: NACodecInfoRef) -> DecoderResult<()> {
+    fn init(&mut self, _supp: &mut NADecoderSupport, info: NACodecInfoRef) -> DecoderResult<()> {
         if let NACodecTypeInfo::Video(vinfo) = info.get_properties() {
             let w = vinfo.get_width();
             let h = vinfo.get_height();
@@ -1914,7 +1918,7 @@ impl NADecoder for Bink2Decoder {
             Err(DecoderError::InvalidData)
         }
     }
-    fn decode(&mut self, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
+    fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
         let src = pkt.get_buffer();
 
         let mut br = BitReader::new(&src, src.len(), BitReaderMode::LE);
@@ -1922,9 +1926,7 @@ impl NADecoder for Bink2Decoder {
         let mut buf;
         self.key_frame = pkt.is_keyframe();
 
-        let bufret = alloc_video_buffer(self.info.get_properties().get_video_info().unwrap(), 5);
-        if let Err(_) = bufret { return Err(DecoderError::InvalidData); }
-        let bufinfo = bufret.unwrap();
+        let bufinfo = alloc_video_buffer(self.info.get_properties().get_video_info().unwrap(), 5)?;
         buf = bufinfo.get_vbuf().unwrap();
 
         self.decode_frame_new(&mut br, &mut buf, pkt.is_keyframe())?;
@@ -1935,9 +1937,12 @@ impl NADecoder for Bink2Decoder {
         frm.set_frame_type(if self.key_frame { FrameType::I } else { FrameType::P });
         Ok(frm.into_ref())
     }
+    fn flush(&mut self) {
+        self.ips.clear();
+    }
 }
 
-pub fn get_decoder() -> Box<NADecoder> {
+pub fn get_decoder() -> Box<dyn NADecoder> {
     Box::new(Bink2Decoder::new())
 }