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
/
intel263.rs
diff --git
a/nihav-indeo/src/codecs/intel263.rs
b/nihav-indeo/src/codecs/intel263.rs
index a1a0ace6c1c5f94f7f22e395eca6d68973aa303e..ff55e65ce8e07f0909a734ca118b9cc1c920d210 100644
(file)
--- a/
nihav-indeo/src/codecs/intel263.rs
+++ b/
nihav-indeo/src/codecs/intel263.rs
@@
-157,13
+157,13
@@
fn deblock_hor(buf: &mut NAVideoBuffer<u8>, comp: usize, strength: u8, off: usiz
let dptr = buf.get_data_mut().unwrap();
let buf = dptr.as_mut_slice();
for x in 0..8 {
let dptr = buf.get_data_mut().unwrap();
let buf = dptr.as_mut_slice();
for x in 0..8 {
- let a =
buf[off - 2 * stride + x] as i16
;
- let b =
buf[off - 1 * stride + x] as i16
;
- let c =
buf[off + 0 * stride + x] as i16
;
- let d =
buf[off + 1 * stride + x] as i16
;
+ let a =
i16::from(buf[off - 2 * stride + x])
;
+ let b =
i16::from(buf[off - 1 * stride + x])
;
+ let c =
i16::from(buf[off + 0 * stride + x])
;
+ let d =
i16::from(buf[off + 1 * stride + x])
;
let diff = (3 * (a - d) + 8 * (c - b)) / 16;
if (diff != 0) && (diff > -24) && (diff < 24) {
let diff = (3 * (a - d) + 8 * (c - b)) / 16;
if (diff != 0) && (diff > -24) && (diff < 24) {
- let d1a = (diff.abs() - 2 * (diff.abs() -
(strength as i16
)).max(0)).max(0);
+ let d1a = (diff.abs() - 2 * (diff.abs() -
i16::from(strength
)).max(0)).max(0);
let d1 = if diff < 0 { -d1a } else { d1a };
buf[off - 1 * stride + x] = (b + d1).max(0).min(255) as u8;
let d1 = if diff < 0 { -d1a } else { d1a };
buf[off - 1 * stride + x] = (b + d1).max(0).min(255) as u8;
@@
-177,13
+177,13
@@
fn deblock_ver(buf: &mut NAVideoBuffer<u8>, comp: usize, strength: u8, off: usiz
let dptr = buf.get_data_mut().unwrap();
let buf = dptr.as_mut_slice();
for y in 0..8 {
let dptr = buf.get_data_mut().unwrap();
let buf = dptr.as_mut_slice();
for y in 0..8 {
- let a =
buf[off - 2 + y * stride] as i16
;
- let b =
buf[off - 1 + y * stride] as i16
;
- let c =
buf[off + 0 + y * stride] as i16
;
- let d =
buf[off + 1 + y * stride] as i16
;
+ let a =
i16::from(buf[off - 2 + y * stride])
;
+ let b =
i16::from(buf[off - 1 + y * stride])
;
+ let c =
i16::from(buf[off + 0 + y * stride])
;
+ let d =
i16::from(buf[off + 1 + y * stride])
;
let diff = (3 * (a - d) + 8 * (c - b)) / 16;
if (diff != 0) && (diff > -24) && (diff < 24) {
let diff = (3 * (a - d) + 8 * (c - b)) / 16;
if (diff != 0) && (diff > -24) && (diff < 24) {
- let d1a = (diff.abs() - 2 * (diff.abs() -
(strength as i16
)).max(0)).max(0);
+ let d1a = (diff.abs() - 2 * (diff.abs() -
i16::from(strength
)).max(0)).max(0);
let d1 = if diff < 0 { -d1a } else { d1a };
buf[off - 1 + y * stride] = (b + d1).max(0).min(255) as u8;
let d1 = if diff < 0 { -d1a } else { d1a };
buf[off - 1 + y * stride] = (b + d1).max(0).min(255) as u8;
@@
-448,6
+448,7
@@
fn decode_b_info(br: &mut BitReader, is_pb: bool, is_ipb: bool, is_intra: bool)
impl<'a> BlockDecoder for Intel263BR<'a> {
#[allow(unused_variables)]
impl<'a> BlockDecoder for Intel263BR<'a> {
#[allow(unused_variables)]
+#[allow(clippy::unreadable_literal)]
fn decode_pichdr(&mut self) -> DecoderResult<PicInfo> {
let br = &mut self.br;
let syncw = br.read(22)?;
fn decode_pichdr(&mut self) -> DecoderResult<PicInfo> {
let br = &mut self.br;
let syncw = br.read(22)?;
@@
-732,6
+733,12
@@
impl NADecoder for Intel263Decoder {
}
}
}
}
+impl NAOptionHandler for Intel263Decoder {
+ 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(Intel263Decoder::new())
pub fn get_decoder() -> Box<dyn NADecoder + Send> {
Box::new(Intel263Decoder::new())
@@
-742,14
+749,14
@@
mod test {
use nihav_core::codecs::RegisteredDecoders;
use nihav_core::demuxers::RegisteredDemuxers;
use nihav_codec_support::test::dec_video::*;
use nihav_core::codecs::RegisteredDecoders;
use nihav_core::demuxers::RegisteredDemuxers;
use nihav_codec_support::test::dec_video::*;
- use crate::indeo_register_all_
codec
s;
+ use crate::indeo_register_all_
decoder
s;
use nihav_commonfmt::generic_register_all_demuxers;
#[test]
fn test_intel263() {
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_intel263() {
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", "intel263", "assets/Indeo/neal73_saber.avi", Some(16),
&dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![
test_decoding("avi", "intel263", "assets/Indeo/neal73_saber.avi", Some(16),
&dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![