projects
/
nihav.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make HAMShuffler generic
[nihav.git]
/
nihav-commonfmt
/
src
/
codecs
/
clearvideo.rs
diff --git
a/nihav-commonfmt/src/codecs/clearvideo.rs
b/nihav-commonfmt/src/codecs/clearvideo.rs
index 47357311668dcfb1d7a59efe4ebaffddd626be36..4f24bd4919d3fef0542b7a7ae2e40db35bb6da9d 100644
(file)
--- a/
nihav-commonfmt/src/codecs/clearvideo.rs
+++ b/
nihav-commonfmt/src/codecs/clearvideo.rs
@@
-3,6
+3,7
@@
use nihav_core::io::bitreader::*;
use nihav_core::io::codebook::*;
use nihav_core::formats;
use nihav_core::codecs::*;
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 { }
struct CLVDCCodeReader { }
struct CLVACCodeReader { }
@@
-372,7
+373,7
@@
struct ClearVideoDecoder {
info: NACodecInfoRef,
dc_cb: Codebook<i8>,
ac_cb: Codebook<u16>,
info: NACodecInfoRef,
dc_cb: Codebook<i8>,
ac_cb: Codebook<u16>,
- frmmgr: HAMShuffler,
+ frmmgr: HAMShuffler
<u8>
,
is_rm: bool,
ylev: [LevelCodes; 4],
ulev: [LevelCodes; 3],
is_rm: bool,
ylev: [LevelCodes; 4],
ulev: [LevelCodes; 3],
@@
-622,8
+623,8
@@
impl ClearVideoDecoder {
}
impl NADecoder for ClearVideoDecoder {
}
impl NADecoder for ClearVideoDecoder {
+ #[allow(clippy::or_fun_call)]
fn init(&mut self, _supp: &mut NADecoderSupport, info: NACodecInfoRef) -> DecoderResult<()> {
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();
if let NACodecTypeInfo::Video(vinfo) = info.get_properties() {
let w = vinfo.get_width();
let h = vinfo.get_height();
@@
-632,9
+633,11
@@
impl NADecoder for ClearVideoDecoder {
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 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?
//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();
let mut mr = MemoryReader::new_read(edata.as_slice());
let mut br = ByteReader::new(&mut mr);
br.read_skip(0x5E).unwrap();
@@
-705,6
+708,12
@@
impl NADecoder for ClearVideoDecoder {
}
}
}
}
+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))
}
pub fn get_decoder() -> Box<dyn NADecoder + Send> {
Box::new(ClearVideoDecoder::new(false))
}
@@
-717,7
+726,7
@@
pub fn get_decoder_rm() -> Box<dyn NADecoder + Send> {
mod test {
use nihav_core::codecs::RegisteredDecoders;
use nihav_core::demuxers::RegisteredDemuxers;
mod test {
use nihav_core::codecs::RegisteredDecoders;
use nihav_core::demuxers::RegisteredDemuxers;
- use nihav_co
re
::test::dec_video::*;
+ use nihav_co
dec_support
::test::dec_video::*;
use crate::generic_register_all_codecs;
use crate::generic_register_all_demuxers;
#[test]
use crate::generic_register_all_codecs;
use crate::generic_register_all_demuxers;
#[test]