add flush() to decoder interface

[nihav.git] / nihav-game / src / codecs / bmv.rs

diff --git a/nihav-game/src/codecs/bmv.rs b/nihav-game/src/codecs/bmv.rs
index 970f490d48fac162f4fb56ca1e9805ff2689d505..902ae513bee4fc5d312bcf840bd0151cb460f29d 100644 (file)
--- a/nihav-game/src/codecs/bmv.rs
+++ b/nihav-game/src/codecs/bmv.rs
@@ -84,11 +84,7 @@ impl<'a> BMVWriter<'a> {
         for _ in 0..len {
             let saddr = (self.pos as isize) + self.off;
             if saddr < 0 { continue; }
-            if self.fwd {
-                self.data[self.pos] = self.data[saddr as usize];
-            } else {
-                self.data[self.pos] = self.data[saddr as usize];
-            }
+            self.data[self.pos] = self.data[saddr as usize];
             self.advance();
         }
     }
@@ -210,9 +206,7 @@ impl NADecoder for BMVVideoDecoder {
         }
         let pos = br.tell() as usize;
 
-        let bufret = alloc_video_buffer(self.info.get_properties().get_video_info().unwrap(), 0);
-        if let Err(_) = bufret { return Err(DecoderError::InvalidData); }
-        let mut bufinfo = bufret.unwrap();
+        let mut bufinfo = alloc_video_buffer(self.info.get_properties().get_video_info().unwrap(), 0)?;
 
         self.decode_frame(&src[pos..], &mut bufinfo, line)?;
 
@@ -222,10 +216,12 @@ impl NADecoder for BMVVideoDecoder {
         frm.set_frame_type(if is_intra { FrameType::I } else { FrameType::P });
         Ok(frm.into_ref())
     }
+    fn flush(&mut self) {
+    }
 }
 
 
-pub fn get_decoder_video() -> Box<NADecoder> {
+pub fn get_decoder_video() -> Box<dyn NADecoder> {
     Box::new(BMVVideoDecoder::new())
 }
 
@@ -246,7 +242,7 @@ impl BMVAudioDecoder {
 }
 
 fn scale_sample(samp: u8, scale: i32) -> i16 {
-    let val = (((samp as i8) as i32) * scale) >> 5;
+    let val = (i32::from(samp as i8) * scale) >> 5;
     if val < -32768 {
         -32768
     } else if val > 32767 {
@@ -299,9 +295,11 @@ impl NADecoder for BMVAudioDecoder {
             Err(DecoderError::InvalidData)
         }
     }
+    fn flush(&mut self) {
+    }
 }
 
-pub fn get_decoder_audio() -> Box<NADecoder> {
+pub fn get_decoder_audio() -> Box<dyn NADecoder> {
     Box::new(BMVAudioDecoder::new())
 }