X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-game%2Fsrc%2Fcodecs%2Fbmv3.rs;h=0140c8c4498d31371018b46a853bb7faec336011;hp=e6c3334a8b9d082ed54d693816fada55ac90d0bc;hb=78fb6560c73965d834b215fb0b49505ae5443288;hpb=410e63c2cc2645841f89daf7444783ab8f6fd7f1 diff --git a/nihav-game/src/codecs/bmv3.rs b/nihav-game/src/codecs/bmv3.rs index e6c3334..0140c8c 100644 --- a/nihav-game/src/codecs/bmv3.rs +++ b/nihav-game/src/codecs/bmv3.rs @@ -69,7 +69,7 @@ impl NibbleReader { } struct BMV3VideoDecoder { - info: Rc, + info: NACodecInfoRef, stride: usize, height: usize, frame: Vec, @@ -85,12 +85,6 @@ struct BMV3VideoDecoder { impl BMV3VideoDecoder { fn new() -> Self { - let dummy_info = Rc::new(DUMMY_CODEC_INFO); - let mut frame1 = Vec::with_capacity(BMV_MAX_SIZE); - frame1.resize(BMV_MAX_SIZE, 0); - let mut frame2 = Vec::with_capacity(BMV_MAX_SIZE); - frame2.resize(BMV_MAX_SIZE, 0); - let mut pixels = [0u16; 256]; for (i, el) in pixels.iter_mut().enumerate() { *el = i as u16; @@ -103,11 +97,11 @@ impl BMV3VideoDecoder { } Self { - info: dummy_info, + info: NACodecInfoRef::default(), stride: 0, height: 0, - frame: frame1, - prev_frame: frame2, + frame: vec![0; BMV_MAX_SIZE], + prev_frame: vec![0; BMV_MAX_SIZE], pixels, pixbuf, mode: BMV3Mode::Normal, pos: 0, @@ -116,6 +110,7 @@ impl BMV3VideoDecoder { is_intra: false, } } + #[allow(clippy::identity_op)] fn decode_frame(&mut self, br: &mut ByteReader) -> DecoderResult<()> { let mut idx = 0; loop { @@ -124,7 +119,7 @@ impl BMV3VideoDecoder { let skip; if op < 0x90 { let op2 = br.read_u16le()?; - skip = ((op2 >> 12) as usize) | ((op << 4) as usize); + skip = ((op2 >> 12) as usize) | ((op as usize) << 4); len = (op2 & 0xFFF) as usize; } else { len = ((op & 7) + 1) as usize; @@ -442,10 +437,10 @@ impl BMV3VideoDecoder { } impl NADecoder for BMV3VideoDecoder { - fn init(&mut self, info: Rc) -> DecoderResult<()> { + fn init(&mut self, _supp: &mut NADecoderSupport, info: NACodecInfoRef) -> DecoderResult<()> { if let NACodecTypeInfo::Video(vinfo) = info.get_properties() { let myinfo = NACodecTypeInfo::Video(NAVideoInfo::new(vinfo.get_width(), vinfo.get_height(), false, RGB565_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(); self.stride = vinfo.get_width(); self.height = vinfo.get_height(); @@ -458,7 +453,7 @@ impl NADecoder for BMV3VideoDecoder { Err(DecoderError::InvalidData) } } - fn decode(&mut self, pkt: &NAPacket) -> DecoderResult { + fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult { let src = pkt.get_buffer(); validate!(src.len() > 1); @@ -482,16 +477,14 @@ impl NADecoder for BMV3VideoDecoder { self.pos = off + self.stride; self.is_intra = (flags & BMV_INTRA) == BMV_INTRA; - let bufret = alloc_video_buffer(self.info.get_properties().get_video_info().unwrap(), 0); - 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(), 0)?; self.decode_frame(&mut br)?; { let mut buf = bufinfo.get_vbuf16().unwrap(); 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 refbuf = &self.frame[self.stride..]; @@ -505,12 +498,20 @@ impl NADecoder for BMV3VideoDecoder { let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), bufinfo); frm.set_keyframe(self.is_intra); frm.set_frame_type(if self.is_intra { FrameType::I } else { FrameType::P }); - Ok(Rc::new(RefCell::new(frm))) + Ok(frm.into_ref()) + } + fn flush(&mut self) { } } +impl NAOptionHandler for BMV3VideoDecoder { + fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] } + fn set_options(&mut self, _options: &[NAOption]) { } + fn query_option_value(&self, _name: &str) -> Option { None } +} + -pub fn get_decoder_video() -> Box { +pub fn get_decoder_video() -> Box { Box::new(BMV3VideoDecoder::new()) } @@ -532,6 +533,7 @@ impl BMV3AudioDecoder { } } +#[allow(clippy::identity_op)] fn decode_block(mode: u8, src: &[u8], dst: &mut [i16], mut pred: i16) -> i16 { let steps = &BMV_AUDIO_STEPS[mode as usize]; let mut val2 = 0; @@ -553,7 +555,7 @@ fn decode_block(mode: u8, src: &[u8], dst: &mut [i16], mut pred: i16) -> i16 { } impl NADecoder for BMV3AudioDecoder { - fn init(&mut self, info: Rc) -> DecoderResult<()> { + fn init(&mut self, _supp: &mut NADecoderSupport, 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(); @@ -562,7 +564,7 @@ impl NADecoder for BMV3AudioDecoder { Err(DecoderError::InvalidData) } } - fn decode(&mut self, pkt: &NAPacket) -> DecoderResult { + fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult { let info = pkt.get_stream().get_info(); if let NACodecTypeInfo::Audio(_) = info.get_properties() { let pktbuf = pkt.get_buffer(); @@ -571,7 +573,7 @@ impl NADecoder for BMV3AudioDecoder { 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 mut first = pktbuf[0] == 0; let psrc = &pktbuf[1..]; for (n, src) in psrc.chunks_exact(41).enumerate() { @@ -592,14 +594,22 @@ impl NADecoder for BMV3AudioDecoder { let mut frm = NAFrame::new_from_pkt(pkt, info, abuf); frm.set_duration(Some(samples as u64)); frm.set_keyframe(false); - Ok(Rc::new(RefCell::new(frm))) + Ok(frm.into_ref()) } else { Err(DecoderError::InvalidData) } } + fn flush(&mut self) { + } +} + +impl NAOptionHandler for BMV3AudioDecoder { + fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] } + fn set_options(&mut self, _options: &[NAOption]) { } + fn query_option_value(&self, _name: &str) -> Option { None } } -pub fn get_decoder_audio() -> Box { +pub fn get_decoder_audio() -> Box { Box::new(BMV3AudioDecoder::new()) } @@ -607,28 +617,28 @@ pub fn get_decoder_audio() -> Box { mod test { 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 nihav_codec_support::test::dec_video::*; + use crate::game_register_all_decoders; + use crate::game_register_all_demuxers; #[test] fn test_bmv_video() { let mut dmx_reg = RegisteredDemuxers::new(); game_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - game_register_all_codecs(&mut dec_reg); + game_register_all_decoders(&mut dec_reg); - let file = "assets/Game/DW3-Loffnote.bmv"; - test_file_decoding("bmv3", file, None, true, false, None, &dmx_reg, &dec_reg); + test_decoding("bmv3", "bmv3-video", "assets/Game/DW3-Loffnote.bmv", None, &dmx_reg, &dec_reg, + ExpectedTestResult::MD5([0xfa34b81b, 0xd0ab79e2, 0x78fb25cc, 0x98ae47ff])); } #[test] fn test_bmv_audio() { let mut dmx_reg = RegisteredDemuxers::new(); game_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - game_register_all_codecs(&mut dec_reg); + game_register_all_decoders(&mut dec_reg); - let file = "assets/Game/DW3-Loffnote.bmv"; - test_decode_audio("bmv3", file, None, "bmv3", &dmx_reg, &dec_reg); + test_decoding("bmv3", "bmv3-audio", "assets/Game/DW3-Loffnote.bmv", None, &dmx_reg, &dec_reg, + ExpectedTestResult::MD5([0xd8e743cc, 0x97604bd7, 0x8dbb89c6, 0xb34cad63])); } }