From 470721d35aa74a65a9c7bd3d50544ebdbcecfddf Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Mon, 2 Mar 2026 18:03:06 +0100 Subject: [PATCH] jpeg: use nihav_codec_support module for JPEG decoding --- nihav-commonfmt/Cargo.toml | 2 +- nihav-commonfmt/src/codecs/jpeg.rs | 485 +++-------------------------- 2 files changed, 38 insertions(+), 449 deletions(-) diff --git a/nihav-commonfmt/Cargo.toml b/nihav-commonfmt/Cargo.toml index e7d3313..59afe90 100644 --- a/nihav-commonfmt/Cargo.toml +++ b/nihav-commonfmt/Cargo.toml @@ -12,7 +12,7 @@ path = "../nihav-registry" [dependencies.nihav_codec_support] path = "../nihav-codec-support" -features = ["h263", "mdct", "fft", "vq"] +features = ["h263", "mdct", "fft", "vq", "jpeg"] [dev-dependencies] nihav_realmedia = { path = "../nihav-realmedia", default-features=false, features = ["all_demuxers"] } diff --git a/nihav-commonfmt/src/codecs/jpeg.rs b/nihav-commonfmt/src/codecs/jpeg.rs index c8c81c5..0069f58 100644 --- a/nihav-commonfmt/src/codecs/jpeg.rs +++ b/nihav-commonfmt/src/codecs/jpeg.rs @@ -1,246 +1,31 @@ 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; +use nihav_codec_support::codecs::jpeg::*; -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; - -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, -} - -#[derive(Debug,PartialEq)] -enum JPEGType { - None, - Baseline, - Extended, - Progressive, - Lossless, - Differential, - DiffProgressive, - DiffLossless, - //JPEGLS, -} - -struct JPEGDecoder { +struct DecoderWrapper { info: NACodecInfoRef, - quant: [[i16; 64]; 4], - qselect: [u8; MAX_CHROMATONS], - comp_id: [u8; MAX_CHROMATONS], - subsamp: [u8; MAX_CHROMATONS], - codebook: [[Option>; 4]; 2], - width: usize, - height: usize, - depth: u8, - max_h: u8, - max_v: u8, + jpeg: JPEGDecoder, buf: Vec, } -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: &[i16; 64]) -> DecoderResult<()> { - if ss == 0 { - blk[0] = read_dc(br, dc_cb)?; - blk[0] *= 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 * qmat[idx]; - idx += 1; - } - Ok(()) -} - -impl JPEGDecoder { +impl DecoderWrapper { fn new() -> Self { - let dummy_info = NACodecInfo::new_dummy(); - Self { - info: dummy_info, - quant: [[0; 64]; 4], - qselect: [0; MAX_CHROMATONS], - subsamp: [0; MAX_CHROMATONS], - comp_id: [0; MAX_CHROMATONS], - codebook: [[None, None, None, None], [None, None, None, None]], - width: 0, - height: 0, - depth: 0, - max_h: 0, - max_v: 0, + info: NACodecInfo::new_dummy(), + jpeg: JPEGDecoder::new(), buf: Vec::new(), } } fn reset(&mut self) { - self.quant = [[0; 64]; 4]; - self.codebook = [[None, None, None, None], [None, None, None, None]]; - self.width = 0; - self.height = 0; - self.depth = 0; + self.jpeg.quant = [[0; 64]; 4]; + self.jpeg.cb = JCodebooks::default(); + self.jpeg.width = 0; + self.jpeg.height = 0; + self.jpeg.depth = 0; } fn parse_sof(&mut self, br: &mut dyn ByteIO) -> DecoderResult { - validate!(self.width == 0); + validate!(self.jpeg.width == 0); let len = br.read_u16be()? as usize; validate!(len >= 11); @@ -255,42 +40,42 @@ impl JPEGDecoder { if y == 0 { return Err(DecoderError::NotImplemented); } - self.depth = p; - self.width = x; - self.height = y; + self.jpeg.depth = p; + self.jpeg.width = x; + self.jpeg.height = y; let nf = br.read_byte()? as usize; validate!(nf > 0); validate!(len == 8 + nf * 3); if nf > MAX_CHROMATONS { return Err(DecoderError::NotImplemented); } - self.max_h = 0; - self.max_v = 0; + self.jpeg.max_h = 0; + self.jpeg.max_v = 0; for i in 0..nf { let c = br.read_byte()?; - self.comp_id[i] = c; + self.jpeg.comp_id[i] = c; let hv = br.read_byte()?; let t = br.read_byte()?; validate!(t < 4); - self.qselect[i] = t; - self.subsamp[i] = hv; + self.jpeg.qselect[i] = t; + self.jpeg.subsamp[i] = hv; let hs = hv >> 4; validate!(hs == 1 || hs == 2 || (i == 0 && hs == 4)); let vs = hv & 0xF; validate!(vs == 1 || vs == 2 || (i == 0 && vs == 4)); - self.max_h = self.max_h.max(hs); - self.max_v = self.max_v.max(vs); + self.jpeg.max_h = self.jpeg.max_h.max(hs); + self.jpeg.max_v = self.jpeg.max_v.max(vs); } let mut chromatons = [None; MAX_CHROMATONS]; for (i, chr) in chromatons[..nf].iter_mut().enumerate() { - let h_ss = match self.max_h / (self.subsamp[i] >> 4) { + let h_ss = match self.jpeg.max_h / (self.jpeg.subsamp[i] >> 4) { 1 => 0, 2 => 1, 4 => 2, _ => unreachable!(), }; - let v_ss = match self.max_v / (self.subsamp[i] & 0xF) { + let v_ss = match self.jpeg.max_v / (self.jpeg.subsamp[i] & 0xF) { 1 => 0, 2 => 1, 4 => 2, @@ -308,7 +93,7 @@ impl JPEGDecoder { } for i in 0..nf { for j in i + 1..nf { - validate!(self.comp_id[i] != self.comp_id[j]); + validate!(self.jpeg.comp_id[i] != self.jpeg.comp_id[j]); } } let formaton = NAPixelFormaton { @@ -323,147 +108,9 @@ impl JPEGDecoder { let vinfo = NAVideoInfo::new(x, y, false, formaton); Ok(alloc_video_buffer(vinfo, 4)?) } - - fn decode_scan(&mut self, src: &[u8], mut buf: NAVideoBufferRef, ci: &[ComponentInfo], ss: usize, se: usize) -> 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 (i, cinfo) in ci.iter().enumerate() { - 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!(); }); - qmats[i] = &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 = [0; MAX_CHROMATONS]; - let mut stride = [0; MAX_CHROMATONS]; - for ((doff, stride), ci) in offs.iter_mut().zip(stride.iter_mut()).zip(ci.iter()) { - *doff = frm.offset[ci.component_id]; - *stride = frm.stride[ci.component_id]; - } - let mut nblks = [0; MAX_CHROMATONS]; - let mut ystep = [0; MAX_CHROMATONS]; - let mut hstep = 8; - let mut vstep = 8; - if num_components > 1 { - for (i, cinfo) in ci.iter().enumerate() { - let hs = (self.subsamp[cinfo.component_id] >> 4) as usize; - let vs = (self.subsamp[cinfo.component_id] & 0xF) as usize; - hstep = hstep.max(hs * 8); - vstep = vstep.max(vs * 8); - nblks[i] = hs * vs; - ystep[i] = vs * 8; - } - } else { - let subsamp = self.subsamp[ci[0].component_id]; - nblks[0] = 1; - hstep = usize::from(8 * self.max_h / (subsamp >> 4)); - vstep = usize::from(8 * self.max_h / (subsamp & 0xF)); - ystep[0] = 8; - } - - let mut blocks; - for _y in (0..self.height).step_by(vstep) { - for x in 0..(self.width + hstep - 1) / hstep { - for i in 0..num_components { - 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); - } - match self.subsamp[i] { - 0x11 | 0x44 => { - put_block(&blocks[0], &mut frm.data[offs[i] + x * 8..], stride[i]); - }, - 0x21 => { - put_block(&blocks[0], &mut frm.data[offs[i] + x * 16..], stride[i]); - put_block(&blocks[1], &mut frm.data[offs[i] + x * 16 + 8..], stride[i]); - }, - 0x12 => { - put_block(&blocks[0], &mut frm.data[offs[i] + x * 8..], stride[i]); - put_block(&blocks[1], &mut frm.data[offs[i] + x * 8 + stride[i] * 8..], stride[i]); - }, - 0x22 => { - #[allow(clippy::needless_range_loop)] - for j in 0..4 { - put_block(&blocks[j], &mut frm.data[offs[i] + x * 16 + (j & 1) * 8 + (j >> 1) * 8 * stride[i]..], stride[i]); - } - }, - _ => 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 JPEGDecoder { +impl NADecoder for DecoderWrapper { fn init(&mut self, _supp: &mut NADecoderSupport, info: NACodecInfoRef) -> DecoderResult<()> { if let NACodecTypeInfo::Video(vinfo) = info.get_properties() { let w = vinfo.get_width(); @@ -576,7 +223,7 @@ impl NADecoder for JPEGDecoder { } validate!(tot_len > 0 && tot_len <= 256); br.read_buf(&mut syms[..tot_len])?; - self.codebook[tclass][id] = Some(generate_cb(&lens, &syms[..tot_len])?); + self.jpeg.cb.codebook[tclass][id] = Some(JCodebooks::generate_cb(&lens, &syms[..tot_len])?); } validate!(br.tell() == end); }, @@ -593,7 +240,7 @@ impl NADecoder for JPEGDecoder { for info in ci[..ns].iter_mut() { let id = br.read_byte()?; let mut found = false; - for (i, &c_id) in self.comp_id.iter().enumerate() { + for (i, &c_id) in self.jpeg.comp_id.iter().enumerate() { if c_id == id { info.component_id = i; found = true; @@ -604,15 +251,15 @@ impl NADecoder for JPEGDecoder { let tdta = br.read_byte()? as usize; let dc_id = tdta >> 4; validate!(dc_id < 4); - if self.codebook[0][dc_id].is_none() { + if self.jpeg.cb.codebook[0][dc_id].is_none() { validate!(dc_id < 2); - self.codebook[0][dc_id] = Some(build_default_cb(true, dc_id)?); + self.jpeg.cb.codebook[0][dc_id] = Some(JCodebooks::build_default_cb(true, dc_id)?); } let ac_id = tdta & 0xF; validate!(ac_id < 4); - if self.codebook[1][ac_id].is_none() { + if self.jpeg.cb.codebook[1][ac_id].is_none() { validate!(ac_id < 2); - self.codebook[1][ac_id] = Some(build_default_cb(false, ac_id)?); + self.jpeg.cb.codebook[1][ac_id] = Some(JCodebooks::build_default_cb(false, ac_id)?); } info.dc_table_id = dc_id; info.ac_table_id = ac_id; @@ -651,7 +298,7 @@ impl NADecoder for JPEGDecoder { let mut data = Vec::new(); std::mem::swap(&mut self.buf, &mut data); - let ret = self.decode_scan(&data, buf, &ci[..ns], ss, se); + let ret = self.jpeg.decode_scan(jtype, &data, buf, &ci[..ns], ss, se, None); std::mem::swap(&mut self.buf, &mut data); ret?; } else { unreachable!(); } @@ -686,11 +333,11 @@ impl NADecoder for JPEGDecoder { let qsize = if precision == 0 { 64 } else { 64 * 2 } + 1; validate!(len >= qsize); if precision == 0 { - for el in self.quant[id].iter_mut() { + for el in self.jpeg.quant[id].iter_mut() { *el = i16::from(br.read_byte()?); } } else { - for el in self.quant[id].iter_mut() { + for el in self.jpeg.quant[id].iter_mut() { *el = br.read_u16be()? as i16; } } @@ -750,14 +397,14 @@ impl NADecoder for JPEGDecoder { } } -impl NAOptionHandler for JPEGDecoder { +impl NAOptionHandler for DecoderWrapper { 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(JPEGDecoder::new()) + Box::new(DecoderWrapper::new()) } #[cfg(test)] @@ -780,61 +427,3 @@ mod test { [0xd3ec3f92, 0x1664c56d, 0xfc049754, 0xf65165b9]])); } } - -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 - ] -]; -- 2.39.5