From: Kostya Shishkov Date: Mon, 18 Aug 2025 16:40:44 +0000 (+0200) Subject: nihav_qt: switch to ByteIO X-Git-Url: https://git.nihav.org/?a=commitdiff_plain;h=a945cde6959f98ef396c6c49b65960f094b444c7;p=nihav.git nihav_qt: switch to ByteIO --- diff --git a/nihav-qt/src/codecs/alac.rs b/nihav-qt/src/codecs/alac.rs index 56cab1d..d8d4add 100644 --- a/nihav-qt/src/codecs/alac.rs +++ b/nihav-qt/src/codecs/alac.rs @@ -277,8 +277,7 @@ impl NADecoder for ALACDecoder { if let (NACodecTypeInfo::Audio(_), Some(edata)) = (info.get_properties(), info.get_extradata()) { validate!(edata.len() >= 12 + 24); - let mut mr = MemoryReader::new_read(&edata); - let mut br = ByteReader::new(&mut mr); + let mut br = MemoryReader::new_read(&edata); let len = br.read_u32be()? as usize; validate!(len == 12 + 24); let fcc = br.read_tag()?; diff --git a/nihav-qt/src/codecs/imaadpcm.rs b/nihav-qt/src/codecs/imaadpcm.rs index 74b31f9..51cf428 100644 --- a/nihav-qt/src/codecs/imaadpcm.rs +++ b/nihav-qt/src/codecs/imaadpcm.rs @@ -49,8 +49,7 @@ impl NADecoder for IMAADPCMDecoder { for data in pktbuf.chunks(PACKET_LEN * channels) { for ch in 0..channels { - let mut mr = MemoryReader::new_read(&data[PACKET_LEN * ch..][..PACKET_LEN]); - let mut br = ByteReader::new(&mut mr); + let mut br = MemoryReader::new_read(&data[PACKET_LEN * ch..][..PACKET_LEN]); let init = br.read_u16be()?; let pred = (init as i16) & !0x7F; diff --git a/nihav-qt/src/codecs/qdm2.rs b/nihav-qt/src/codecs/qdm2.rs index f573ac4..a2d742e 100644 --- a/nihav-qt/src/codecs/qdm2.rs +++ b/nihav-qt/src/codecs/qdm2.rs @@ -18,7 +18,7 @@ struct Packet { } impl Packet { - fn read(br: &mut ByteReader) -> DecoderResult { + fn read(br: &mut dyn ByteIO) -> DecoderResult { let id = br.read_byte()?; let size = if (id & 0x80) == 0 { br.read_byte()? as usize } else { br.read_u16be()? as usize }; validate!(size <= (br.left() as usize)); @@ -80,8 +80,7 @@ impl NADecoder for Qdmc2Decoder { if let NACodecTypeInfo::Audio(ainfo) = info.get_properties() { if let Some(edata) = info.get_extradata() { validate!(edata.len() >= 36); - let mut mr = MemoryReader::new_read(edata.as_slice()); - let mut br = ByteReader::new(&mut mr); + let mut br = MemoryReader::new_read(edata.as_slice()); let size = br.read_u32be()? as usize; validate!(size >= 36 && size <= edata.len()); let tag = br.read_tag()?; @@ -131,8 +130,7 @@ impl NADecoder for Qdmc2Decoder { let pktbuf = pkt.get_buffer(); validate!(pktbuf.len() == self.frm_bytes); - let mut mr = MemoryReader::new_read(pktbuf.as_slice()); - let mut br = ByteReader::new(&mut mr); + let mut br = MemoryReader::new_read(pktbuf.as_slice()); let hdr = Packet::read(&mut br)?; let (is_intra, has_checksum) = match hdr.id { diff --git a/nihav-qt/src/codecs/qdmc.rs b/nihav-qt/src/codecs/qdmc.rs index 442b9ed..790e624 100644 --- a/nihav-qt/src/codecs/qdmc.rs +++ b/nihav-qt/src/codecs/qdmc.rs @@ -256,8 +256,7 @@ impl NADecoder for QdmcDecoder { if let NACodecTypeInfo::Audio(ainfo) = info.get_properties() { if let Some(edata) = info.get_extradata() { validate!(edata.len() >= 36); - let mut mr = MemoryReader::new_read(edata.as_slice()); - let mut br = ByteReader::new(&mut mr); + let mut br = MemoryReader::new_read(edata.as_slice()); let size = br.read_u32be()? as usize; validate!(size >= 36 && size <= edata.len()); let tag = br.read_tag()?; diff --git a/nihav-qt/src/codecs/rle.rs b/nihav-qt/src/codecs/rle.rs index 49643de..ff7a372 100644 --- a/nihav-qt/src/codecs/rle.rs +++ b/nihav-qt/src/codecs/rle.rs @@ -49,7 +49,7 @@ impl RleDecoder { fn new() -> Self { Self::default() } - fn decode_mono(&self, br: &mut ByteReader, frm: &mut NASimpleVideoFrame, start_line: usize, end_line: usize) -> DecoderResult { + fn decode_mono(&self, br: &mut dyn ByteIO, frm: &mut NASimpleVideoFrame, start_line: usize, end_line: usize) -> DecoderResult { let mut has_skips = false; let mut pix_buf = [0u8; 16]; let npixels = 16; @@ -117,7 +117,7 @@ impl RleDecoder { Ok(has_skips) } - fn decode_pal(&self, br: &mut ByteReader, frm: &mut NASimpleVideoFrame, start_line: usize, end_line: usize) -> DecoderResult { + fn decode_pal(&self, br: &mut dyn ByteIO, frm: &mut NASimpleVideoFrame, start_line: usize, end_line: usize) -> DecoderResult { let mut has_skips = false; let mut pix_buf = [0u8; 16]; let npixels = match self.depth { @@ -187,7 +187,7 @@ impl RleDecoder { Ok(has_skips) } - fn decode_16bit(&self, br: &mut ByteReader, frm: &mut NASimpleVideoFrame, start_line: usize, end_line: usize) -> DecoderResult { + fn decode_16bit(&self, br: &mut dyn ByteIO, frm: &mut NASimpleVideoFrame, start_line: usize, end_line: usize) -> DecoderResult { let mut has_skips = false; let stride = frm.stride[0]; @@ -243,7 +243,7 @@ impl RleDecoder { Ok(has_skips) } - fn decode_24bit(&self, br: &mut ByteReader, frm: &mut NASimpleVideoFrame, start_line: usize, end_line: usize) -> DecoderResult { + fn decode_24bit(&self, br: &mut dyn ByteIO, frm: &mut NASimpleVideoFrame, start_line: usize, end_line: usize) -> DecoderResult { let mut has_skips = false; let mut rgb = [0u8; 3]; @@ -300,7 +300,7 @@ impl RleDecoder { Ok(has_skips) } - fn decode_32bit(&self, br: &mut ByteReader, frm: &mut NASimpleVideoFrame, start_line: usize, end_line: usize) -> DecoderResult { + fn decode_32bit(&self, br: &mut dyn ByteIO, frm: &mut NASimpleVideoFrame, start_line: usize, end_line: usize) -> DecoderResult { let mut has_skips = false; let mut rgb = [0u8; 4]; @@ -384,8 +384,7 @@ impl NADecoder for RleDecoder { fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult { let src = pkt.get_buffer(); validate!(src.len() >= 2); - let mut mr = MemoryReader::new_read(src.as_slice()); - let mut br = ByteReader::new(&mut mr); + let mut br = MemoryReader::new_read(src.as_slice()); let id = br.read_byte()?; validate!(id == 0x40 || id == 0x00); diff --git a/nihav-qt/src/codecs/rpza.rs b/nihav-qt/src/codecs/rpza.rs index 7eb1d8b..8bc64ad 100644 --- a/nihav-qt/src/codecs/rpza.rs +++ b/nihav-qt/src/codecs/rpza.rs @@ -61,8 +61,7 @@ impl NADecoder for RpzaDecoder { fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult { let src = pkt.get_buffer(); validate!(src.len() >= 2); - let mut mr = MemoryReader::new_read(src.as_slice()); - let mut br = ByteReader::new(&mut mr); + let mut br = MemoryReader::new_read(src.as_slice()); let id = br.read_byte()?; validate!(id == 0xE1); diff --git a/nihav-qt/src/codecs/smc.rs b/nihav-qt/src/codecs/smc.rs index 7b01097..084d77e 100644 --- a/nihav-qt/src/codecs/smc.rs +++ b/nihav-qt/src/codecs/smc.rs @@ -59,8 +59,7 @@ impl NADecoder for SmcDecoder { fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult { let src = pkt.get_buffer(); validate!(src.len() >= 2); - let mut mr = MemoryReader::new_read(src.as_slice()); - let mut br = ByteReader::new(&mut mr); + let mut br = MemoryReader::new_read(src.as_slice()); let _flags = br.read_byte()?; let length = br.read_u24be()? as usize;