if src.len() > PAL_SIZE {
let mut br = BitReader::new(&src[PAL_SIZE..], src.len() - PAL_SIZE, BitReaderMode::LE);
- let bufret = alloc_video_buffer(self.info.get_properties().get_video_info().unwrap(), 2);
- if let Err(_) = bufret { return Err(DecoderError::InvalidData); }
- bufinfo = bufret.unwrap();
+ bufinfo = alloc_video_buffer(self.info.get_properties().get_video_info().unwrap(), 2)?;
let mut buf = bufinfo.get_vbuf().unwrap();
is_intra = self.decode_frame(&mut br)?;
self.output_frame(&mut buf);
frm.set_frame_type(ftype);
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(SmackerVideoDecoder::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(SmackerAudioDecoder::new())
}
//let file = "assets/RAD/20130507_audio-distortion.smk";
let file = "assets/RAD/wetlogo.smk";
- test_decode_audio("smacker", file, None, "smk", &dmx_reg, &dec_reg);
+ test_decode_audio("smacker", file, None, None/*Some("smk")*/, &dmx_reg, &dec_reg);
}
}