add diff rle and run decoding on final byte array
This commit is contained in:
parent
eca5344c66
commit
3af9be328c
6 changed files with 308 additions and 48 deletions
|
|
@ -1,7 +1,36 @@
|
|||
use crate::*;
|
||||
|
||||
pub fn rle_horizontal(_prev_frame: &Frame, encoded: &[u8]) -> Frame {
|
||||
let pixels = rle_255_decode(encoded);
|
||||
pub fn rle_diff_horizontal(prev_frame: &Frame, encoded: &[u8], reader: &mut usize) -> Frame {
|
||||
let (runs, decoded) = rle_255_decode_until(encoded, FRAME_SIZE);
|
||||
*reader += runs;
|
||||
let mut frame = prev_frame.clone();
|
||||
let mut i = 0;
|
||||
for y in 0..HEIGHT {
|
||||
for x in 0..WIDTH {
|
||||
frame[x][y] ^= decoded[i];
|
||||
i += 1;
|
||||
}
|
||||
}
|
||||
frame
|
||||
}
|
||||
|
||||
pub fn rle_diff_vertical(prev_frame: &Frame, encoded: &[u8], reader: &mut usize) -> Frame {
|
||||
let (runs, decoded) = rle_255_decode_until(encoded, FRAME_SIZE);
|
||||
*reader += runs;
|
||||
let mut frame = prev_frame.clone();
|
||||
let mut i = 0;
|
||||
for x in 0..WIDTH {
|
||||
for y in 0..HEIGHT {
|
||||
frame[x][y] ^= decoded[i];
|
||||
i += 1;
|
||||
}
|
||||
}
|
||||
frame
|
||||
}
|
||||
|
||||
pub fn rle_horizontal(_prev_frame: &Frame, encoded: &[u8], reader: &mut usize) -> Frame {
|
||||
let (runs, pixels) = rle_255_decode_until(encoded, FRAME_SIZE);
|
||||
*reader += runs;
|
||||
let mut frame = FRAME_0;
|
||||
let mut i = 0;
|
||||
for y in 0..HEIGHT {
|
||||
|
|
@ -13,8 +42,9 @@ pub fn rle_horizontal(_prev_frame: &Frame, encoded: &[u8]) -> Frame {
|
|||
frame
|
||||
}
|
||||
|
||||
pub fn rle_vertical(_prev_frame: &Frame, encoded: &[u8]) -> Frame {
|
||||
let pixels = rle_255_decode(encoded);
|
||||
pub fn rle_vertical(_prev_frame: &Frame, encoded: &[u8], reader: &mut usize) -> Frame {
|
||||
let (runs, pixels) = rle_255_decode_until(encoded, FRAME_SIZE);
|
||||
*reader += runs;
|
||||
let mut frame = FRAME_0;
|
||||
let mut i = 0;
|
||||
for x in 0..WIDTH {
|
||||
|
|
@ -26,10 +56,10 @@ pub fn rle_vertical(_prev_frame: &Frame, encoded: &[u8]) -> Frame {
|
|||
frame
|
||||
}
|
||||
|
||||
pub fn fill_white(_prev_frame: &Frame, _encoded: &[u8]) -> Frame {
|
||||
pub fn fill_white(_prev_frame: &Frame, _encoded: &[u8], _reader: &mut usize) -> Frame {
|
||||
FRAME_1
|
||||
}
|
||||
|
||||
pub fn fill_black(_prev_frame: &Frame, _encoded: &[u8]) -> Frame {
|
||||
pub fn fill_black(_prev_frame: &Frame, _encoded: &[u8], _reader: &mut usize) -> Frame {
|
||||
FRAME_0
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,31 @@
|
|||
use crate::*;
|
||||
|
||||
pub fn rle_diff_horizontal(prev_frame: &Frame, frame: &Frame) -> EncodedFrame {
|
||||
let mut pixels = Vec::new();
|
||||
for y in 0..HEIGHT {
|
||||
for x in 0..WIDTH {
|
||||
pixels.push(frame[x][y] ^ prev_frame[x][y]);
|
||||
}
|
||||
}
|
||||
EncodedFrame {
|
||||
encoding: Encoding::RLEDiffHorizontal,
|
||||
data: rle_255_encode(&pixels),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn rle_diff_vertical(prev_frame: &Frame, frame: &Frame) -> EncodedFrame {
|
||||
let mut pixels = Vec::new();
|
||||
for x in 0..WIDTH {
|
||||
for y in 0..HEIGHT {
|
||||
pixels.push(frame[x][y] ^ prev_frame[x][y]);
|
||||
}
|
||||
}
|
||||
EncodedFrame {
|
||||
encoding: Encoding::RLEDiffVertical,
|
||||
data: rle_255_encode(&pixels),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn rle_horizontal(_prev_frame: &Frame, frame: &Frame) -> EncodedFrame {
|
||||
let mut pixels = Vec::new();
|
||||
for y in 0..HEIGHT {
|
||||
|
|
@ -9,7 +35,6 @@ pub fn rle_horizontal(_prev_frame: &Frame, frame: &Frame) -> EncodedFrame {
|
|||
}
|
||||
EncodedFrame {
|
||||
encoding: Encoding::RLEHorizontal,
|
||||
head_u4: 0,
|
||||
data: rle_255_encode(&pixels),
|
||||
}
|
||||
}
|
||||
|
|
@ -23,7 +48,6 @@ pub fn rle_vertical(_prev_frame: &Frame, frame: &Frame) -> EncodedFrame {
|
|||
}
|
||||
EncodedFrame {
|
||||
encoding: Encoding::RLEVertical,
|
||||
head_u4: 0,
|
||||
data: rle_255_encode(&pixels),
|
||||
}
|
||||
}
|
||||
|
|
@ -31,7 +55,6 @@ pub fn rle_vertical(_prev_frame: &Frame, frame: &Frame) -> EncodedFrame {
|
|||
pub fn fill_white(_prev_frame: &Frame, _frame: &Frame) -> EncodedFrame {
|
||||
EncodedFrame {
|
||||
encoding: Encoding::FillWhite,
|
||||
head_u4: 0,
|
||||
data: Vec::new(),
|
||||
}
|
||||
}
|
||||
|
|
@ -39,7 +62,6 @@ pub fn fill_white(_prev_frame: &Frame, _frame: &Frame) -> EncodedFrame {
|
|||
pub fn fill_black(_prev_frame: &Frame, _frame: &Frame) -> EncodedFrame {
|
||||
EncodedFrame {
|
||||
encoding: Encoding::FillBlack,
|
||||
head_u4: 0,
|
||||
data: Vec::new(),
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,33 +1,67 @@
|
|||
use enum_map::{Enum, EnumMap};
|
||||
use num_enum::TryFromPrimitive;
|
||||
|
||||
mod dec;
|
||||
mod enc;
|
||||
mod util;
|
||||
pub use util::*;
|
||||
|
||||
const INTERACTIVE: bool = false;
|
||||
const INSPECT_ENC: bool = false;
|
||||
const INSPECT_DEC: bool = true;
|
||||
|
||||
fn main() {
|
||||
let frames = get_all_frames("../video/frames/");
|
||||
let encoded = encode(&frames);
|
||||
println!("{} frames, total {} bytes", frames.len(), encoded.len());
|
||||
//
|
||||
|
||||
// todo print average bytes per frame for each encoding type
|
||||
let mut stats: EnumMap<Encoding, u32> = EnumMap::default();
|
||||
let mut reader = 0;
|
||||
let mut last_frame = FRAME_0;
|
||||
let mut frame_index = 0;
|
||||
while reader < encoded.len() {
|
||||
let frame_type: Encoding = encoded[reader].try_into().unwrap();
|
||||
stats[frame_type] += 1;
|
||||
reader += 1;
|
||||
let decoder = get_matching_decoder(frame_type);
|
||||
last_frame = decoder(&last_frame, &encoded[reader..], &mut reader);
|
||||
if INSPECT_DEC {
|
||||
println!("\n{frame_type:?}");
|
||||
render_images(&frames[frame_index], &last_frame);
|
||||
wait_for_input();
|
||||
frame_index += 1;
|
||||
}
|
||||
}
|
||||
for (encoding, frames) in stats.iter() {
|
||||
println!("{encoding:?} - {frames} frames");
|
||||
}
|
||||
println!();
|
||||
println!(
|
||||
"{} frames, total {} bytes (~{} bpf)",
|
||||
frames.len(),
|
||||
encoded.len(),
|
||||
encoded.len() / frames.len()
|
||||
);
|
||||
}
|
||||
|
||||
fn encode(frames: &[Frame]) -> Vec<u8> {
|
||||
let mut out = Vec::new();
|
||||
let encodings: Vec<(FrameEncoder, FrameDecoder)> = vec![
|
||||
(enc::fill_white, dec::fill_white),
|
||||
(enc::fill_black, dec::fill_black),
|
||||
(enc::rle_horizontal, dec::rle_horizontal),
|
||||
(enc::rle_vertical, dec::rle_vertical),
|
||||
let encodings: Vec<FrameEncoder> = vec![
|
||||
enc::fill_white,
|
||||
enc::fill_black,
|
||||
enc::rle_horizontal,
|
||||
enc::rle_vertical,
|
||||
enc::rle_diff_horizontal,
|
||||
enc::rle_diff_vertical,
|
||||
];
|
||||
let max_error = 0;
|
||||
|
||||
let mut last_frame = FRAME_0;
|
||||
for frame in frames {
|
||||
let mut options = Vec::new();
|
||||
for (encode, decode) in &encodings {
|
||||
for encode in &encodings {
|
||||
let encoded = encode(&last_frame, frame);
|
||||
let decoded = decode(&last_frame, &encoded.data);
|
||||
let decode = get_matching_decoder(encoded.encoding);
|
||||
let decoded = decode(&last_frame, &encoded.data, &mut 0);
|
||||
let error = frame_error(frame, &decoded);
|
||||
if error <= max_error {
|
||||
options.push(encoded);
|
||||
|
|
@ -35,7 +69,7 @@ fn encode(frames: &[Frame]) -> Vec<u8> {
|
|||
}
|
||||
options.sort_by_key(|b| b.data.len());
|
||||
let best_encoding = options.into_iter().next().unwrap();
|
||||
if INTERACTIVE {
|
||||
if INSPECT_ENC {
|
||||
println!();
|
||||
println!(
|
||||
"{:?}, {} bytes",
|
||||
|
|
@ -43,8 +77,7 @@ fn encode(frames: &[Frame]) -> Vec<u8> {
|
|||
best_encoding.data.len() + 1
|
||||
);
|
||||
render_image(frame);
|
||||
let mut a = String::new();
|
||||
std::io::stdin().read_line(&mut a).unwrap();
|
||||
wait_for_input();
|
||||
}
|
||||
let best_encoding = best_encoding.into_bytes();
|
||||
out.extend_from_slice(&best_encoding);
|
||||
|
|
@ -53,38 +86,59 @@ fn encode(frames: &[Frame]) -> Vec<u8> {
|
|||
out
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
#[derive(Debug, TryFromPrimitive, Enum, Copy, Clone)]
|
||||
#[repr(u8)]
|
||||
enum Encoding {
|
||||
FillWhite,
|
||||
FillBlack,
|
||||
RLEHorizontal,
|
||||
RLEVertical,
|
||||
BGStrips,
|
||||
CellDiff8Horizontal,
|
||||
CellDiff8Vertical,
|
||||
RLEDiffHorizontal,
|
||||
RLEDiffVertical,
|
||||
BGStripsH,
|
||||
BGStripsV,
|
||||
QuadTree,
|
||||
DrawCommands,
|
||||
CellDiff8H,
|
||||
CellDiff8V,
|
||||
CellDiff4HH,
|
||||
CellDiff4HV,
|
||||
CellDiff4VH,
|
||||
CellDiff4VV,
|
||||
}
|
||||
|
||||
fn get_matching_decoder(encoding: Encoding) -> FrameDecoder {
|
||||
match encoding {
|
||||
Encoding::FillWhite => dec::fill_white,
|
||||
Encoding::FillBlack => dec::fill_black,
|
||||
Encoding::RLEHorizontal => dec::rle_horizontal,
|
||||
Encoding::RLEVertical => dec::rle_vertical,
|
||||
Encoding::RLEDiffHorizontal => dec::rle_diff_horizontal,
|
||||
Encoding::RLEDiffVertical => dec::rle_diff_vertical,
|
||||
Encoding::BGStripsH => todo!(),
|
||||
Encoding::BGStripsV => todo!(),
|
||||
Encoding::QuadTree => todo!(),
|
||||
Encoding::DrawCommands => todo!(),
|
||||
Encoding::CellDiff8H => todo!(),
|
||||
Encoding::CellDiff8V => todo!(),
|
||||
Encoding::CellDiff4HH => todo!(),
|
||||
Encoding::CellDiff4HV => todo!(),
|
||||
Encoding::CellDiff4VH => todo!(),
|
||||
Encoding::CellDiff4VV => todo!(),
|
||||
}
|
||||
}
|
||||
|
||||
type FrameEncoder = fn(previous_frame: &Frame, new_frame: &Frame) -> EncodedFrame;
|
||||
type FrameDecoder = fn(previous_frame: &Frame, encoded_bytes: &[u8]) -> Frame;
|
||||
type FrameDecoder = fn(previous_frame: &Frame, encoded_bytes: &[u8], reader: &mut usize) -> Frame;
|
||||
|
||||
struct EncodedFrame {
|
||||
encoding: Encoding,
|
||||
head_u4: u8,
|
||||
data: Vec<u8>,
|
||||
}
|
||||
|
||||
impl EncodedFrame {
|
||||
fn into_bytes(self) -> Vec<u8> {
|
||||
let head = (self.encoding as u8) << 4;
|
||||
let head = head | (self.head_u4 & 15);
|
||||
|
||||
let mut out = Vec::with_capacity(self.data.len() + 1);
|
||||
out.push(head);
|
||||
out.extend(self.data.into_iter());
|
||||
out
|
||||
fn into_bytes(mut self) -> Vec<u8> {
|
||||
self.data.insert(0, self.encoding as u8);
|
||||
self.data
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,12 +7,16 @@ use image::{self, DynamicImage, GenericImageView, ImageFormat, Rgba};
|
|||
|
||||
pub const WIDTH: usize = 40;
|
||||
pub const HEIGHT: usize = 32;
|
||||
pub const SIZE: usize = WIDTH * HEIGHT;
|
||||
pub const FRAME_SIZE: usize = WIDTH * HEIGHT;
|
||||
|
||||
pub type Frame = [[u8; HEIGHT]; WIDTH];
|
||||
pub const FRAME_0: Frame = [[0; HEIGHT]; WIDTH];
|
||||
pub const FRAME_1: Frame = [[1; HEIGHT]; WIDTH];
|
||||
|
||||
pub fn wait_for_input() {
|
||||
std::io::stdin().read_line(&mut String::new()).unwrap();
|
||||
}
|
||||
|
||||
fn convert_pixel(rgba: Rgba<u8>) -> u8 {
|
||||
(rgba.0[0] > 128) as u8
|
||||
}
|
||||
|
|
@ -75,7 +79,9 @@ pub fn render_images(left: &Frame, right: &Frame) {
|
|||
for y in 0..(HEIGHT / 2) {
|
||||
for x in 0..WIDTH {
|
||||
render_pixel_pair(left, x, y);
|
||||
print!(" ");
|
||||
}
|
||||
print!(" ");
|
||||
for x in 0..WIDTH {
|
||||
render_pixel_pair(right, x, y);
|
||||
}
|
||||
println!();
|
||||
|
|
@ -102,14 +108,19 @@ pub fn rle_255_encode(raw: &[u8]) -> Vec<u8> {
|
|||
encoded
|
||||
}
|
||||
|
||||
pub fn rle_255_decode(encoded: &[u8]) -> Vec<u8> {
|
||||
pub fn rle_255_decode_until(encoded: &[u8], max_size: usize) -> (usize, Vec<u8>) {
|
||||
let mut raw = Vec::new();
|
||||
let mut val = 0;
|
||||
let mut consumed_bytes = 0;
|
||||
for &run in encoded {
|
||||
consumed_bytes += 1;
|
||||
for _ in 0..run {
|
||||
raw.push(val);
|
||||
}
|
||||
if raw.len() >= max_size {
|
||||
break;
|
||||
}
|
||||
val = 1 - val;
|
||||
}
|
||||
raw
|
||||
(consumed_bytes, raw)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue