projects
/
nihav.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename register_all_codecs to register_all_decoders
[nihav.git]
/
nihav-indeo
/
src
/
codecs
/
indeo2.rs
diff --git
a/nihav-indeo/src/codecs/indeo2.rs
b/nihav-indeo/src/codecs/indeo2.rs
index 8126be0eaa2fb22e00e76090051d51e2cfc611a3..32e54f854c3b10bd7a2d222b3b882a65d76f99fe 100644
(file)
--- a/
nihav-indeo/src/codecs/indeo2.rs
+++ b/
nihav-indeo/src/codecs/indeo2.rs
@@
-2,6
+2,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;
static INDEO2_DELTA_TABLE: [[u8; 256]; 4] = [
[
static INDEO2_DELTA_TABLE: [[u8; 256]; 4] = [
[
@@
-186,7
+187,7
@@
impl CodebookDescReader<u8> for IR2CodeReader {
struct Indeo2Decoder {
info: NACodecInfoRef,
cb: Codebook<u8>,
struct Indeo2Decoder {
info: NACodecInfoRef,
cb: Codebook<u8>,
- frmmgr: HAMShuffler,
+ frmmgr: HAMShuffler
<u8>
,
}
impl Indeo2Decoder {
}
impl Indeo2Decoder {
@@
-364,6
+365,12
@@
impl NADecoder for Indeo2Decoder {
}
}
}
}
+impl NAOptionHandler for Indeo2Decoder {
+ 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(Indeo2Decoder::new())
}
pub fn get_decoder() -> Box<dyn NADecoder + Send> {
Box::new(Indeo2Decoder::new())
}
@@
-372,15
+379,15
@@
pub fn get_decoder() -> 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 crate::
codecs::indeo_register_all_codec
s;
- use nihav_commonfmt::
demuxers::
generic_register_all_demuxers;
+ use nihav_co
dec_support
::test::dec_video::*;
+ use crate::
indeo_register_all_decoder
s;
+ use nihav_commonfmt::generic_register_all_demuxers;
#[test]
fn test_indeo2() {
let mut dmx_reg = RegisteredDemuxers::new();
generic_register_all_demuxers(&mut dmx_reg);
let mut dec_reg = RegisteredDecoders::new();
#[test]
fn test_indeo2() {
let mut dmx_reg = RegisteredDemuxers::new();
generic_register_all_demuxers(&mut dmx_reg);
let mut dec_reg = RegisteredDecoders::new();
- indeo_register_all_
codec
s(&mut dec_reg);
+ indeo_register_all_
decoder
s(&mut dec_reg);
test_decoding("avi", "indeo2", "assets/Indeo/laser05.avi", Some(10),
&dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![
test_decoding("avi", "indeo2", "assets/Indeo/laser05.avi", Some(10),
&dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![