robert/qoicodec
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make those tests pass!

Browse Source 
I want to refactor this at some point, but at least it passes the tests.
This commit is contained in:
Robert Garrett
2024-05-09 15:40:03 -05:00
parent 69fad49286
commit c0778ae887
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main.rs
View File

@@ -116,30 +116,37 @@ where
fn next(&mut self) -> Option<Self::Item> { fn next(&mut self) -> Option<Self::Item> {
if self.run_len > 0 { if self.run_len > 0 {
self.run_len -= 1; self.run_len -= 1;
return Some(self.prev_pixel); Some(self.prev_pixel)
} else { } else {
// Two kinds of patterns to match: // Two kinds of patterns to match:
// 1. Whole byte tag -- RGB and RGBA // 1. Whole byte tag -- RGB and RGBA
// 2. Partial byte tag -- 2 front bits of Index, Diff, Luma, and Run // 2. Partial byte tag -- 2 front bits of Index, Diff, Luma, and Run
let byte = self.bytes.next()?; let byte = self.bytes.next()?;
if byte == QOI_OP_RGB { if byte == QOI_OP_RGB {
return Some(PixelRGBA { let result = PixelRGBA {
r: self.bytes.next()?, r: self.bytes.next()?,
g: self.bytes.next()?, g: self.bytes.next()?,
b: self.bytes.next()?, b: self.bytes.next()?,
a: self.prev_pixel.a, a: self.prev_pixel.a,
}); };
self.prev_pixel = result;
self.back_buffer[codec_utils::hash(result) as usize] = result;
return Some(result);
} else if byte == QOI_OP_RGBA { } else if byte == QOI_OP_RGBA {
return Some(PixelRGBA { let result = PixelRGBA {
r: self.bytes.next()?, r: self.bytes.next()?,
g: self.bytes.next()?, g: self.bytes.next()?,
b: self.bytes.next()?, b: self.bytes.next()?,
a: self.bytes.next()?, a: self.bytes.next()?,
}); };
self.prev_pixel = result;
self.back_buffer[codec_utils::hash(result) as usize] = result;
return Some(result);
} else { } else {
match byte & QOI_OP_SMALL_MASK { match byte & QOI_OP_SMALL_MASK {
QOI_OP_INDEX => { QOI_OP_INDEX => {
let idx = (byte & !QOI_OP_SMALL_MASK) as usize; let idx = (byte & !QOI_OP_SMALL_MASK) as usize;
self.prev_pixel = self.back_buffer[idx];
return Some(self.back_buffer[idx]); return Some(self.back_buffer[idx]);
} }
QOI_OP_DIFF => { QOI_OP_DIFF => {
@@ -153,6 +160,7 @@ where
a: self.prev_pixel.a, a: self.prev_pixel.a,
}; };
self.prev_pixel = result; self.prev_pixel = result;
self.back_buffer[codec_utils::hash(result) as usize] = result;
return Some(result); return Some(result);
} }
QOI_OP_LUMA => { QOI_OP_LUMA => {
@@ -169,6 +177,7 @@ where
a: self.prev_pixel.a, a: self.prev_pixel.a,
}; };
self.prev_pixel = result; self.prev_pixel = result;
self.back_buffer[codec_utils::hash(result) as usize] = result;
return Some(result); return Some(result);
} }
QOI_OP_RUN => { QOI_OP_RUN => {