Parse jpeg files

Author: friendlymatthew

src/image/reader.rs

@@ -4,6 +4,7 @@ use crate::{
         ImageExt,
         ImageKind,
     },
+    jpeg::JpegDecoder,
     png::PngDecoder,
 };
 use anyhow::Result;
@@ -18,12 +19,10 @@ impl ImageReader {
 
         let image_kind = image_kind.expect("how do you infer which image decoder to run?");
 
-        let image: Box<dyn ImageExt> = Box::new(match image_kind {
-            ImageKind::Png => PngDecoder::new(&data).decode()?,
-            ImageKind::Jpeg => {
-                todo!();
-            }
-        });
+        let image: Box<dyn ImageExt> = match image_kind {
+            ImageKind::Png => Box::new(PngDecoder::new(&data).decode()?),
+            ImageKind::Jpeg => Box::new(JpegDecoder::new(&data).decode()?),
+        };
 
         Ok(image)
     }

src/jpeg/decoder.rs

@@ -0,0 +1,220 @@
+use std::ops::{Range, RangeInclusive};
+use crate::{
+    eof,
+    jpeg::grammar::{
+        Jpeg,
+        Marker,
+    },
+    read,
+    util::read_bytes::{
+        U16_BYTES,
+        U8_BYTES,
+    },
+};
+use anyhow::{anyhow, ensure, Result};
+use crate::jpeg::grammar::{Component, EncodingProcess, HuffmanTable, JFIF, QuantizationTable, StartOfFrame, StartOfScan};
+
+#[derive(Debug)]
+pub struct JpegDecoder<'a> {
+    cursor: usize,
+    data: &'a [u8],
+}
+
+impl<'a> JpegDecoder<'a> {
+    pub const fn new(data: &'a [u8]) -> Self {
+        Self { cursor: 0, data }
+    }
+
+    pub fn decode(&mut self) -> Result<Jpeg> {
+        let _jfif = self.parse_jfif()?;
+
+        todo!();
+    }
+
+    fn parse_jfif(&mut self) -> Result<JFIF> {
+        ensure!(self.read_marker()? == 0xFFD8);
+
+        let mut quantization_tables = Vec::with_capacity(4);
+        let mut huffman_tables = Vec::new();
+        let mut start_of_frame = None;
+        let mut start_of_scan = None;
+        let mut image_data = None;
+
+        loop {
+            match self.read_marker()? {
+                0xFFE0 => {
+                    self.parse_application_header()?;
+                }
+                0xFFDB => {
+                    quantization_tables.push(self.parse_quantization_table()?);
+                }
+                0xFFC4 => {
+                    huffman_tables.push(self.parse_huffman_table()?);
+                }
+                0xFFDA => {
+                    ensure!(start_of_scan.is_none() && image_data.is_none());
+                    start_of_scan = Some(self.parse_start_of_scan()?);
+                    image_data = Some(self.parse_image_data()?);
+
+                    break;
+                }
+                start_of_frame_marker if (start_of_frame_marker as u8 & 0xF0) == 0xC0 => {
+                    ensure!(start_of_frame.is_none());
+                    start_of_frame = Some(self.parse_start_of_frame(start_of_frame_marker as u8)?);
+                }
+                foreign => unimplemented!("{:X}", foreign),
+            };
+        }
+
+        ensure!(self.read_marker()? == 0xFFD9);
+
+        Ok(JFIF {
+            quantization_tables,
+            huffman_tables,
+            start_of_frame: start_of_frame.ok_or_else(|| anyhow!("expected start of frame"))?,
+            start_of_scan: start_of_scan.ok_or_else(|| anyhow!("expected start of scan"))?,
+            image_data: image_data.ok_or_else(|| anyhow!("expected image data"))?,
+        })
+    }
+
+    fn parse_application_header(&mut self) -> Result<()> {
+        let offset = self.cursor;
+        let length = self.read_u16()?;
+
+        ensure!(self.read_fixed::<5>()? == b"JFIF\0");
+
+        self.cursor = offset + length as usize;
+
+        Ok(())
+    }
+
+    fn parse_quantization_table(&mut self) -> Result<QuantizationTable> {
+        let offset = self.cursor;
+        let length = self.read_u16()? as usize;
+
+        let flag = self.read_u8()?;
+
+        let quantization_table = QuantizationTable {
+            flag,
+            element_range: Range {
+                start: self.cursor,
+                end: offset + length,
+            },
+        };
+
+        self.cursor = offset + length;
+
+        Ok(quantization_table)
+    }
+
+    fn parse_start_of_frame(&mut self, start_of_frame: u8) -> Result<StartOfFrame> {
+        let encoding_process = EncodingProcess::try_from(start_of_frame & 0b1111)?;
+
+        let offset = self.cursor;
+        let length = self.read_u16()?;
+
+        let start_of_frame = StartOfFrame {
+            encoding_process,
+            sample_precision: self.read_u8()?,
+            lines: self.read_u16()?,
+            samples_per_line: self.read_u16()?,
+            components: {
+                let number_of_image_components = self.read_u8()?;
+                self.read_vec(number_of_image_components as usize, Self::parse_component)?
+            },
+        };
+
+        ensure!(self.cursor == offset + length as usize);
+
+        Ok(start_of_frame)
+    }
+
+    fn parse_component(&mut self) -> Result<Component> {
+        Ok(Component {
+            identifier: self.read_u8()?,
+            sampling_factor: self.read_u8()?,
+            quantization_table_destination_selector: self.read_u8()?,
+        })
+    }
+
+    fn parse_huffman_table(&mut self) -> Result<HuffmanTable> {
+        let offset = self.cursor;
+        let length = self.read_u16()? as usize;
+
+        let flag = self.read_u8()?;
+
+        let huffman_table = HuffmanTable {
+            flag,
+            element_range: Range {
+                start: self.cursor,
+                end: offset + length,
+            },
+        };
+
+        self.cursor = offset + length;
+
+
+        Ok(huffman_table)
+    }
+
+    fn parse_start_of_scan(&mut self) -> Result<StartOfScan> {
+        let offset = self.cursor;
+        let length = self.read_u16()?;
+
+        let number_of_image_components = self.read_u8()?;
+        let components = self.read_vec(number_of_image_components as usize, |this| Ok((this.read_u8()?, this.read_u8()?)))?;
+
+        let start_of_scan = StartOfScan {
+            components,
+            spectral_select: RangeInclusive::new(self.read_u8()?, self.read_u8()?),
+            approximation: self.read_u8()?,
+        };
+
+        ensure!(self.cursor == offset + length as usize);
+
+        Ok(start_of_scan)
+    }
+
+    fn parse_image_data(&mut self) -> Result<Range<usize>> {
+        let range = Range {
+            start: self.cursor,
+            end: {
+                while self.data[self.cursor..self.cursor + U16_BYTES] != [0xFF, 0xD9] {
+                    self.cursor += 1;
+                }
+
+                self.cursor
+            },
+        };
+
+        Ok(range)
+    }
+
+
+    eof!();
+    read!(read_u8, u8, U8_BYTES);
+    read!(read_u16, u16, U16_BYTES);
+    read!(read_marker, Marker, U16_BYTES);
+
+    fn read_fixed<const N: usize>(&mut self) -> Result<&'a [u8; N]> {
+        self.eof(N)?;
+        let bs = &self.data[self.cursor..self.cursor + N];
+        self.cursor += N;
+
+        Ok(bs.try_into()?)
+    }
+
+    fn read_vec<T>(
+        &mut self,
+        capacity: usize,
+        read_fn: impl Fn(&mut Self) -> Result<T>,
+    ) -> Result<Vec<T>> {
+        let mut list = Vec::with_capacity(capacity);
+
+        for _ in 0..capacity {
+            list.push(read_fn(self)?)
+        }
+
+        Ok(list)
+    }
+}

src/jpeg/grammar.rs

@@ -0,0 +1,135 @@
+use crate::image::grammar::{
+    ColorType,
+    ImageExt,
+};
+use std::borrow::Cow;
+use std::ops::{Range, RangeInclusive};
+use anyhow::bail;
+
+pub type Marker = u16;
+
+#[derive(Debug)]
+pub enum Precision {
+    Eight,
+    Sixteen,
+}
+
+#[derive(Debug)]
+pub struct QuantizationTable {
+    pub flag: u8,
+    pub element_range: Range<usize>,
+}
+
+impl QuantizationTable {
+    pub const fn precision(&self) -> Precision {
+        match self.flag >> 4 == 1 {
+            false => Precision::Eight,
+            true => Precision::Sixteen
+        }
+    }
+
+    pub const fn table_identifier(&self) -> u8 {
+        self.flag & 0b1111
+    }
+}
+
+#[derive(Debug)]
+pub struct HuffmanTable {
+    pub flag: u8,
+    pub element_range: Range<usize>,
+}
+
+#[derive(Debug)]
+pub enum EncodingProcess {
+    BaselineDCT = 0,
+    HuffmanExtendedSequentialDCT = 1,
+    HuffmanProgressiveDCT = 2,
+    HuffmanLossless = 3,
+    ArithmeticExtendedSequentialDCT = 9,
+    ArithmeticProgressiveDCT = 10,
+    ArithmeticLossless = 11,
+}
+
+impl TryFrom<u8> for EncodingProcess {
+    type Error = anyhow::Error;
+
+    fn try_from(value: u8) -> Result<Self, Self::Error> {
+        let res = match value {
+            0 => Self::BaselineDCT,
+            1 => Self::HuffmanExtendedSequentialDCT,
+            2 => Self::HuffmanProgressiveDCT,
+            3 => Self::HuffmanLossless,
+            9 => Self::ArithmeticExtendedSequentialDCT,
+            10 => Self::ArithmeticProgressiveDCT,
+            11 => Self::ArithmeticLossless,
+            foreign => bail!("Encountered foreign encoding process: {foreign}")
+        };
+
+        Ok(res)
+    }
+}
+
+#[derive(Debug)]
+pub struct StartOfFrame {
+    pub encoding_process: EncodingProcess,
+    pub sample_precision: u8,
+    pub lines: u16,
+    pub samples_per_line: u16,
+    pub components: Vec<Component>,
+}
+
+#[derive(Debug)]
+pub struct Component {
+    pub identifier: u8,
+    pub sampling_factor: u8,
+    pub quantization_table_destination_selector: u8,
+}
+
+#[derive(Debug)]
+pub struct StartOfScan {
+    pub components: Vec<(u8, u8)>,
+    pub spectral_select: RangeInclusive<u8>,
+    pub approximation: u8,
+}
+
+#[derive(Debug)]
+pub struct JFIF {
+    pub quantization_tables: Vec<QuantizationTable>,
+    pub huffman_tables: Vec<HuffmanTable>,
+    pub start_of_frame: StartOfFrame,
+    pub start_of_scan: StartOfScan,
+    pub image_data: Range<usize>,
+}
+
+#[derive(Debug)]
+pub struct Jpeg {}
+
+impl ImageExt for Jpeg {
+    fn width(&self) -> u32 {
+        todo!()
+    }
+
+    fn height(&self) -> u32 {
+        todo!()
+    }
+
+    fn gamma(&self) -> u32 {
+        todo!()
+    }
+
+    fn color_type(&self) -> ColorType {
+        todo!()
+    }
+
+    fn rgb8(&self) -> Cow<'_, [u8]> {
+        todo!()
+    }
+
+    fn rgba8(&self) -> Cow<'_, [u8]> {
+        todo!()
+    }
+
+    fn bitmap(&self) -> Cow<'_, [u32]> {
+        todo!()
+    }
+}

src/jpeg/mod.rs

@@ -0,0 +1,5 @@
+pub use decoder::*;
+
+pub mod grammar;
+
+mod decoder;

src/lib.rs

@@ -5,6 +5,7 @@ use wasm_bindgen::prelude::*;
 
 pub mod font;
 pub mod image;
+pub mod jpeg;
 pub mod png;
 pub mod renderer;
 pub mod util;