use nihav_core::codecs::*;
use nihav_core::io::byteio::*;
-use nihav_codec_support::vq::*;
-#[derive(Default,Clone,Copy,PartialEq)]
-struct Pixel16(u16);
+type UnpackedPixel = [u16; 4];
-impl Pixel16 {
- fn unpack(&self) -> (u8, u8, u8) {
- (((self.0 >> 10) & 0x1F) as u8, ((self.0 >> 5) & 0x1F) as u8, (self.0 & 0x1F) as u8)
- }
- fn pack(r: u8, g: u8, b: u8) -> Self {
- Pixel16{ 0: (u16::from(r) << 10) | (u16::from(g) << 5) | u16::from(b) }
+fn map_quality(quality: u8) -> (u32, u32) {
+ if quality == 0 {
+ (0, 0)
+ } else {
+ let skip_threshold = (10 - (u32::from(quality) / 10).min(10)) * 8;
+ let fill_threshold = (10 - (u32::from(quality) / 10).min(10)) * 16;
+ (skip_threshold, fill_threshold)
}
}
-impl VQElement for Pixel16 {
- fn dist(&self, rval: Self) -> u32 {
- let (r0, g0, b0) = self.unpack();
- let (r1, g1, b1) = rval.unpack();
- let rd = i32::from(r0) - i32::from(r1);
- let gd = i32::from(g0) - i32::from(g1);
- let bd = i32::from(b0) - i32::from(b1);
- (rd * rd + gd * gd + bd * bd) as u32
- }
- fn min_cw() -> Self { Pixel16(0x0000) }
- fn max_cw() -> Self { Pixel16(0x7FFF) }
- fn min(&self, rval: Self) -> Self {
- let (r0, g0, b0) = self.unpack();
- let (r1, g1, b1) = rval.unpack();
- Self::pack(r0.min(r1), g0.min(g1), b0.min(b1))
+
+trait PixelOps {
+ fn unpack(&self) -> UnpackedPixel;
+ fn dist<T: PixelOps>(&self, val: T) -> u32 {
+ dist_core(self.unpack(), &val.unpack())
}
- fn max(&self, rval: Self) -> Self {
- let (r0, g0, b0) = self.unpack();
- let (r1, g1, b1) = rval.unpack();
- Self::pack(r0.max(r1), g0.max(g1), b0.max(b1))
+}
+
+impl PixelOps for u16 {
+ fn unpack(&self) -> UnpackedPixel {
+ let val = *self;
+ let r = (val >> 10) & 0x1F;
+ let g = (val >> 5) & 0x1F;
+ let b = val & 0x1F;
+ [r, g, b, rgb2y(r, g, b)]
}
- fn num_components() -> usize { 3 }
- fn sort_by_component(arr: &mut [Self], component: usize) {
- let mut counts = [0; 32];
- for pix in arr.iter() {
- let (r, g, b) = pix.unpack();
- let idx = match component {
- 0 => r,
- 1 => g,
- _ => b,
- } as usize;
- counts[idx] += 1;
- }
- let mut offs = [0; 32];
- for i in 0..31 {
- offs[i + 1] = offs[i] + counts[i];
- }
- let mut dst = vec![Pixel16(0); arr.len()];
- for pix in arr.iter() {
- let (r, g, b) = pix.unpack();
- let idx = match component {
- 0 => r,
- 1 => g,
- _ => b,
- } as usize;
- dst[offs[idx]] = *pix;
- offs[idx] += 1;
+}
+
+fn dist_core(val: UnpackedPixel, other: &UnpackedPixel) -> u32 {
+ let sum = val.iter().zip(other.iter()).take(3).fold(0i32,
+ |acc, (&a, &b)| {
+ let diff = i32::from(a) - i32::from(b);
+ acc + diff * diff
+ });
+ sum as u32
+}
+
+
+fn rgb2y(r: u16, g: u16, b: u16) -> u16 {
+ (r * 77 + g * 150 + b * 29) >> 8
+}
+
+fn pack_rgb555(val: UnpackedPixel) -> u16 {
+ (val[0] << 10) | (val[1] << 5) | val[2]
+}
+
+#[derive(Default)]
+struct PixelAverage {
+ sum: UnpackedPixel,
+ count: u16,
+}
+
+impl PixelAverage {
+ fn new() -> Self { Self::default() }
+ fn add(&mut self, val: &UnpackedPixel) {
+ for (dst, &src) in self.sum.iter_mut().zip(val.iter()) {
+ *dst += src;
}
- arr.copy_from_slice(dst.as_slice());
+ self.count += 1;
}
- fn max_dist_component(min: &Self, max: &Self) -> usize {
- let (r0, g0, b0) = max.unpack();
- let (r1, g1, b1) = min.unpack();
- let rd = u32::from(r0) - u32::from(r1);
- let gd = u32::from(g0) - u32::from(g1);
- let bd = u32::from(b0) - u32::from(b1);
- if rd > gd && rd > bd {
- 0
- } else if bd > rd && bd > gd {
- 2
+ fn get_avg(&self) -> UnpackedPixel {
+ if self.count > 0 {
+ let mut ret = self.sum;
+ for el in ret.iter_mut() {
+ *el /= self.count;
+ }
+ ret
} else {
- 1
+ [0; 4]
}
}
}
-struct Pixel16Sum {
- rsum: u64,
- gsum: u64,
- bsum: u64,
- count: u64,
-}
+macro_rules! quant_template {
+ ($name:ident, $N:expr) => {
+ fn $name(pix: &[UnpackedPixel; $N]) -> ([UnpackedPixel; 2], u16, u32) {
+ let mut avg = PixelAverage::new();
+ let mut maxv = [0; 4];
+ let mut minv = [255; 4];
+ for src in pix.iter() {
+ avg.add(src);
+ for ((maxv, minv), &comp) in maxv.iter_mut().zip(minv.iter_mut()).zip(src.iter()) {
+ *maxv = (*maxv).max(comp);
+ *minv = (*minv).min(comp);
+ }
+ }
+ let avg = avg.get_avg();
-impl VQElementSum<Pixel16> for Pixel16Sum {
- fn zero() -> Self { Pixel16Sum { rsum: 0, gsum: 0, bsum: 0, count: 0 } }
- fn add(&mut self, rval: Pixel16, count: u64) {
- let (r, g, b) = rval.unpack();
- self.rsum += u64::from(r) * count;
- self.gsum += u64::from(g) * count;
- self.bsum += u64::from(b) * count;
- self.count += count;
- }
- fn get_centroid(&self) -> Pixel16 {
- if self.count != 0 {
- let r = ((self.rsum + self.count / 2) / self.count) as u8;
- let g = ((self.gsum + self.count / 2) / self.count) as u8;
- let b = ((self.bsum + self.count / 2) / self.count) as u8;
- Pixel16::pack(r, g, b)
- } else {
- Pixel16(0x0000)
+ let mut best_axis = 3;
+ let mut best_dist = maxv[3] - minv[3];
+ for (comp_no, (&minval, &maxval)) in minv.iter().zip(maxv.iter()).enumerate().take(3) {
+ if maxval - minval > best_dist {
+ best_axis = comp_no;
+ best_dist = maxval - minval;
+ }
+ }
+ if best_dist == 0 {
+ let mut dist = 0;
+ for el in pix.iter() {
+ dist += dist_core(avg, el);
+ }
+ return ([avg; 2], 0, dist);
+ }
+
+ let mut avg1 = PixelAverage::new();
+ let mut avg2 = PixelAverage::new();
+ let mut mask = 0;
+ let mut mask_bit = 1;
+ for clr in pix.iter() {
+ if clr[best_axis] > avg[best_axis] {
+ avg2.add(clr);
+ mask |= mask_bit;
+ } else {
+ avg1.add(clr);
+ }
+ mask_bit <<= 1;
+ }
+
+ let clr0 = avg1.get_avg();
+ let clr1 = avg2.get_avg();
+ let mut dist = 0;
+ for clr in pix.iter() {
+ let dist0 = dist_core(clr0, clr);
+ let dist1 = dist_core(clr1, clr);
+ dist += dist0.min(dist1);
+ }
+ ([clr0, clr1], mask, dist)
}
}
}
+quant_template!(quant2_16pix, 16);
+quant_template!(quant2_4pix, 4);
+
#[derive(Default)]
struct BlockState {
fill_dist: u32,
- fill_val: Pixel16,
+ fill_val: UnpackedPixel,
clr2_dist: u32,
clr2_flags: u16,
- clr2: [Pixel16; 2],
+ clr2: [UnpackedPixel; 2],
clr8_dist: u32,
clr8_flags: u16,
- clr8: [[Pixel16; 2]; 4],
+ clr8: [[UnpackedPixel; 2]; 4],
+ pal_mode: bool,
}
impl BlockState {
- fn calc_stats(&mut self, buf: &[Pixel16; 16]) {
- let num_cw = quantise_median_cut::<Pixel16, Pixel16Sum>(buf, &mut self.clr2);
- if num_cw == 1 {
- self.fill_val = Pixel16 { 0: buf[0].0 & !0x400 };
- } else {
- let mut avg = Pixel16Sum::zero();
- for pix in buf.iter() {
- avg.add(*pix, 1);
+ fn set_fill_val(&mut self, val: UnpackedPixel) {
+ self.fill_val = val;
+ if !self.pal_mode {
+ self.fill_val[0] &= !1;
+ }
+ }
+ fn calc_clrs(buf: &[UnpackedPixel; 16]) -> (Option<UnpackedPixel>, Option<UnpackedPixel>) {
+ let clr0 = buf[0];
+ let mut clr1 = clr0;
+ let mut single = true;
+ for &pix in buf[1..].iter() {
+ if pix != clr0 {
+ if single {
+ clr1 = pix;
+ single = false;
+ } else if pix != clr1 {
+ return (None, None);
+ }
}
- self.fill_val = Pixel16 { 0: avg.get_centroid().0 & !0x400 };
}
+ if !single {
+ (Some(clr0), Some(clr1))
+ } else {
+ (Some(clr0), None)
+ }
+ }
+ fn calc_stats(&mut self, buf: &[UnpackedPixel; 16]) {
+ let mut filled = false;
+ let mut two_clr = false;
+ match Self::calc_clrs(buf) {
+ (Some(clr0), Some(clr1)) => {
+ self.clr2[0] = clr0;
+ self.clr2[1] = clr1;
+ two_clr = true;
+ },
+ (Some(clr0), None) => {
+ self.clr2[0] = clr0;
+ self.clr2[1] = clr0;
+ self.set_fill_val(buf[0]);
+ filled = true;
+ two_clr = true;
+ },
+ _ => {},
+ };
self.fill_dist = 0;
- for pix in buf.iter() {
- self.fill_dist += pix.dist(self.fill_val);
+ if !filled {
+ let mut avg = PixelAverage::new();
+ for pix in buf.iter() {
+ avg.add(pix);
+ }
+ self.set_fill_val(avg.get_avg());
+ for pix in buf.iter() {
+ self.fill_dist += dist_core(self.fill_val, pix);
+ }
}
if self.fill_dist == 0 {
self.clr2_dist = std::u32::MAX;
}
self.clr2_flags = 0u16;
- if num_cw == 2 {
+ if two_clr {
let mut mask = 1;
self.clr2_dist = 0;
- for pix in buf.iter() {
- let dist0 = pix.dist(self.clr2[0]);
- let dist1 = pix.dist(self.clr2[1]);
- if dist0 < dist1 {
+ for &pix in buf.iter() {
+ if pix == self.clr2[0] {
self.clr2_flags |= mask;
- self.clr2_dist += dist0;
} else {
- self.clr2_dist += dist1;
}
mask <<= 1;
}
self.clr2.swap(0, 1);
}
} else {
- self.clr2_dist = self.fill_dist;
- self.clr2 = [self.fill_val; 2];
+ let (clrs, mask, dist) = quant2_16pix(&buf);
+ self.clr2 = clrs;
+ self.clr2_flags = mask;
+ self.clr2_dist = dist;
+ if (self.clr2_flags & 0x8000) != 0 {
+ self.clr2_flags = !self.clr2_flags;
+ self.clr2.swap(0, 1);
+ }
}
if self.clr2_dist == 0 {
self.clr8_dist = std::u32::MAX;
return;
}
- self.clr8 = [[Pixel16 { 0: 0}; 2]; 4];
+ self.clr8 = [[UnpackedPixel::default(); 2]; 4];
self.clr8_flags = 0;
self.clr8_dist = 0;
- let mut mask = 1;
for i in 0..4 {
let off = (i & 1) * 2 + (i & 2) * 4;
let src2 = [buf[off], buf[off + 1], buf[off + 4], buf[off + 5]];
- let nc = quantise_median_cut::<Pixel16, Pixel16Sum>(&src2, &mut self.clr8[i]);
- if nc < 2 {
- self.clr8[i][1] = self.clr8[i][0];
- }
- for j in 0..4 {
- let dist0 = src2[j].dist(self.clr8[i][0]);
- let dist1 = src2[j].dist(self.clr8[i][1]);
- if dist0 < dist1 {
- self.clr8_flags |= mask;
- self.clr8_dist += dist0;
- } else {
- self.clr8_dist += dist1;
- }
- mask <<= 1;
- }
+ let (clrs, mask, dist) = quant2_4pix(&src2);
+ self.clr8[i] = clrs;
+ self.clr8_flags |= mask << (i * 4);
+ self.clr8_dist += dist;
}
if (self.clr8_flags & 0x8000) != 0 {
self.clr8_flags ^= 0xF000;
self.clr8[3].swap(0, 1);
}
}
- fn put_fill(&self, dst: &mut [u16], dstride: usize) {
+}
+
+struct BlockPainter15 {}
+impl BlockPainter15 {
+ fn new() -> Self { Self{} }
+ fn put_fill(&self, bstate: &BlockState, dst: &mut [u16], dstride: usize) -> u16 {
+ let fill_val = pack_rgb555(bstate.fill_val);
for line in dst.chunks_mut(dstride) {
for i in 0..4 {
- line[i] = self.fill_val.0;
+ line[i] = fill_val;
}
}
+ fill_val
}
- fn put_clr2(&self, dst: &mut [u16], dstride: usize) {
+ fn put_clr2(&self, bstate: &BlockState, dst: &mut [u16], dstride: usize) -> [u16; 2] {
+ let clr2 = [pack_rgb555(bstate.clr2[0]), pack_rgb555(bstate.clr2[1])];
for j in 0..4 {
for i in 0..4 {
- if (self.clr2_flags & (1 << (i + j * 4))) == 0 {
- dst[i + j * dstride] = self.clr2[0].0;
+ if (bstate.clr2_flags & (1 << (i + j * 4))) == 0 {
+ dst[i + j * dstride] = clr2[0];
} else {
- dst[i + j * dstride] = self.clr2[1].0;
+ dst[i + j * dstride] = clr2[1];
}
}
}
+ clr2
}
- fn put_clr8(&self, dst: &mut [u16], dstride: usize) {
+ fn put_clr8(&self, bstate: &BlockState, dst: &mut [u16], dstride: usize) -> [[u16; 4]; 4] {
+ let mut clr8 = [[0; 4]; 4];
+ for (dst, src) in clr8.iter_mut().zip(bstate.clr8.iter()) {
+ for (dst, &src) in dst.iter_mut().zip(src.iter()) {
+ *dst = pack_rgb555(src);
+ }
+ }
for i in 0..4 {
let off = (i & 1) * 2 + (i & 2) * dstride;
- let cur_flg = (self.clr8_flags >> (i * 4)) & 0xF;
- dst[off] = self.clr8[i][( !cur_flg & 1) as usize].0;
- dst[off + 1] = self.clr8[i][((!cur_flg >> 1) & 1) as usize].0;
- dst[off + dstride] = self.clr8[i][((!cur_flg >> 2) & 1) as usize].0;
- dst[off + 1 + dstride] = self.clr8[i][((!cur_flg >> 3) & 1) as usize].0;
+ let cur_flg = (bstate.clr8_flags >> (i * 4)) & 0xF;
+ dst[off] = clr8[i][( !cur_flg & 1) as usize];
+ dst[off + 1] = clr8[i][((!cur_flg >> 1) & 1) as usize];
+ dst[off + dstride] = clr8[i][((!cur_flg >> 2) & 1) as usize];
+ dst[off + 1 + dstride] = clr8[i][((!cur_flg >> 3) & 1) as usize];
}
+ clr8
}
- fn write_fill(&self, bw: &mut ByteWriter) -> EncoderResult<()> {
- bw.write_u16le(self.fill_val.0 | 0x8000)?;
+}
+
+struct BlockWriter15 {}
+impl BlockWriter15 {
+ fn write_fill(bw: &mut ByteWriter, fill_val: u16) -> EncoderResult<()> {
+ bw.write_u16le(fill_val | 0x8000)?;
Ok(())
}
- fn write_clr2(&self, bw: &mut ByteWriter) -> EncoderResult<()> {
- bw.write_u16le(self.clr2_flags)?;
- bw.write_u16le(self.clr2[0].0)?;
- bw.write_u16le(self.clr2[1].0)?;
+ fn write_clr2(bw: &mut ByteWriter, clr2_flags: u16, clr2: [u16; 2]) -> EncoderResult<()> {
+ bw.write_u16le(clr2_flags)?;
+ bw.write_u16le(clr2[0])?;
+ bw.write_u16le(clr2[1])?;
Ok(())
}
- fn write_clr8(&self, bw: &mut ByteWriter) -> EncoderResult<()> {
- bw.write_u16le(self.clr8_flags)?;
- bw.write_u16le(self.clr8[0][0].0 | 0x8000)?;
- bw.write_u16le(self.clr8[0][1].0)?;
- bw.write_u16le(self.clr8[1][0].0)?;
- bw.write_u16le(self.clr8[1][1].0)?;
- bw.write_u16le(self.clr8[2][0].0)?;
- bw.write_u16le(self.clr8[2][1].0)?;
- bw.write_u16le(self.clr8[3][0].0)?;
- bw.write_u16le(self.clr8[3][1].0)?;
+ fn write_clr8(bw: &mut ByteWriter, clr8_flags: u16, clr8: &[[u16; 4]; 4]) -> EncoderResult<()> {
+ bw.write_u16le(clr8_flags)?;
+ bw.write_u16le(clr8[0][0] | 0x8000)?;
+ bw.write_u16le(clr8[0][1])?;
+ bw.write_u16le(clr8[1][0])?;
+ bw.write_u16le(clr8[1][1])?;
+ bw.write_u16le(clr8[2][0])?;
+ bw.write_u16le(clr8[2][1])?;
+ bw.write_u16le(clr8[3][0])?;
+ bw.write_u16le(clr8[3][1])?;
Ok(())
}
}
key_int: 25,
}
}
- fn get_block(src: &[u16], sstride: usize, buf: &mut [Pixel16; 16]) {
+ fn get_block(src: &[u16], sstride: usize, buf: &mut [UnpackedPixel; 16]) {
for (line, dst) in src.chunks(sstride).zip(buf.chunks_mut(4)) {
- for i in 0..4 {
- dst[i] = Pixel16 { 0: line[i] };
+ for (dst, src) in dst.iter_mut().zip(line.iter()) {
+ *dst = src.unpack();
}
}
}
bw.write_u16le((skips as u16) | 0x8400)?;
Ok(())
}
- fn encode_inter(bw: &mut ByteWriter, cur_frm: &mut NAVideoBuffer<u16>, in_frm: &NAVideoBuffer<u16>, prev_frm: &NAVideoBuffer<u16>, _quality: u8) -> EncoderResult<bool> {
+ fn encode_inter(bw: &mut ByteWriter, cur_frm: &mut NAVideoBuffer<u16>, in_frm: &NAVideoBuffer<u16>, prev_frm: &NAVideoBuffer<u16>, quality: u8) -> EncoderResult<bool> {
+ let (skip_threshold, fill_threshold) = map_quality(quality);
let mut is_intra = true;
let src = in_frm.get_data();
let sstride = in_frm.get_stride(0);
let doff = cur_frm.get_offset(0);
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 x in (0..w).step_by(4) {
- let mut buf = [Pixel16::min_cw(); 16];
- let mut refbuf = [Pixel16::min_cw(); 16];
+ let mut buf = [UnpackedPixel::default(); 16];
+ let mut refbuf = [UnpackedPixel::default(); 16];
Self::get_block(&sstrip[x..], sstride, &mut buf);
Self::get_block(&rstrip[x..], rstride, &mut refbuf);
let mut skip_dist = 0;
for (pix, rpix) in buf.iter().zip(refbuf.iter()) {
- skip_dist += pix.dist(*rpix);
+ skip_dist += dist_core(*rpix, pix);
}
- if skip_dist == 0 {
+ if skip_dist <= skip_threshold {
skip_run += 1;
is_intra = false;
+ if skip_threshold > 0 {
+ for (dst, src) in dstrip[x..].chunks_mut(dstride).zip(rstrip[x..].chunks(rstride)).take(4) {
+ dst[..4].copy_from_slice(&src[..4]);
+ }
+ }
if skip_run == 1023 {
Self::write_skips(bw, skip_run)?;
skip_run = 0;
if skip_dist <= bstate.fill_dist {
skip_run += 1;
is_intra = false;
+ for (dst, src) in dst.chunks_mut(dstride).zip(rstrip[x..].chunks(rstride)).take(4) {
+ dst[..4].copy_from_slice(&src[..4]);
+ }
if skip_run == 1023 {
Self::write_skips(bw, skip_run)?;
skip_run = 0;
}
- } else if bstate.fill_dist <= bstate.clr2_dist {
- bstate.put_fill(dst, dstride);
+ } else if bstate.fill_dist <= fill_threshold ||
+ bstate.fill_dist <= bstate.clr2_dist {
+ let fill_val = bpainter.put_fill(&bstate, dst, dstride);
if skip_run != 0 {
Self::write_skips(bw, skip_run)?;
skip_run = 0;
}
- bstate.write_fill(bw)?;
+ BlockWriter15::write_fill(bw, fill_val)?;
} else if bstate.clr8_dist < bstate.clr2_dist {
- bstate.put_clr8(dst, dstride);
+ let clr8 = bpainter.put_clr8(&bstate, dst, dstride);
if skip_run != 0 {
Self::write_skips(bw, skip_run)?;
skip_run = 0;
}
- bstate.write_clr8(bw)?;
+ BlockWriter15::write_clr8(bw, bstate.clr8_flags, &clr8)?;
} else {
- bstate.put_clr2(dst, dstride);
+ let clr2 = bpainter.put_clr2(&bstate, dst, dstride);
if skip_run != 0 {
Self::write_skips(bw, skip_run)?;
skip_run = 0;
}
- bstate.write_clr2(bw)?;
+ BlockWriter15::write_clr2(bw, bstate.clr2_flags, clr2)?;
}
}
}
} //xxx: something for inter?
Ok(is_intra)
}
- fn encode_intra(bw: &mut ByteWriter, cur_frm: &mut NAVideoBuffer<u16>, in_frm: &NAVideoBuffer<u16>, _quality: u8) -> EncoderResult<bool> {
+ fn encode_intra(bw: &mut ByteWriter, cur_frm: &mut NAVideoBuffer<u16>, in_frm: &NAVideoBuffer<u16>, quality: u8) -> EncoderResult<bool> {
+ let (_, fill_threshold) = map_quality(quality);
let src = in_frm.get_data();
let sstride = in_frm.get_stride(0);
let soff = in_frm.get_offset(0);
let dstride = cur_frm.get_stride(0);
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 x in (0..w).step_by(4) {
- let mut buf = [Pixel16::min_cw(); 16];
+ let mut buf = [UnpackedPixel::default(); 16];
Self::get_block(&sstrip[x..], sstride, &mut buf);
let mut bstate = BlockState::default();
bstate.calc_stats(&buf);
let dst = &mut dstrip[x..];
- if bstate.fill_dist <= bstate.clr2_dist {
- bstate.put_fill(dst, dstride);
- bstate.write_fill(bw)?;
+ if bstate.fill_dist <= fill_threshold ||
+ bstate.fill_dist <= bstate.clr2_dist {
+ let fill_val = bpainter.put_fill(&bstate, dst, dstride);
+ BlockWriter15::write_fill(bw, fill_val)?;
} else if bstate.clr8_dist < bstate.clr2_dist {
- bstate.put_clr8(dst, dstride);
- bstate.write_clr8(bw)?;
+ let clr8 = bpainter.put_clr8(&bstate, dst, dstride);
+ BlockWriter15::write_clr8(bw, bstate.clr8_flags, &clr8)?;
} else {
- bstate.put_clr2(dst, dstride);
- bstate.write_clr2(bw)?;
+ let clr2 = bpainter.put_clr2(&bstate, dst, dstride);
+ BlockWriter15::write_clr2(bw, bstate.clr2_flags, clr2)?;
}
}
}
fn negotiate_format(&self, encinfo: &EncodeParameters) -> EncoderResult<EncodeParameters> {
match encinfo.format {
NACodecTypeInfo::None => {
- let mut ofmt = EncodeParameters::default();
- ofmt.format = NACodecTypeInfo::Video(NAVideoInfo::new(0, 0, true, RGB555_FORMAT));
- Ok(ofmt)
+ Ok(EncodeParameters {
+ format: NACodecTypeInfo::Video(NAVideoInfo::new(0, 0, true, RGB555_FORMAT)),
+ ..Default::default() })
},
- NACodecTypeInfo::Audio(_) => return Err(EncoderError::FormatError),
+ NACodecTypeInfo::Audio(_) => Err(EncoderError::FormatError),
NACodecTypeInfo::Video(vinfo) => {
let outinfo = NAVideoInfo::new((vinfo.width + 3) & !3, (vinfo.height + 3) & !3, true, RGB555_FORMAT);
let mut ofmt = *encinfo;
}
let out_info = NAVideoInfo::new(vinfo.width, vinfo.height, true, RGB555_FORMAT);
- let info = NACodecInfo::new("msvideo1", NACodecTypeInfo::Video(out_info.clone()), None);
- let mut stream = NAStream::new(StreamType::Video, stream_id, info, encinfo.tb_num, encinfo.tb_den);
+ let info = NACodecInfo::new("msvideo1", NACodecTypeInfo::Video(out_info), None);
+ let mut stream = NAStream::new(StreamType::Video, stream_id, info, encinfo.tb_num, encinfo.tb_den, 0);
stream.set_num(stream_id as usize);
let stream = stream.into_ref();
- if let Err(_) = self.pool.prealloc_video(out_info, 2) {
+ if self.pool.prealloc_video(out_info, 2).is_err() {
return Err(EncoderError::AllocError);
}
self.stream = Some(stream.clone());
self.quality = encinfo.quality;
-
+
Ok(stream)
},
}
let mut dmx_reg = RegisteredDemuxers::new();
generic_register_all_demuxers(&mut dmx_reg);
let mut dec_reg = RegisteredDecoders::new();
- generic_register_all_codecs(&mut dec_reg);
- ms_register_all_codecs(&mut dec_reg);
+ generic_register_all_decoders(&mut dec_reg);
+ ms_register_all_decoders(&mut dec_reg);
let mut mux_reg = RegisteredMuxers::new();
generic_register_all_muxers(&mut mux_reg);
let mut enc_reg = RegisteredEncoders::new();
ms_register_all_encoders(&mut enc_reg);
+ // sample: https://samples.mplayerhq.hu/V-codecs/UCOD/TalkingHead_352x288.avi
let dec_config = DecoderTestParams {
demuxer: "avi",
in_name: "assets/Misc/TalkingHead_352x288.avi",
stream_type: StreamType::Video,
- limit: Some(32),
+ limit: Some(3),
dmx_reg, dec_reg,
};
let enc_config = EncoderTestParams {
height: 0,
format: RGB555_FORMAT,
flipped: true,
+ bits: 16,
};
let enc_params = EncodeParameters {
format: NACodecTypeInfo::Video(dst_vinfo),
- quality: 0,
+ quality: 80,
bitrate: 0,
tb_num: 0,
tb_den: 0,
flags: 0,
};
- test_encoding_to_file(&dec_config, &enc_config, enc_params);
+ //test_encoding_to_file(&dec_config, &enc_config, enc_params, &[]);
+ test_encoding_md5(&dec_config, &enc_config, enc_params, &[],
+ &[0x35d95583, 0xb7431be7, 0xad490677, 0x968a1d84]);
}
}
projects / nihav.git / blobdiff