use nihav_core::io::bitreader::*;
use nihav_core::io::codebook::*;
use nihav_core::io::intcode::*;
+use nihav_codec_support::codecs::{IPShuffler, MV, ZERO_MV};
macro_rules! mktag {
($a:expr, $b:expr, $c:expr, $d:expr) => ({
};
(float; $src: expr, $sstep: expr, $off: expr, $dst: expr, $dstep: expr, $doff: expr, $bias: expr, $shift: expr) => {
let t00 = $src[$off + $sstep * 2] + $src[$off + $sstep * 6];
- let t01 = ($src[$off + $sstep * 2] - $src[$off + $sstep * 6]) * 1.4142135 - t00;
+ let t01 = ($src[$off + $sstep * 2] - $src[$off + $sstep * 6]) * std::f32::consts::SQRT_2 - t00;
let t02 = $src[$off + $sstep * 0] + $src[$off + $sstep * 4];
let t03 = $src[$off + $sstep * 0] - $src[$off + $sstep * 4];
let t04 = $src[$off + $sstep * 3] + $src[$off + $sstep * 5];
let t10 = t03 + t01;
let t11 = t03 - t01;
let t12 = t06 + t04;
- let t13 = (t06 - t04) * 1.4142135;
+ let t13 = (t06 - t04) * std::f32::consts::SQRT_2;
let t14 = (t07 - t05) * 1.847759;
let t15 = t05 * 2.613126 + t14 - t12;
let t16 = t13 - t15;
};
}
+#[allow(clippy::erasing_op)]
fn bink2_idct(coeffs: &mut [i32; 64]) {
let mut tmp: [i32; 64] = [0; 64];
for i in 0..8 {
}
}
+#[allow(clippy::erasing_op)]
fn bink2_idct_old(coeffs: &mut [f32; 64]) {
let mut tmp: [f32; 64] = [0.0; 64];
coeffs[0] += 512.5;
($a: expr, $b: expr, $c: expr, $d: expr) => (avg_tree!(avg_tree!($a, $b), avg_tree!($c, $d)));
}
+#[allow(clippy::erasing_op)]
impl Bink2DSP {
fn calc_dc(src: &[u8], stride: usize) -> i32 {
let mut sums = [0u16; 8];
0 => {
let src = &ppix[poff..];
for (out, row) in dst.chunks_mut(stride).take(16).zip(src.chunks(pstride)) {
- for i in 0..16 { out[i] = row[i]; }
+ out[..16].copy_from_slice(&row[..16]);
}
},
1 => {
if (mx == 0) && (my == 0) {
let inpix = &ppix[poff..];
for (out, src) in dst.chunks_mut(stride).take(8).zip(inpix.chunks(pstride)) {
- for i in 0..8 { out[i] = src[i]; }
+ out[..8].copy_from_slice(&src[..8]);
}
} else if my == 0 {
chroma_interp!(dst, stride, 8, u8, &ppix[poff..], pstride, 1, mx, 2);
}
fn map_ac(idx: usize) -> u8 { idx as u8 }
-fn map_mv(idx: usize) -> i8 { BINK2_MV_SYMS[idx] }
+fn map_mv(idx: usize) -> i8 { BINK2_MV_SYMS[idx] }
impl Default for Bink2Codes {
fn default() -> Self {
#[derive(Default)]
struct Bink2Decoder {
- info: Rc<NACodecInfo>,
+ info: NACodecInfoRef,
ips: IPShuffler,
version: u32,
codes: Bink2Codes,
}
+#[allow(clippy::erasing_op)]
impl Bink2Decoder {
fn new() -> Self {
Self::default()
}
+ #[allow(clippy::cognitive_complexity)]
fn decode_frame_new(&mut self, br: &mut BitReader, buf: &mut NAVideoBuffer<u8>, is_intra: bool) -> DecoderResult<()> {
let (stride_y, stride_u, stride_v, stride_a) = (buf.get_stride(0), buf.get_stride(1), buf.get_stride(2), buf.get_stride(3));
let (mut off_y, mut off_u, mut off_v, mut off_a) = (buf.get_offset(0), buf.get_offset(1), buf.get_offset(2), buf.get_offset(3));
if !br.read_bool()? {
nib1 = br.read(4)?;
}
- new_cbp = new_cbp | (nib1 << 4);
+ new_cbp |= nib1 << 4;
if !br.read_bool()? {
nib1 = br.read(4)?;
}
- new_cbp = new_cbp | (nib1 << 8);
+ new_cbp |= nib1 << 8;
if !br.read_bool()? {
nib1 = br.read(4)?;
}
const KB2H_NUM_SLICES: [usize; 4] = [ 2, 3, 4, 8 ];
impl NADecoder for Bink2Decoder {
- fn init(&mut self, info: Rc<NACodecInfo>) -> DecoderResult<()> {
+ fn init(&mut self, _supp: &mut NADecoderSupport, info: NACodecInfoRef) -> DecoderResult<()> {
if let NACodecTypeInfo::Video(vinfo) = info.get_properties() {
let w = vinfo.get_width();
let h = vinfo.get_height();
if self.has_alpha { FORMATON_FLAG_ALPHA } else { 0 },
if self.has_alpha { 4 } else { 3 });
let myinfo = NACodecTypeInfo::Video(NAVideoInfo::new(w, h, false, fmt));
- self.info = Rc::new(NACodecInfo::new_ref(info.get_name(), myinfo, info.get_extradata()));
+ self.info = NACodecInfo::new_ref(info.get_name(), myinfo, info.get_extradata()).into_ref();
Ok(())
} else {
Err(DecoderError::InvalidData)
}
}
- fn decode(&mut self, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
+ fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
let src = pkt.get_buffer();
- let mut br = BitReader::new(&src, src.len(), BitReaderMode::LE);
+ let mut br = BitReader::new(&src, BitReaderMode::LE);
let mut buf;
self.key_frame = pkt.is_keyframe();
- let bufret = alloc_video_buffer(self.info.get_properties().get_video_info().unwrap(), 5);
- if let Err(_) = bufret { return Err(DecoderError::InvalidData); }
- let bufinfo = bufret.unwrap();
+ let bufinfo = alloc_video_buffer(self.info.get_properties().get_video_info().unwrap(), 5)?;
buf = bufinfo.get_vbuf().unwrap();
self.decode_frame_new(&mut br, &mut buf, pkt.is_keyframe())?;
let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), bufinfo);
frm.set_frame_type(if self.key_frame { FrameType::I } else { FrameType::P });
- Ok(Rc::new(RefCell::new(frm)))
+ Ok(frm.into_ref())
}
+ fn flush(&mut self) {
+ self.ips.clear();
+ }
+}
+
+impl NAOptionHandler for Bink2Decoder {
+ 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> {
+pub fn get_decoder() -> Box<dyn NADecoder + Send> {
Box::new(Bink2Decoder::new())
}
mod test {
use nihav_core::codecs::RegisteredDecoders;
use nihav_core::demuxers::RegisteredDemuxers;
- use nihav_core::test::dec_video::*;
- use crate::codecs::rad_register_all_codecs;
- use crate::demuxers::rad_register_all_demuxers;
+ use nihav_codec_support::test::dec_video::*;
+ use crate::rad_register_all_decoders;
+ use crate::rad_register_all_demuxers;
#[test]
fn test_bink2() {
let mut dmx_reg = RegisteredDemuxers::new();
rad_register_all_demuxers(&mut dmx_reg);
let mut dec_reg = RegisteredDecoders::new();
- rad_register_all_codecs(&mut dec_reg);
+ rad_register_all_decoders(&mut dec_reg);
//let file = "assets/RAD/Open_Logos_partial.bik";
//let file = "assets/RAD/sc13_01_partial.bk2";
+ // sample from a private collection
let file = "assets/RAD/ge_video_86l.bk2";
//let file = "assets/RAD/eg_club_0.bk2";
test_file_decoding("bink", file, Some(8), true, false, None/*Some("bink2")*/, &dmx_reg, &dec_reg);