Compare commits
4 Commits
0b2408bda1
...
trunk
| Author | SHA1 | Date | |
|---|---|---|---|
| 5b3c58fad5 | |||
| e2ba02f4d1 | |||
| 8ccf6bd475 | |||
| 04f83a55d2 |
14
README.md
Normal file
14
README.md
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
# QOI Codec Crate
|
||||||
|
|
||||||
|
The [Quite Okay Image format](https://qoiformat.org/) is an image compression scheme whose specification fits on one single page.
|
||||||
|
|
||||||
|
This crate is my (work in progress) implementation of that specification. At this time (v0.1) it can only decode some of the test images. Some don't work correctly and some don't work at all.
|
||||||
|
|
||||||
|
## Running the tests
|
||||||
|
|
||||||
|
1. Download the sample data set: https://qoiformat.org/qoi_test_images.zip
|
||||||
|
2. Unpack them into the project folder at `./qoi_test_images/`
|
||||||
|
|
||||||
|
The "integration test" in `tests/codec.rs` reads a QOI file and decodes it into a PNG. Since these images are not part of the repo, test will fail without this manual step.
|
||||||
|
|
||||||
|
Other tests, like those inside the regular source tree will run just fine. E.g.: The module `crate::decoder::test` will run properly with no additional setup actions. All data is contained as constants inside the source code.
|
||||||
@@ -70,6 +70,8 @@ pub struct Decoder<I: Iterator<Item = u8>> {
|
|||||||
|
|
||||||
bytes: I,
|
bytes: I,
|
||||||
run_len: u8,
|
run_len: u8,
|
||||||
|
// Counter to ensure we stop after getting to Self::width * Self::height pixels
|
||||||
|
output_count: usize,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<I> Decoder<I>
|
impl<I> Decoder<I>
|
||||||
@@ -87,6 +89,7 @@ where
|
|||||||
prev_pixel: PixelRGBA { r:0, g:0, b:0, a: 255},
|
prev_pixel: PixelRGBA { r:0, g:0, b:0, a: 255},
|
||||||
bytes,
|
bytes,
|
||||||
run_len: 0,
|
run_len: 0,
|
||||||
|
output_count: 0,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -98,6 +101,13 @@ where
|
|||||||
type Item = PixelRGBA;
|
type Item = PixelRGBA;
|
||||||
|
|
||||||
fn next(&mut self) -> Option<Self::Item> {
|
fn next(&mut self) -> Option<Self::Item> {
|
||||||
|
// count pixels. When we reach WIDTH x HEIGHT, check for footer and quit.
|
||||||
|
if self.output_count == (self.width * self.height) as usize {
|
||||||
|
return None;
|
||||||
|
} else {
|
||||||
|
self.output_count += 1;
|
||||||
|
}
|
||||||
|
|
||||||
if self.run_len > 0 {
|
if self.run_len > 0 {
|
||||||
self.run_len -= 1;
|
self.run_len -= 1;
|
||||||
Some(self.prev_pixel)
|
Some(self.prev_pixel)
|
||||||
@@ -191,10 +201,10 @@ mod test {
|
|||||||
// then extracting back-referenced data out of it. A complete test should
|
// then extracting back-referenced data out of it. A complete test should
|
||||||
// feed in other valid operations that populate the backbuffer, and then index
|
// feed in other valid operations that populate the backbuffer, and then index
|
||||||
// op codes to demonstrate the indexing operations.
|
// op codes to demonstrate the indexing operations.
|
||||||
fn new_with_backbuffer(bytes: I, back_buffer: [PixelRGBA; 64]) -> Self {
|
fn new_with_backbuffer(bytes: I, back_buffer: [PixelRGBA; 64], size: u32) -> Self {
|
||||||
Self {
|
Self {
|
||||||
width: 0,
|
width: size,
|
||||||
height: 0,
|
height: 1,
|
||||||
channels: 4,
|
channels: 4,
|
||||||
colorspace: 0,
|
colorspace: 0,
|
||||||
back_buffer,
|
back_buffer,
|
||||||
@@ -206,21 +216,23 @@ mod test {
|
|||||||
},
|
},
|
||||||
bytes,
|
bytes,
|
||||||
run_len: 0,
|
run_len: 0,
|
||||||
|
output_count: 0,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// A hack to unit test the run behavior. Same idea as the new_with_backbuffer()
|
// A hack to unit test the run behavior. Same idea as the new_with_backbuffer()
|
||||||
// function, but for testing a run of pixels.
|
// function, but for testing a run of pixels.
|
||||||
fn new_with_previous_pixel(bytes: I, prev_pixel: PixelRGBA) -> Self {
|
fn new_with_previous_pixel(bytes: I, prev_pixel: PixelRGBA, size: u32) -> Self {
|
||||||
Self {
|
Self {
|
||||||
width: 0,
|
width: size,
|
||||||
height: 0,
|
height: 1,
|
||||||
channels: 4,
|
channels: 4,
|
||||||
colorspace: 0,
|
colorspace: 0,
|
||||||
back_buffer: [PixelRGBA::zero(); 64],
|
back_buffer: [PixelRGBA::zero(); 64],
|
||||||
prev_pixel,
|
prev_pixel,
|
||||||
bytes,
|
bytes,
|
||||||
run_len: 0,
|
run_len: 0,
|
||||||
|
output_count: 0,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -228,16 +240,17 @@ mod test {
|
|||||||
// to extract it from the input iterator. For the decoder tests, this
|
// to extract it from the input iterator. For the decoder tests, this
|
||||||
// needs to be skipped. Thus, we get *another* magic constructor
|
// needs to be skipped. Thus, we get *another* magic constructor
|
||||||
// available only to the test module.
|
// available only to the test module.
|
||||||
fn new_with_no_metadata(bytes: I) -> Self {
|
fn new_with_no_metadata(bytes: I, size: u32) -> Self {
|
||||||
Self {
|
Self {
|
||||||
width: 0,
|
width: size,
|
||||||
height: 0,
|
height: 1,
|
||||||
channels: 4,
|
channels: 4,
|
||||||
colorspace: 0,
|
colorspace: 0,
|
||||||
back_buffer: [PixelRGBA::zero(); 64],
|
back_buffer: [PixelRGBA::zero(); 64],
|
||||||
prev_pixel: PixelRGBA { r: 0, g: 0, b: 0, a: 255 },
|
prev_pixel: PixelRGBA { r: 0, g: 0, b: 0, a: 255 },
|
||||||
bytes,
|
bytes,
|
||||||
run_len: 0,
|
run_len: 0,
|
||||||
|
output_count: 0,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -292,7 +305,7 @@ mod test {
|
|||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
let decoder = Decoder::new_with_no_metadata(compressed.into_iter());
|
let decoder = Decoder::new_with_no_metadata(compressed.into_iter(), expected.len() as u32);
|
||||||
let result = decoder.collect::<Vec<PixelRGBA>>();
|
let result = decoder.collect::<Vec<PixelRGBA>>();
|
||||||
assert_eq!(result, expected);
|
assert_eq!(result, expected);
|
||||||
}
|
}
|
||||||
@@ -338,7 +351,7 @@ mod test {
|
|||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
let decoder = Decoder::new_with_no_metadata(compressed.into_iter());
|
let decoder = Decoder::new_with_no_metadata(compressed.into_iter(), expected.len() as u32);
|
||||||
let result: Vec<PixelRGBA> = decoder.collect();
|
let result: Vec<PixelRGBA> = decoder.collect();
|
||||||
assert_eq!(result, expected);
|
assert_eq!(result, expected);
|
||||||
}
|
}
|
||||||
@@ -373,7 +386,7 @@ mod test {
|
|||||||
PixelRGBA::zero(),
|
PixelRGBA::zero(),
|
||||||
];
|
];
|
||||||
|
|
||||||
let decoder = Decoder::new_with_backbuffer(compressed.into_iter(), backbuffer);
|
let decoder = Decoder::new_with_backbuffer(compressed.into_iter(), backbuffer, expected.len() as u32);
|
||||||
let result: Vec<PixelRGBA> = decoder.collect();
|
let result: Vec<PixelRGBA> = decoder.collect();
|
||||||
assert_eq!(result, expected);
|
assert_eq!(result, expected);
|
||||||
}
|
}
|
||||||
@@ -404,7 +417,7 @@ mod test {
|
|||||||
PixelRGBA::new(0, 0, 0, 255),
|
PixelRGBA::new(0, 0, 0, 255),
|
||||||
];
|
];
|
||||||
|
|
||||||
let decoder = Decoder::new_with_no_metadata(compressed.into_iter());
|
let decoder = Decoder::new_with_no_metadata(compressed.into_iter(), expected.len() as u32);
|
||||||
let result: Vec<PixelRGBA> = decoder.collect();
|
let result: Vec<PixelRGBA> = decoder.collect();
|
||||||
assert_eq!(result, expected);
|
assert_eq!(result, expected);
|
||||||
}
|
}
|
||||||
@@ -423,7 +436,7 @@ mod test {
|
|||||||
PixelRGBA::new(1, 1, 1, 255), // holds at 1s
|
PixelRGBA::new(1, 1, 1, 255), // holds at 1s
|
||||||
];
|
];
|
||||||
|
|
||||||
let decoder = Decoder::new_with_previous_pixel(compressed.into_iter(), init_pixel);
|
let decoder = Decoder::new_with_previous_pixel(compressed.into_iter(), init_pixel, expected.len() as u32);
|
||||||
let result: Vec<PixelRGBA> = decoder.collect();
|
let result: Vec<PixelRGBA> = decoder.collect();
|
||||||
assert_eq!(result, expected);
|
assert_eq!(result, expected);
|
||||||
}
|
}
|
||||||
@@ -442,7 +455,7 @@ mod test {
|
|||||||
PixelRGBA::new(254, 254, 254, 255),
|
PixelRGBA::new(254, 254, 254, 255),
|
||||||
];
|
];
|
||||||
|
|
||||||
let decoder = Decoder::new_with_previous_pixel(compressed.into_iter(), init_pixel);
|
let decoder = Decoder::new_with_previous_pixel(compressed.into_iter(), init_pixel, expected.len() as u32);
|
||||||
let result: Vec<PixelRGBA> = decoder.collect();
|
let result: Vec<PixelRGBA> = decoder.collect();
|
||||||
assert_eq!(result, expected);
|
assert_eq!(result, expected);
|
||||||
}
|
}
|
||||||
@@ -470,7 +483,7 @@ mod test {
|
|||||||
PixelRGBA::new(37, 19, 28, 255),
|
PixelRGBA::new(37, 19, 28, 255),
|
||||||
];
|
];
|
||||||
|
|
||||||
let decoder = Decoder::new_with_no_metadata(compressed.into_iter());
|
let decoder = Decoder::new_with_no_metadata(compressed.into_iter(), expected.len() as u32);
|
||||||
let result: Vec<PixelRGBA> = decoder.collect();
|
let result: Vec<PixelRGBA> = decoder.collect();
|
||||||
assert_eq!(result, expected);
|
assert_eq!(result, expected);
|
||||||
}
|
}
|
||||||
@@ -484,7 +497,7 @@ mod test {
|
|||||||
];
|
];
|
||||||
let expected = PixelRGBA::new(37, 30, 37, 255);
|
let expected = PixelRGBA::new(37, 30, 37, 255);
|
||||||
|
|
||||||
let mut decoder = Decoder::new_with_previous_pixel(compressed.into_iter(), init_pixel);
|
let mut decoder = Decoder::new_with_previous_pixel(compressed.into_iter(), init_pixel, 1);
|
||||||
let result = decoder
|
let result = decoder
|
||||||
.next()
|
.next()
|
||||||
.expect("Oops, didn't get a Pixel back from the Decoder");
|
.expect("Oops, didn't get a Pixel back from the Decoder");
|
||||||
@@ -500,7 +513,7 @@ mod test {
|
|||||||
];
|
];
|
||||||
let expected = PixelRGBA::new(247, 243, 238, 255);
|
let expected = PixelRGBA::new(247, 243, 238, 255);
|
||||||
|
|
||||||
let mut decoder = Decoder::new_with_previous_pixel(compressed.into_iter(), init_pixel);
|
let mut decoder = Decoder::new_with_previous_pixel(compressed.into_iter(), init_pixel, 1);
|
||||||
let result = decoder
|
let result = decoder
|
||||||
.next()
|
.next()
|
||||||
.expect("Oops, didn't get a Pixel back from the Decoder");
|
.expect("Oops, didn't get a Pixel back from the Decoder");
|
||||||
@@ -521,7 +534,7 @@ mod test {
|
|||||||
// lets pretend an encoder did this for some reason. The decoder can still
|
// lets pretend an encoder did this for some reason. The decoder can still
|
||||||
// unpack this correctly, it's just a sub-optimal compression is all.
|
// unpack this correctly, it's just a sub-optimal compression is all.
|
||||||
|
|
||||||
let decoder = Decoder::new_with_previous_pixel(compressed.into_iter(), init_pixel);
|
let decoder = Decoder::new_with_previous_pixel(compressed.into_iter(), init_pixel, expected.len() as u32);
|
||||||
let result: Vec<PixelRGBA> = decoder.collect();
|
let result: Vec<PixelRGBA> = decoder.collect();
|
||||||
assert_eq!(result, expected);
|
assert_eq!(result, expected);
|
||||||
}
|
}
|
||||||
@@ -563,7 +576,7 @@ mod test {
|
|||||||
PixelRGBA::new(0xFF, 0xFF, 0xFF, 0xFF),
|
PixelRGBA::new(0xFF, 0xFF, 0xFF, 0xFF),
|
||||||
];
|
];
|
||||||
|
|
||||||
let mut decoder = Decoder::new_with_no_metadata(compressed.into_iter());
|
let mut decoder = Decoder::new_with_no_metadata(compressed.into_iter(), expected.len() as u32);
|
||||||
|
|
||||||
let mut result = Vec::<PixelRGBA>::new();
|
let mut result = Vec::<PixelRGBA>::new();
|
||||||
loop {
|
loop {
|
||||||
@@ -632,7 +645,7 @@ mod test {
|
|||||||
39, // run x3
|
39, // run x3
|
||||||
38, // final RGBA
|
38, // final RGBA
|
||||||
];
|
];
|
||||||
let mut decoder = Decoder::new_with_no_metadata(compressed.into_iter());
|
let mut decoder = Decoder::new_with_no_metadata(compressed.into_iter(), indices.len() as u32);
|
||||||
let mut iters = 0;
|
let mut iters = 0;
|
||||||
loop {
|
loop {
|
||||||
if let Some(pixel) = decoder.next() {
|
if let Some(pixel) = decoder.next() {
|
||||||
@@ -666,4 +679,38 @@ mod test {
|
|||||||
expected
|
expected
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Try decoding an image consisting of a single pixel.
|
||||||
|
#[test]
|
||||||
|
fn decode_1_pixel_image() {
|
||||||
|
let input: [u8; 26] = [
|
||||||
|
0x71, 0x6f, 0x69, 0x66, // 'qoif' magic bytes
|
||||||
|
0x00, 0x00, 0x00, 0x01, // u32 width
|
||||||
|
0x00, 0x00, 0x00, 0x01, // u32 height
|
||||||
|
0x03, // u8 channels (3 for RGB mode)
|
||||||
|
0x00, // u8 colorspace (0 for sRGB w/ linear alpha)
|
||||||
|
// One single blue pixel, QOI_OP_RGB
|
||||||
|
0xFE, 0x00, 0x00, 0xFF,
|
||||||
|
// footer
|
||||||
|
0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x01
|
||||||
|
];
|
||||||
|
|
||||||
|
let mut decoder = Decoder::try_new(input.into_iter())
|
||||||
|
.expect("Failed to initialize decoder from byte array");
|
||||||
|
|
||||||
|
// Check the metadata
|
||||||
|
assert_eq!(decoder.width, 1);
|
||||||
|
assert_eq!(decoder.height, 1);
|
||||||
|
assert_eq!(decoder.channels, 3);
|
||||||
|
assert_eq!(decoder.colorspace, 0);
|
||||||
|
|
||||||
|
// Grab the one single pixel and check that it's solid blue.
|
||||||
|
let pixel = decoder.next().expect("Couldn't get pixel from decoder");
|
||||||
|
assert_eq!(pixel, PixelRGBA::new(0, 0, 255, 255));
|
||||||
|
|
||||||
|
// Assert that there are no more pixels.
|
||||||
|
let pixel = decoder.next();
|
||||||
|
assert!(pixel.is_none());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user