use nihav_core::io::codebook::*;
use nihav_core::formats;
use nihav_core::codecs::*;
+use nihav_codec_support::codecs::{HAMShuffler, MV, ZERO_MV, ZIGZAG};
struct CLVDCCodeReader { }
struct CLVACCodeReader { }
impl NADecoder for ClearVideoDecoder {
fn init(&mut self, _supp: &mut NADecoderSupport, info: NACodecInfoRef) -> DecoderResult<()> {
- if info.get_extradata().is_none() { return Err(DecoderError::InvalidData); }
if let NACodecTypeInfo::Video(vinfo) = info.get_properties() {
let w = vinfo.get_width();
let h = vinfo.get_height();
let myinfo = NACodecTypeInfo::Video(NAVideoInfo::new(w, h, f, fmt));
self.info = NACodecInfo::new_ref(info.get_name(), myinfo, info.get_extradata()).into_ref();
self.frmmgr.clear();
- let edata = info.get_extradata().unwrap();
+ let edata = info.get_extradata().unwrap_or(std::sync::Arc::new(vec![]));
//todo detect simply by extradata contents?
- if !self.is_rm {
+ if edata.len() == 0 || edata.len() < 0x60 { // no or short extradata probably comes from MOV
+ self.tsize = 4;
+ } else if !self.is_rm {
let mut mr = MemoryReader::new_read(edata.as_slice());
let mut br = ByteReader::new(&mut mr);
br.read_skip(0x5E).unwrap();
}
}
+impl NAOptionHandler for ClearVideoDecoder {
+ 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() -> Box<dyn NADecoder + Send> {
Box::new(ClearVideoDecoder::new(false))
}
mod test {
use nihav_core::codecs::RegisteredDecoders;
use nihav_core::demuxers::RegisteredDemuxers;
- use nihav_core::test::dec_video::*;
+ use nihav_codec_support::test::dec_video::*;
use crate::generic_register_all_codecs;
use crate::generic_register_all_demuxers;
#[test]