}
validate!(val >= 2);
let len = (val >> 1) - 1;
-
+
match mode {
1 => bw.copy(len),
2 => for _ in 0..len { bw.put_byte(br.get_byte()); },
}
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)?;
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<dyn NADecoder> {
+pub fn get_decoder_video() -> Box<dyn NADecoder + Send> {
Box::new(BMVVideoDecoder::new())
}
}
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 {
Err(DecoderError::InvalidData)
}
}
+ fn flush(&mut self) {
+ }
}
-pub fn get_decoder_audio() -> Box<dyn NADecoder> {
+pub fn get_decoder_audio() -> Box<dyn NADecoder + Send> {
Box::new(BMVAudioDecoder::new())
}
use nihav_core::codecs::RegisteredDecoders;
use nihav_core::demuxers::RegisteredDemuxers;
use nihav_core::test::dec_video::*;
- use crate::codecs::game_register_all_codecs;
- use crate::demuxers::game_register_all_demuxers;
+ use crate::game_register_all_codecs;
+ use crate::game_register_all_demuxers;
#[test]
fn test_bmv_video() {
let mut dmx_reg = RegisteredDemuxers::new();
let file = "assets/Game/PERFECT.BMV";
// let file = "assets/Game/DW2-MOUSE.BMV";
// let file = "assets/Game/WILDCAT.BMV";
- test_decode_audio("bmv", file, None, "bmv", &dmx_reg, &dec_reg);
+ test_decode_audio("bmv", file, None, None/*Some("bmv")*/, &dmx_reg, &dec_reg);
}
}