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
/
vp7.rs
diff --git
a/nihav-duck/src/codecs/vp7.rs
b/nihav-duck/src/codecs/vp7.rs
index 3250e1bde9e13c98f3f3fc505499d5e54b562145..2632b40283baee3f39859da1e1d2c42cb585aeaf 100644
(file)
--- a/
nihav-duck/src/codecs/vp7.rs
+++ b/
nihav-duck/src/codecs/vp7.rs
@@
-1,6
+1,7
@@
use nihav_core::codecs::*;
use nihav_core::io::byteio::*;
use nihav_core::codecs::*;
use nihav_core::io::byteio::*;
-use nihav_core::data::GenericCache;
+use nihav_codec_support::codecs::{MV, ZERO_MV};
+use nihav_codec_support::data::GenericCache;
use super::vpcommon::*;
use super::vp7data::*;
use super::vp7dsp::*;
use super::vpcommon::*;
use super::vp7data::*;
use super::vp7dsp::*;
@@
-142,7
+143,7
@@
struct SBParams<'a> {
qmat: &'a [i16; 16],
}
qmat: &'a [i16; 16],
}
-fn decode_subblock
<'a>
(bc: &mut BoolCoder, coeffs: &mut [i16; 16], ctype: usize, pctx: u8, sbparams: &SBParams) -> u8 {
+fn decode_subblock(bc: &mut BoolCoder, coeffs: &mut [i16; 16], ctype: usize, pctx: u8, sbparams: &SBParams) -> u8 {
const COEF_BANDS: [usize; 16] = [ 0, 1, 2, 3, 6, 4, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7 ];
let mut has_nz = 0;
const COEF_BANDS: [usize; 16] = [ 0, 1, 2, 3, 6, 4, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7 ];
let mut has_nz = 0;
@@
-1070,17
+1071,17
@@
impl VP7Decoder {
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
]];
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
]];
- let edge_thr =
(loop_str as i16
) + 2;
- let luma_thr =
loop_str as i16
;
- let chroma_thr =
(loop_str as i16
) * 2;
+ let edge_thr =
i16::from(loop_str
) + 2;
+ let luma_thr =
i16::from(loop_str)
;
+ let chroma_thr =
i16::from(loop_str
) * 2;
let inner_thr = if self.dstate.loop_sharpness == 0 {
let inner_thr = if self.dstate.loop_sharpness == 0 {
- loop_str as i16
+ i16::from(loop_str)
} else {
} else {
- let bound1 =
(9 - self.dstate.loop_sharpness) as i16
;
+ let bound1 =
i16::from(9 - self.dstate.loop_sharpness)
;
let shift = (self.dstate.loop_sharpness + 3) >> 2;
let shift = (self.dstate.loop_sharpness + 3) >> 2;
- (
(loop_str as i16
) >> shift).min(bound1)
+ (
i16::from(loop_str
) >> shift).min(bound1)
};
};
- let hev_thr =
HIGH_EDGE_VAR_THR[if self.dstate.is_intra { 1 } else { 0 }][loop_str as usize] as i16
;
+ let hev_thr =
i16::from(HIGH_EDGE_VAR_THR[if self.dstate.is_intra { 1 } else { 0 }][loop_str as usize])
;
let ystride = dframe.stride[0];
let ustride = dframe.stride[1];
let ystride = dframe.stride[0];
let ustride = dframe.stride[1];
@@
-1125,7
+1126,7
@@
impl NADecoder for VP7Decoder {
if let NACodecTypeInfo::Video(vinfo) = info.get_properties() {
let fmt = YUV420_FORMAT;
let myvinfo = NAVideoInfo::new(vinfo.get_width(), vinfo.get_height(), false, fmt);
if let NACodecTypeInfo::Video(vinfo) = info.get_properties() {
let fmt = YUV420_FORMAT;
let myvinfo = NAVideoInfo::new(vinfo.get_width(), vinfo.get_height(), false, fmt);
- let myinfo = NACodecTypeInfo::Video(myvinfo
.clone()
);
+ let myinfo = NACodecTypeInfo::Video(myvinfo);
self.info = NACodecInfo::new_ref(info.get_name(), myinfo, info.get_extradata()).into_ref();
supp.pool_u8.set_dec_bufs(4);
self.info = NACodecInfo::new_ref(info.get_name(), myinfo, info.get_extradata()).into_ref();
supp.pool_u8.set_dec_bufs(4);
@@
-1136,6
+1137,7
@@
impl NADecoder for VP7Decoder {
Err(DecoderError::InvalidData)
}
}
Err(DecoderError::InvalidData)
}
}
+ #[allow(clippy::cyclomatic_complexity)]
fn decode(&mut self, supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
let src = pkt.get_buffer();
fn decode(&mut self, supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
let src = pkt.get_buffer();
@@
-1422,6
+1424,12
@@
impl NADecoder for VP7Decoder {
}
}
}
}
+impl NAOptionHandler for VP7Decoder {
+ 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<NADecoder + Send> {
Box::new(VP7Decoder::new())
}
pub fn get_decoder() -> Box<NADecoder + Send> {
Box::new(VP7Decoder::new())
}
@@
-1430,18
+1438,18
@@
pub fn get_decoder() -> Box<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::duck_register_all_codec
s;
- use nihav_commonfmt::
demuxers::
generic_register_all_demuxers;
+ 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_vp7() {
let mut dmx_reg = RegisteredDemuxers::new();
generic_register_all_demuxers(&mut dmx_reg);
let mut dec_reg = RegisteredDecoders::new();
#[test]
fn test_vp7() {
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", "vp7", "assets/Duck/interlaced_blit_pitch.avi", Some(12), &dmx_reg,
+ test_decoding("avi", "vp7", "assets/Duck/interlaced_blit_pitch.avi", Some(12), &dmx_reg,
&dec_reg, ExpectedTestResult::MD5Frames(vec![
[0xb79fb6f8, 0xed51ac9e, 0x9e423456, 0xc0918e7f],
[0xbf8d1274, 0x83515e15, 0x8c0887de, 0xfbfd05d3],
&dec_reg, ExpectedTestResult::MD5Frames(vec![
[0xb79fb6f8, 0xed51ac9e, 0x9e423456, 0xc0918e7f],
[0xbf8d1274, 0x83515e15, 0x8c0887de, 0xfbfd05d3],