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-duck
/
src
/
codecs
/
truemotion2.rs
diff --git
a/nihav-duck/src/codecs/truemotion2.rs
b/nihav-duck/src/codecs/truemotion2.rs
index 2ee8b24f593bde977ddcfefea708b32cc6943074..bf8aa7df364a7b5946e63ee96b3d44d298caf3a7 100644
(file)
--- a/
nihav-duck/src/codecs/truemotion2.rs
+++ b/
nihav-duck/src/codecs/truemotion2.rs
@@
-336,6
+336,7
@@
struct TM2Decoder {
impl TM2Decoder {
fn new() -> Self { Self::default() }
impl TM2Decoder {
fn new() -> Self { Self::default() }
+ #[allow(clippy::manual_memcpy)]
fn decode_blocks(&mut self) -> DecoderResult<bool> {
let ydst = &mut self.cur_frame.ydata;
let udst = &mut self.cur_frame.udata;
fn decode_blocks(&mut self) -> DecoderResult<bool> {
let ydst = &mut self.cur_frame.ydata;
let udst = &mut self.cur_frame.udata;
@@
-434,7
+435,7
@@
impl TM2Decoder {
for _ in 0..4 {
for x in 0..4 {
let dy = self.streams[TM2StreamType::Update as usize].get_token()?;
for _ in 0..4 {
for x in 0..4 {
let dy = self.streams[TM2StreamType::Update as usize].get_token()?;
- ydst[yoff + x] = (
(ysrc[yoff + x] as i32
) + dy) as u8;
+ ydst[yoff + x] = (
i32::from(ysrc[yoff + x]
) + dy) as u8;
}
yoff += ystride;
}
}
yoff += ystride;
}
@@
-581,6
+582,12
@@
impl NADecoder for TM2Decoder {
}
}
}
}
+impl NAOptionHandler for TM2Decoder {
+ 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(TM2Decoder::new())
}
pub fn get_decoder() -> Box<dyn NADecoder + Send> {
Box::new(TM2Decoder::new())
}
@@
-589,15
+596,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::duck_register_all_
codec
s;
+ use nihav_co
dec_support
::test::dec_video::*;
+ use crate::duck_register_all_
decoder
s;
use nihav_commonfmt::generic_register_all_demuxers;
#[test]
fn test_tm2() {
let mut dmx_reg = RegisteredDemuxers::new();
generic_register_all_demuxers(&mut dmx_reg);
let mut dec_reg = RegisteredDecoders::new();
use nihav_commonfmt::generic_register_all_demuxers;
#[test]
fn test_tm2() {
let mut dmx_reg = RegisteredDemuxers::new();
generic_register_all_demuxers(&mut dmx_reg);
let mut dec_reg = RegisteredDecoders::new();
- duck_register_all_
codec
s(&mut dec_reg);
+ duck_register_all_
decoder
s(&mut dec_reg);
test_decoding("avi", "truemotion2", "assets/Duck/tm20.avi", Some(16),
&dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![
test_decoding("avi", "truemotion2", "assets/Duck/tm20.avi", Some(16),
&dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![