}
struct BMV3VideoDecoder {
- info: Rc<NACodecInfo>,
+ info: NACodecInfoRef,
stride: usize,
height: usize,
frame: Vec<u16>,
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;
}
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,
is_intra: false,
}
}
+ #[allow(clippy::identity_op)]
fn decode_frame(&mut self, br: &mut ByteReader) -> DecoderResult<()> {
let mut idx = 0;
loop {
}
impl NADecoder for BMV3VideoDecoder {
- fn init(&mut self, info: Rc<NACodecInfo>) -> 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();
Err(DecoderError::InvalidData)
}
}
- fn decode(&mut self, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
+ fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
let src = pkt.get_buffer();
validate!(src.len() > 1);
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 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<NAValue> { None }
+}
+
-pub fn get_decoder_video() -> Box<NADecoder> {
+pub fn get_decoder_video() -> Box<dyn NADecoder + Send> {
Box::new(BMV3VideoDecoder::new())
}
}
}
+#[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;
}
impl NADecoder for BMV3AudioDecoder {
- fn init(&mut self, info: Rc<NACodecInfo>) -> 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();
Err(DecoderError::InvalidData)
}
}
- fn decode(&mut self, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
+ fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
let info = pkt.get_stream().get_info();
if let NACodecTypeInfo::Audio(_) = info.get_properties() {
let pktbuf = pkt.get_buffer();
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<NAValue> { None }
}
-pub fn get_decoder_audio() -> Box<NADecoder> {
+pub fn get_decoder_audio() -> Box<dyn NADecoder + Send> {
Box::new(BMV3AudioDecoder::new())
}
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;
+ // sample: https://samples.mplayerhq.hu/game-formats/bmv/DW3-Loffnote.bmv
#[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]));
}
}
projects / nihav.git / blobdiff