}
struct VMDVideoDecoder {
- info: Rc<NACodecInfo>,
+ info: NACodecInfoRef,
pal: [u8; 768],
buf: Vec<u8>,
width: usize,
impl VMDVideoDecoder {
fn new() -> Self {
Self {
- info: Rc::new(NACodecInfo::default()),
+ info: NACodecInfoRef::default(),
pal: [0; 768],
buf: Vec::new(),
width: 0,
fn decode_frame(&mut self, br: &mut ByteReader, buf: &mut NAVideoBuffer<u8>) -> DecoderResult<bool> {
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 frame_x = br.read_u16le()? as usize;
}
impl NADecoder for VMDVideoDecoder {
- fn init(&mut self, info: Rc<NACodecInfo>) -> DecoderResult<()> {
+ fn init(&mut self, info: NACodecInfoRef) -> DecoderResult<()> {
if let NACodecTypeInfo::Video(vinfo) = info.get_properties() {
self.width = vinfo.get_width();
self.height = vinfo.get_height();
let myinfo = NACodecTypeInfo::Video(NAVideoInfo::new(self.width, self.height, false, PAL8_FORMAT));
- 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();
validate!(info.get_extradata().is_some());
if let Some(ref edata) = info.get_extradata() {
}
impl NADecoder for VMDAudioDecoder {
- fn init(&mut self, info: Rc<NACodecInfo>) -> DecoderResult<()> {
+ fn init(&mut self, info: NACodecInfoRef) -> DecoderResult<()> {
if let NACodecTypeInfo::Audio(ainfo) = info.get_properties() {
let fmt;
if ainfo.get_format().get_bits() == 8 {
if self.is16bit {
let mut adata = abuf.get_abuf_i16().unwrap();
let off1 = adata.get_offset(1);
- let mut dst = adata.get_data_mut();
+ let mut dst = adata.get_data_mut().unwrap();
self.decode_16bit(&mut dst, off1, &mut br, nblocks, mask)?;
} else {
let mut adata = abuf.get_abuf_u8().unwrap();
- let mut dst = adata.get_data_mut();
+ let dst = adata.get_data_mut().unwrap();
let mut doff = 0;
let mut mask = mask;
let channels = self.chmap.num_channels();
let mut dec_reg = RegisteredDecoders::new();
game_register_all_codecs(&mut dec_reg);
-// let file = "assets/1491.VMD";
- let file = "assets/128.vmd";
+// let file = "assets/Game/1491.VMD";
+ let file = "assets/Game/128.vmd";
test_file_decoding("vmd", file, Some(10), true, false, None/*Some("vmd")*/, &dmx_reg, &dec_reg);
}
#[test]
let mut dec_reg = RegisteredDecoders::new();
game_register_all_codecs(&mut dec_reg);
-// let file = "assets/1491.VMD";
- let file = "assets/128.vmd";
-// let file = "assets/1000.VMD";
-// let file = "assets/235.VMD";
+// let file = "assets/Game/1491.VMD";
+ let file = "assets/Game/128.vmd";
+// let file = "assets/Game/1000.VMD";
+// let file = "assets/Game/235.VMD";
test_decode_audio("vmd", file, None, "vmd", &dmx_reg, &dec_reg);
}
}