self.queue >>= nbits;
self.fill -= nbits;
if self.fill <= 16 {
- self.queue |= (br.read_u16le()? as u32) << self.fill;
+ self.queue |= u32::from(br.read_u16le()?) << self.fill;
self.fill += 16;
}
Ok(res)
return Err(DecoderError::NotImplemented);
}
- 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.output_frame(&mut bufinfo, w, h);
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(GremlinVideoDecoder::new())
}
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(GremlinAudioDecoder::new())
}
use nihav_core::codecs::RegisteredDecoders;
use nihav_core::demuxers::RegisteredDemuxers;
use nihav_core::test::dec_video::test_file_decoding;
- 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_gdv() {
let mut dmx_reg = RegisteredDemuxers::new();