}
struct BMVVideoDecoder {
- info: Rc<NACodecInfo>,
+ info: NACodecInfoRef,
pal: [u8; 768],
frame: [u8; FRAME_W * FRAME_H],
}
impl BMVVideoDecoder {
fn new() -> Self {
- let dummy_info = Rc::new(DUMMY_CODEC_INFO);
Self {
- info: dummy_info, pal: [0; 768], frame: [0; FRAME_W * FRAME_H],
+ info: NACodecInfoRef::default(), pal: [0; 768], frame: [0; FRAME_W * FRAME_H],
}
}
fn decode_frame(&mut self, src: &[u8], bufinfo: &mut NABufferType, line: i16) -> DecoderResult<()> {
let mut buf = bufo.unwrap();
let paloff = buf.get_offset(1);
let stride = buf.get_stride(0);
- let mut data = buf.get_data_mut();
+ let data = buf.get_data_mut().unwrap();
let dst = data.as_mut_slice();
let fwd = (line <= -640) || (line >= 0);
}
impl NADecoder for BMVVideoDecoder {
- fn init(&mut self, info: Rc<NACodecInfo>) -> DecoderResult<()> {
+ fn init(&mut self, info: NACodecInfoRef) -> DecoderResult<()> {
if let NACodecTypeInfo::Video(_vinfo) = info.get_properties() {
let fmt = NAPixelFormaton::new(ColorModel::RGB(RGBSubmodel::RGB),
Some(NAPixelChromaton::new(0, 0, true, 8, 0, 0, 3)),
None, None,
FORMATON_FLAG_PALETTE, 3);
let myinfo = NACodecTypeInfo::Video(NAVideoInfo::new(FRAME_W, FRAME_H, false, fmt));
- self.info = Rc::new(NACodecInfo::new_ref(info.get_name(), myinfo, info.get_extradata()));
+ self.info = NACodecInfo::new_ref(info.get_name(), myinfo, info.get_extradata()).into_ref();
Ok(())
} else {
}
impl NADecoder for BMVAudioDecoder {
- fn init(&mut self, info: Rc<NACodecInfo>) -> DecoderResult<()> {
+ fn init(&mut self, info: NACodecInfoRef) -> DecoderResult<()> {
if let NACodecTypeInfo::Audio(ainfo) = info.get_properties() {
self.ainfo = NAAudioInfo::new(ainfo.get_sample_rate(), ainfo.get_channels(), formats::SND_S16P_FORMAT, 32);
self.chmap = NAChannelMap::from_str("L,R").unwrap();
let nblocks = pktbuf[0] as usize;
validate!(pktbuf.len() == 1 + 65 * nblocks);
let samples = nblocks * 32;
- let mut abuf = alloc_audio_buffer(self.ainfo, samples, self.chmap.clone())?;
+ let abuf = alloc_audio_buffer(self.ainfo, samples, self.chmap.clone())?;
let mut adata = abuf.get_abuf_i16().unwrap();
let off1 = adata.get_offset(1);
- let mut dst = adata.get_data_mut();
+ let dst = adata.get_data_mut().unwrap();
let psrc = &pktbuf[1..];
for (n, src) in psrc.chunks_exact(65).enumerate() {
let code = src[0].rotate_right(1);
let mut dec_reg = RegisteredDecoders::new();
game_register_all_codecs(&mut dec_reg);
-// let file = "assets/PERFECT.BMV";
-// let file = "assets/DW2-MOUSE.BMV";
- let file = "assets/WILDCAT.BMV";
+// let file = "assets/Game/PERFECT.BMV";
+// let file = "assets/Game/DW2-MOUSE.BMV";
+ let file = "assets/Game/WILDCAT.BMV";
test_file_decoding("bmv", file, Some(40), true, false, None, &dmx_reg, &dec_reg);
}
#[test]
let mut dec_reg = RegisteredDecoders::new();
game_register_all_codecs(&mut dec_reg);
- let file = "assets/PERFECT.BMV";
-// let file = "assets/DW2-MOUSE.BMV";
-// let file = "assets/WILDCAT.BMV";
+ 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);
}
}