From 49ffd9739381cf5456986346b9e1a8ffe844e342 Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Mon, 2 Mar 2026 18:04:43 +0100 Subject: [PATCH] moviepak: switch to nihav_codec_support module for JPEG decoding This also improves decoding. --- nihav-misc/src/codecs/moviepak.rs | 690 +++++++----------------------- 1 file changed, 148 insertions(+), 542 deletions(-) rewrite nihav-misc/src/codecs/moviepak.rs (77%) diff --git a/nihav-misc/src/codecs/moviepak.rs b/nihav-misc/src/codecs/moviepak.rs dissimilarity index 77% index c710dfd..86bb930 100644 --- a/nihav-misc/src/codecs/moviepak.rs +++ b/nihav-misc/src/codecs/moviepak.rs @@ -1,542 +1,148 @@ -// Somewhat simplified JPEG decoder -// TODO: move common JPEG decoding into codec-support - -use nihav_core::io::byteio::{ByteIO,MemoryReader}; -use nihav_core::io::bitreader::*; -use nihav_core::io::codebook::*; -use nihav_core::codecs::*; -use nihav_codec_support::codecs::ZIGZAG; - -const W1: i32 = 2841; -const W2: i32 = 2676; -const W3: i32 = 2408; -const W5: i32 = 1609; -const W6: i32 = 1108; -const W7: i32 = 565; -const W8: i32 = 181; - -const ROW_SHIFT: u8 = 8; -const COL_SHIFT: u8 = 14; - -#[allow(clippy::erasing_op)] -fn idct_row(row: &mut [i16]) { - let in0 = ((i32::from(row[0])) << 11) + (1 << (ROW_SHIFT - 1)); - let in1 = (i32::from(row[4])) << 11; - let in2 = i32::from(row[6]); - let in3 = i32::from(row[2]); - let in4 = i32::from(row[1]); - let in5 = i32::from(row[7]); - let in6 = i32::from(row[5]); - let in7 = i32::from(row[3]); - - let tmp = W7 * (in4 + in5); - let a4 = tmp + (W1 - W7) * in4; - let a5 = tmp - (W1 + W7) * in5; - - let tmp = W3 * (in6 + in7); - let a6 = tmp - (W3 - W5) * in6; - let a7 = tmp - (W3 + W5) * in7; - - let tmp = in0 + in1; - - let a0 = in0 - in1; - let t1 = W6 * (in2 + in3); - let a2 = t1 - (W2 + W6) * in2; - let a3 = t1 + (W2 - W6) * in3; - let b1 = a4 + a6; - - let b4 = a4 - a6; - let t2 = a5 - a7; - let b6 = a5 + a7; - let b7 = tmp + a3; - let b5 = tmp - a3; - let b3 = a0 + a2; - let b0 = a0 - a2; - let b2 = (W8 * (b4 + t2) + 128) >> 8; - let b4 = (W8 * (b4 - t2) + 128) >> 8; - - row[0] = ((b7 + b1) >> ROW_SHIFT) as i16; - row[7] = ((b7 - b1) >> ROW_SHIFT) as i16; - row[1] = ((b3 + b2) >> ROW_SHIFT) as i16; - row[6] = ((b3 - b2) >> ROW_SHIFT) as i16; - row[2] = ((b0 + b4) >> ROW_SHIFT) as i16; - row[5] = ((b0 - b4) >> ROW_SHIFT) as i16; - row[3] = ((b5 + b6) >> ROW_SHIFT) as i16; - row[4] = ((b5 - b6) >> ROW_SHIFT) as i16; -} - -#[allow(clippy::erasing_op)] -#[allow(clippy::identity_op)] -fn idct_col(blk: &mut [i16; 64], off: usize) { - let in0 = ((i32::from(blk[off + 0*8])) << 8) + (1 << (COL_SHIFT - 1)); - let in1 = (i32::from(blk[off + 4*8])) << 8; - let in2 = i32::from(blk[off + 6*8]); - let in3 = i32::from(blk[off + 2*8]); - let in4 = i32::from(blk[off + 1*8]); - let in5 = i32::from(blk[off + 7*8]); - let in6 = i32::from(blk[off + 5*8]); - let in7 = i32::from(blk[off + 3*8]); - - let tmp = W7 * (in4 + in5); - let a4 = (tmp + (W1 - W7) * in4) >> 3; - let a5 = (tmp - (W1 + W7) * in5) >> 3; - - let tmp = W3 * (in6 + in7); - let a6 = (tmp - (W3 - W5) * in6) >> 3; - let a7 = (tmp - (W3 + W5) * in7) >> 3; - - let tmp = in0 + in1; - - let a0 = in0 - in1; - let t1 = W6 * (in2 + in3); - let a2 = (t1 - (W2 + W6) * in2) >> 3; - let a3 = (t1 + (W2 - W6) * in3) >> 3; - let b1 = a4 + a6; - - let b4 = a4 - a6; - let t2 = a5 - a7; - let b6 = a5 + a7; - let b7 = tmp + a3; - let b5 = tmp - a3; - let b3 = a0 + a2; - let b0 = a0 - a2; - let b2 = (W8 * (b4 + t2) + 128) >> 8; - let b4 = (W8 * (b4 - t2) + 128) >> 8; - - blk[off + 0*8] = ((b7 + b1) >> COL_SHIFT) as i16; - blk[off + 7*8] = ((b7 - b1) >> COL_SHIFT) as i16; - blk[off + 1*8] = ((b3 + b2) >> COL_SHIFT) as i16; - blk[off + 6*8] = ((b3 - b2) >> COL_SHIFT) as i16; - blk[off + 2*8] = ((b0 + b4) >> COL_SHIFT) as i16; - blk[off + 5*8] = ((b0 - b4) >> COL_SHIFT) as i16; - blk[off + 3*8] = ((b5 + b6) >> COL_SHIFT) as i16; - blk[off + 4*8] = ((b5 - b6) >> COL_SHIFT) as i16; -} - -fn idct(blk: &mut [i16; 64]) { - for i in 0..8 { idct_row(&mut blk[i*8..(i+1)*8]); } - for i in 0..8 { idct_col(blk, i); } -} - -fn put_block(blk: &[i16; 64], dst: &mut [u8], stride: usize) { - for (drow, srow) in dst.chunks_mut(stride).zip(blk.chunks(8)) { - for (del, &pix) in drow.iter_mut().zip(srow.iter()) { - *del = pix.clamp(0, 255) as u8; - } - } -} - -#[derive(Clone,Copy,Default)] -struct ComponentInfo { - component_id: usize, - dc_table_id: usize, - ac_table_id: usize, - plane: usize, -} - -struct MoviePakDecoder { - info: NACodecInfoRef, - quant: [[u8; 64]; 4], - qselect: [u8; MAX_CHROMATONS], - subsamp: [u8; MAX_CHROMATONS], - codebook: [[Option>; 4]; 2], - width: usize, - height: usize, - ilaced: bool, -} - -fn read_dc(br: &mut BitReader, cb: &Codebook) -> DecoderResult { - let cat = br.read_cb(cb)?; - if cat == 0 { - Ok(0) - } else { - validate!(cat < 12); - let add_bits = br.read(cat)? as i16; - let pivot = 1 << (cat - 1); - if add_bits < pivot { - Ok(add_bits + 1 - pivot * 2) - } else { - Ok(add_bits) - } - } -} - -fn read_ac(br: &mut BitReader, cb: &Codebook) -> DecoderResult<(usize, i16)> { - let val = br.read_cb(cb)?; - let run = usize::from(val >> 4); - let cat = val & 0xF; - let level = if cat != 0 { - validate!(cat < 11); - let add_bits = br.read(cat)? as i16; - let pivot = 1 << (cat - 1); - if add_bits < pivot { - add_bits + 1 - pivot * 2 - } else { - add_bits - } - } else { - validate!(run == 0 || run == 15); - 0 - }; - Ok((run, level)) -} - -fn read_block(br: &mut BitReader, blk: &mut [i16; 64], dc_cb: &Codebook, ac_cb: &Codebook, ss: usize, se: usize, qmat: &[u8; 64]) -> DecoderResult<()> { - if ss == 0 { - blk[0] = read_dc(br, dc_cb)?; - blk[0] *= i16::from(qmat[0]); - } - let mut idx = 1; - while idx <= se { - let (run, level) = read_ac(br, ac_cb)?; - if run == 0 && level == 0 { - break; - } - idx += run; - validate!(idx < 64); - blk[ZIGZAG[idx]] = level * i16::from(qmat[idx]); - idx += 1; - } - Ok(()) -} - -impl MoviePakDecoder { - fn new() -> Self { - let dummy_info = NACodecInfo::new_dummy(); - - Self { - info: dummy_info, - quant: [[0; 64]; 4], - qselect: [0, 1, 1, 0, 0], - subsamp: [0x21, 0x11, 0x11, 0, 0], - codebook: [[None, None, None, None], [None, None, None, None]], - width: 0, - height: 0, - ilaced: false, - } - } - - fn decode_scan(&mut self, src: &[u8], mut buf: NAVideoBufferRef, ci: &[ComponentInfo], ss: usize, se: usize, field2: bool) -> DecoderResult { - let num_components = ci.len(); - let mut last_dc = [1024; MAX_CHROMATONS]; - let mut dc_cbs = Vec::with_capacity(num_components); - let mut ac_cbs = Vec::with_capacity(num_components); - let mut qmats = [&self.quant[0]; MAX_CHROMATONS]; - for (qmat, cinfo) in qmats.iter_mut().zip(ci.iter()) { - dc_cbs.push(if let Some(ref cb) = self.codebook[0][cinfo.dc_table_id] { - cb - } else { unreachable!(); }); - ac_cbs.push(if let Some(ref cb) = self.codebook[1][cinfo.ac_table_id] { - cb - } else { unreachable!(); }); - *qmat = &self.quant[self.qselect[cinfo.component_id] as usize]; - } - - let frm = NASimpleVideoFrame::from_video_buf(&mut buf).unwrap(); - - let mut br = BitReader::new(src, BitReaderMode::BE); - - let mut offs = frm.offset; - let mut nblks = [0; MAX_CHROMATONS]; - let mut ystep = [0; MAX_CHROMATONS]; - let mut hstep = 8; - let mut vstep = 8; - for (i, &subsamp) in self.subsamp.iter().take(num_components).enumerate() { - let hs = (subsamp >> 4) as usize; - let vs = (subsamp & 0xF) as usize; - hstep = hstep.max(hs * 8); - vstep = vstep.max(vs * 8); - nblks[i] = hs * vs; - ystep[i] = vs * 8; - } - - let mut blocks; - let height = if !self.ilaced { self.height } else { self.height / 2 }; - let mut stride = frm.stride; - if self.ilaced { - for (strd, off) in stride.iter_mut().zip(offs.iter_mut()) { - if field2 { - *off += *strd; - } - *strd <<= 1; - } - } - for _y in (0..height).step_by(vstep) { - for x in 0..(self.width + hstep - 1) / hstep { - for (i, comp) in ci.iter().enumerate() { - blocks = [[0; 64]; 4]; - for blk in blocks[..nblks[i]].iter_mut() { - read_block(&mut br, blk, dc_cbs[i], ac_cbs[i], ss, se, qmats[i])?; - blk[0] += last_dc[i]; - last_dc[i] = blk[0]; - idct(blk); - } - let cstride = stride[comp.plane]; - let coff = offs[comp.plane]; - match self.subsamp[i] { - 0x11 => { - put_block(&blocks[0], &mut frm.data[coff + x * 8..], cstride); - }, - 0x21 => { - put_block(&blocks[0], &mut frm.data[coff + x * 16..], cstride); - put_block(&blocks[1], &mut frm.data[coff + x * 16 + 8..], cstride); - }, - 0x12 => { - put_block(&blocks[0], &mut frm.data[coff + x * 8..], cstride); - put_block(&blocks[1], &mut frm.data[coff + x * 8 + cstride * 8..], cstride); - }, - 0x22 => { - for (j, blk) in blocks.iter().take(4).enumerate() { - put_block(blk, &mut frm.data[coff + x * 16 + (j & 1) * 8 + (j >> 1) * 8 * cstride..], cstride); - } - }, - _ => unreachable!(), - }; - } - } - for i in 0..num_components { - offs[i] += stride[i] * ystep[i]; - } - } - - Ok((br.tell() + 7) / 8) - } -} - -struct HuffDescReader<'a> { - codes: &'a [u16], - bits: &'a [u8], - syms: &'a [u8], -} - -impl<'a> CodebookDescReader for HuffDescReader<'a> { - fn bits(&mut self, idx: usize) -> u8 { self.bits[idx] } - fn code(&mut self, idx: usize) -> u32 { u32::from(self.codes[idx]) } - fn sym (&mut self, idx: usize) -> u8 { self.syms[idx] } - fn len(&mut self) -> usize { self.syms.len() } -} - -fn generate_cb(lens: &[u8; 16], syms: &[u8]) -> DecoderResult> { - let mut codes = [0; 256]; - let mut bits = [0; 256]; - - let mut iter = bits.iter_mut(); - for (i, &len) in lens.iter().enumerate() { - for _ in 0..len { - *iter.next().unwrap() = (i + 1) as u8; - } - } - let mut code = 0; - let mut si = bits[0]; - let mut idx = 0; - while idx < syms.len() { - while idx < syms.len() && bits[idx] == si { - codes[idx] = code; - code += 1; - idx += 1; - } - while idx < syms.len() && bits[idx] != si { - code <<= 1; - si += 1; - } - } - - let mut cbr = HuffDescReader { codes: &codes, bits: &bits, syms }; - Ok(Codebook::new(&mut cbr, CodebookMode::MSB)?) -} - -fn build_default_cb(dc: bool, idx: usize) -> DecoderResult> { - if dc { - generate_cb(&DC_LENS[idx], &DC_SYMS) - } else { - generate_cb(&AC_LENS[idx], AC_SYMS[idx]) - } -} - -impl NADecoder for MoviePakDecoder { - 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(); - self.width = w; - self.height = h; - let myinfo = NACodecTypeInfo::Video(NAVideoInfo::new(w, h, false, YUV420_FORMAT)); - self.info = NACodecInfo::new_ref(info.get_name(), myinfo, info.get_extradata()).into_ref(); - Ok(()) - } else { - Err(DecoderError::InvalidData) - } - } - fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult { - let src = pkt.get_buffer(); - let mut br = MemoryReader::new_read(&src); - let width = usize::from(br.read_u16be()?); - let height = usize::from(br.read_u16be()?); - validate!(width == self.width && height == self.height); - let _field1_size = br.read_u32be()? as usize; - let field2_size = br.read_u32be()? as usize; - if field2_size != 0 { - return Err(DecoderError::NotImplemented); - } - br.read_buf(&mut self.quant[0])?; - br.read_buf(&mut self.quant[1])?; - - let formaton = NAPixelFormaton { - model: ColorModel::YUV(YUVSubmodel::YUVJ), - components: 3, - comp_info: [ - Some(NAPixelChromaton { - h_ss: 0, v_ss: 0, - packed: false, - depth: 8, - shift: 0, - comp_offs: 0, - next_elem: 1, - }), - Some(NAPixelChromaton { - h_ss: 1, v_ss: 0, - packed: false, - depth: 8, - shift: 0, - comp_offs: 1, - next_elem: 1, - }), - Some(NAPixelChromaton { - h_ss: 1, v_ss: 0, - packed: false, - depth: 8, - shift: 0, - comp_offs: 2, - next_elem: 1, - }), - None, - None - ], - elem_size: 0, - be: false, - alpha: false, - palette: false, - }; - let vinfo = NAVideoInfo::new(self.width, self.height, false, formaton); - let bufinfo = alloc_video_buffer(vinfo, 4)?; - - for (dc_id, dc_cb) in self.codebook[0].iter_mut().enumerate().take(2) { - if dc_cb.is_none() { - validate!(dc_id < 2); - *dc_cb = Some(build_default_cb(true, dc_id)?); - } - } - for (ac_id, ac_cb) in self.codebook[1].iter_mut().enumerate().take(2) { - if ac_cb.is_none() { - validate!(ac_id < 2); - *ac_cb = Some(build_default_cb(false, ac_id)?); - } - } - - if let Some(buf) = bufinfo.get_vbuf() { - let ci = [ - ComponentInfo { component_id: 1, dc_table_id: 0, ac_table_id: 0, plane: 0 }, - ComponentInfo { component_id: 2, dc_table_id: 1, ac_table_id: 1, plane: 1 }, - ComponentInfo { component_id: 3, dc_table_id: 1, ac_table_id: 1, plane: 2 }, - ]; - self.decode_scan(&src[br.tell() as usize..], buf, &ci, 0, 63, false)?; - } else { unreachable!(); } - - let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), bufinfo); - frm.set_keyframe(true); - frm.set_frame_type(FrameType::I); - Ok(frm.into_ref()) - } - fn flush(&mut self) { - } -} - -impl NAOptionHandler for MoviePakDecoder { - fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] } - fn set_options(&mut self, _options: &[NAOption]) { } - fn query_option_value(&self, _name: &str) -> Option { None } -} - -pub fn get_decoder() -> Box { - Box::new(MoviePakDecoder::new()) -} - -#[cfg(test)] -mod test { - use nihav_core::codecs::RegisteredDecoders; - use nihav_core::demuxers::RegisteredDemuxers; - use nihav_codec_support::test::dec_video::*; - use crate::misc_register_all_decoders; - use nihav_commonfmt::generic_register_all_demuxers; - #[test] - fn test_moviepak() { - let mut dmx_reg = RegisteredDemuxers::new(); - generic_register_all_demuxers(&mut dmx_reg); - let mut dec_reg = RegisteredDecoders::new(); - misc_register_all_decoders(&mut dec_reg); - // sample from Mac Magazin and MacEasy Magazine CD Issue 34 - test_decoding("mov-macbin", "moviepak", "assets/Misc/The Toaster Part 1.movie", Some(20), &dmx_reg, - &dec_reg, ExpectedTestResult::MD5Frames(vec![ - [0xe0ac2fde, 0x5dfc33c6, 0xf1725124, 0x79f9495e], - [0xcfc10706, 0xb893fb0a, 0xfd365ac0, 0xff29b6dc], - [0x43e46078, 0x013c7f5c, 0xf222761f, 0x1febc4ab]])); - } -} - -const DC_LENS: [[u8; 16]; 2] = [ - [ 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 ], - [ 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 ] -]; -const DC_SYMS: [u8; 12] = [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 ]; -const AC_LENS: [[u8; 16]; 2] = [ - [ 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 125 ], - [ 0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 119 ] -]; -const AC_SYMS: [&[u8]; 2] = [ - &[ - 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12, - 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07, - 0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08, - 0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0, - 0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16, - 0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28, - 0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, - 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, - 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, - 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, - 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, - 0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, - 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, - 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, - 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, - 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, - 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4, - 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2, - 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, - 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, - 0xf9, 0xfa - ], - &[ - 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21, - 0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71, - 0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91, - 0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0, - 0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34, - 0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26, - 0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38, - 0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, - 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, - 0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, - 0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, - 0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, - 0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, - 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, - 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, - 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, - 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, - 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, - 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, - 0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, - 0xf9, 0xfa - ] -]; +// Somewhat simplified JPEG decoder + +use nihav_core::io::byteio::{ByteIO,MemoryReader}; +use nihav_core::codecs::*; +use nihav_codec_support::codecs::jpeg::*; + +struct MoviePakDecoder { + info: NACodecInfoRef, + jpeg: JPEGDecoder, +} + +impl MoviePakDecoder { + fn new() -> Self { + let mut jpeg = JPEGDecoder::new(); + jpeg.cb = JCodebooks::default_jpeg_codebooks(); + jpeg.subsamp = [0x21, 0x11, 0x11, 0, 0]; + jpeg.max_h = 2; + jpeg.max_v = 1; + + Self { + info: NACodecInfo::new_dummy(), + jpeg, + } + } +} + +impl NADecoder for MoviePakDecoder { + 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(); + self.jpeg.width = w; + self.jpeg.height = h; + let myinfo = NACodecTypeInfo::Video(NAVideoInfo::new(w, h, false, YUV420_FORMAT)); + self.info = NACodecInfo::new_ref(info.get_name(), myinfo, info.get_extradata()).into_ref(); + Ok(()) + } else { + Err(DecoderError::InvalidData) + } + } + fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult { + let src = pkt.get_buffer(); + let mut br = MemoryReader::new_read(&src); + let width = usize::from(br.read_u16be()?); + let height = usize::from(br.read_u16be()?); + validate!(width > 0 && height > 0); + self.jpeg.width = width; + self.jpeg.height = height; + let _field1_size = br.read_u32be()? as usize; + let field2_size = br.read_u32be()? as usize; + if field2_size != 0 { + return Err(DecoderError::NotImplemented); + } + for el in self.jpeg.quant[0].iter_mut() { + *el = i16::from(br.read_byte()?); + } + for el in self.jpeg.quant[1].iter_mut() { + *el = i16::from(br.read_byte()?); + } + + let formaton = NAPixelFormaton { + model: ColorModel::YUV(YUVSubmodel::YUVJ), + components: 3, + comp_info: [ + Some(NAPixelChromaton { + h_ss: 0, v_ss: 0, + packed: false, + depth: 8, + shift: 0, + comp_offs: 0, + next_elem: 1, + }), + Some(NAPixelChromaton { + h_ss: 1, v_ss: 0, + packed: false, + depth: 8, + shift: 0, + comp_offs: 1, + next_elem: 1, + }), + Some(NAPixelChromaton { + h_ss: 1, v_ss: 0, + packed: false, + depth: 8, + shift: 0, + comp_offs: 2, + next_elem: 1, + }), + None, + None + ], + elem_size: 0, + be: false, + alpha: false, + palette: false, + }; + let vinfo = NAVideoInfo::new(self.jpeg.width, self.jpeg.height, false, formaton); + let bufinfo = alloc_video_buffer(vinfo, 4)?; + + if let Some(buf) = bufinfo.get_vbuf() { + let ci = [ + ComponentInfo { component_id: 0, dc_table_id: 0, ac_table_id: 0 }, + ComponentInfo { component_id: 1, dc_table_id: 1, ac_table_id: 1 }, + ComponentInfo { component_id: 2, dc_table_id: 1, ac_table_id: 1 }, + ]; + self.jpeg.decode_image(JPEGType::Baseline, &src[br.tell() as usize..], None, buf, &ci)?; + } else { unreachable!(); } + + let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), bufinfo); + frm.set_keyframe(true); + frm.set_frame_type(FrameType::I); + Ok(frm.into_ref()) + } + fn flush(&mut self) { + } +} + +impl NAOptionHandler for MoviePakDecoder { + fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] } + fn set_options(&mut self, _options: &[NAOption]) { } + fn query_option_value(&self, _name: &str) -> Option { None } +} + +pub fn get_decoder() -> Box { + Box::new(MoviePakDecoder::new()) +} + +#[cfg(test)] +mod test { + use nihav_core::codecs::RegisteredDecoders; + use nihav_core::demuxers::RegisteredDemuxers; + use nihav_codec_support::test::dec_video::*; + use crate::misc_register_all_decoders; + use nihav_commonfmt::generic_register_all_demuxers; + #[test] + fn test_moviepak() { + let mut dmx_reg = RegisteredDemuxers::new(); + generic_register_all_demuxers(&mut dmx_reg); + let mut dec_reg = RegisteredDecoders::new(); + misc_register_all_decoders(&mut dec_reg); + // sample from Mac Magazin and MacEasy Magazine CD Issue 34 + test_decoding("mov-macbin", "moviepak", "assets/Misc/The Toaster Part 1.movie", Some(20), &dmx_reg, + &dec_reg, ExpectedTestResult::MD5Frames(vec![ + [0x35ed5acb, 0xfef01d75, 0x0a6af750, 0x8c22ca1d], + [0x0f66a11b, 0x0b63d153, 0xa2fd5898, 0x7a8057d3], + [0xe0354509, 0xe394c475, 0x1833fda5, 0x8f0e3568]])); + } +} -- 2.39.5