for clr in pix.iter() {
if clr[best_axis] > avg[best_axis] {
avg2.add(clr);
- mask |= mask_bit;
} else {
avg1.add(clr);
+ mask |= mask_bit;
}
mask_bit <<= 1;
}
self.clr2.swap(0, 1);
}
} else {
- let (clrs, mask, dist) = quant2_16pix(&buf);
+ let (clrs, mask, dist) = quant2_16pix(buf);
self.clr2 = clrs;
self.clr2_flags = mask;
self.clr2_dist = dist;
let src2 = [buf[off], buf[off + 1], buf[off + 4], buf[off + 5]];
let (clrs, mask, dist) = quant2_4pix(&src2);
self.clr8[i] = clrs;
- let lo_bits = (mask & 0x3) ^ 0x3;
- let hi_bits = ((mask & 0xC) ^ 0xC) << 2;
+ let lo_bits = mask & 0x3;
+ let hi_bits = (mask & 0xC) << 2;
self.clr8_flags |= (hi_bits | lo_bits) << ((i & 1) * 2 + (i & 2) * 4);
self.clr8_dist += dist;
}
let dst = cur_frm.get_data_mut().unwrap();
let mut skip_run = 0;
let bpainter = BlockPainter15::new();
- for ((sstrip, rstrip), dstrip) in (&src[soff..]).chunks(sstride * 4).take(h / 4).zip((&rsrc[roff..]).chunks(rstride * 4)).zip((&mut dst[doff..]).chunks_mut(dstride * 4)) {
+ for ((sstrip, rstrip), dstrip) in src[soff..].chunks(sstride * 4).take(h / 4).zip(rsrc[roff..].chunks(rstride * 4)).zip(dst[doff..].chunks_mut(dstride * 4)) {
for x in (0..w).step_by(4) {
let mut buf = [UnpackedPixel::default(); 16];
let mut refbuf = [UnpackedPixel::default(); 16];
let doff = cur_frm.get_offset(0);
let dst = cur_frm.get_data_mut().unwrap();
let bpainter = BlockPainter15::new();
- for (sstrip, dstrip) in (&src[soff..]).chunks(sstride * 4).take(h / 4).zip((&mut dst[doff..]).chunks_mut(dstride * 4)) {
+ for (sstrip, dstrip) in src[soff..].chunks(sstride * 4).take(h / 4).zip(dst[doff..].chunks_mut(dstride * 4)) {
for x in (0..w).step_by(4) {
let mut buf = [UnpackedPixel::default(); 16];
Self::get_block(&sstrip[x..], sstride, &mut buf);
let dst = cur_frm.get_data_mut().unwrap();
let mut skip_run = 0;
let bpainter = BlockPainterPal::new(ls);
- for ((sstrip, rstrip), dstrip) in (&src[soff..]).chunks(sstride * 4).take(h / 4).zip((&rsrc[roff..]).chunks(rstride * 4)).zip((&mut dst[doff..]).chunks_mut(dstride * 4)) {
+ for ((sstrip, rstrip), dstrip) in src[soff..].chunks(sstride * 4).take(h / 4).zip(rsrc[roff..].chunks(rstride * 4)).zip(dst[doff..].chunks_mut(dstride * 4)) {
for x in (0..w).step_by(4) {
let mut buf = [UnpackedPixel::default(); 16];
let mut refbuf = [UnpackedPixel::default(); 16];
let doff = cur_frm.get_offset(0);
let dst = cur_frm.get_data_mut().unwrap();
let bpainter = BlockPainterPal::new(ls);
- for (sstrip, dstrip) in (&src[soff..]).chunks(sstride * 4).take(h / 4).zip((&mut dst[doff..]).chunks_mut(dstride * 4)) {
+ for (sstrip, dstrip) in src[soff..].chunks(sstride * 4).take(h / 4).zip(dst[doff..].chunks_mut(dstride * 4)) {
for x in (0..w).step_by(4) {
let mut buf = [UnpackedPixel::default(); 16];
Self::get_block8(&sstrip[x..], sstride, &mut buf, pal);
}
}
}
+ fn get_capabilities(&self) -> u64 { ENC_CAPS_SKIPFRAME }
fn init(&mut self, stream_id: u32, encinfo: EncodeParameters) -> EncoderResult<NAStreamRef> {
match encinfo.format {
NACodecTypeInfo::None => Err(EncoderError::FormatError),
for (cur_pal, new_pal) in self.pal.iter_mut().zip(pal.chunks_exact(3)) {
let (cur_clr, luma) = cur_pal.split_at_mut(3);
let new_clr = [u16::from(new_pal[0]), u16::from(new_pal[1]), u16::from(new_pal[2])];
- if cur_clr != &new_clr {
+ if cur_clr != new_clr {
pal_changed = true;
cur_clr.copy_from_slice(&new_clr);
luma[0] = rgb2y(cur_clr[0], cur_clr[1], cur_clr[2]);
};
//test_encoding_to_file(&dec_config, &enc_config, enc_params, &[]);
test_encoding_md5(&dec_config, &enc_config, enc_params, &[],
- &[0x27a9db38, 0x74f1000a, 0x38818c05, 0x99d692ba]);
+ &[0x5afaf853, 0xd53ba9dd, 0x630f53e7, 0x41b33a36]);
}
#[test]
};
//test_encoding_to_file(&dec_config, &enc_config, enc_params, &[]);
test_encoding_md5(&dec_config, &enc_config, enc_params, &[],
- &[0xe570a206, 0xc223063f, 0x44a0b70e, 0xa71fed1f]);
+ &[0xb3175a7b, 0x4a6cb45e, 0x526f3f5d, 0xaa1574cc]);
}
}