made floating point predictor(s) use

Author: feefladder

.ipynb_checkpoints/Untitled-checkpoint.ipynb

@@ -0,0 +1,6 @@
+{
+ "cells": [],
+ "metadata": {},
+ "nbformat": 4,
+ "nbformat_minor": 5
+}

Untitled.ipynb

@@ -0,0 +1,23 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "187138db-40ea-47d6-8c9a-892794d59fea",
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "",
+   "name": ""
+  },
+  "language_info": {
+   "name": ""
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}

a.out

@@ -0,0 +1,129 @@
+use crate::{
+    error::{AsyncTiffError, AsyncTiffResult},
+    tiff::tags::SampleFormat,
+};
+
+/// Result of a decoding process
+#[derive(Debug)]
+#[non_exhaustive]
+pub enum DecodingResult {
+    /// A vector of unsigned bytes
+    U8(Vec<u8>),
+    /// A vector of unsigned words
+    U16(Vec<u16>),
+    /// A vector of 32 bit unsigned ints
+    U32(Vec<u32>),
+    /// A vector of 64 bit unsigned ints
+    U64(Vec<u64>),
+    /// A vector of 32 bit IEEE floats
+    F32(Vec<f32>),
+    /// A vector of 64 bit IEEE floats
+    F64(Vec<f64>),
+    /// A vector of 8 bit signed ints
+    I8(Vec<i8>),
+    /// A vector of 16 bit signed ints
+    I16(Vec<i16>),
+    /// A vector of 32 bit signed ints
+    I32(Vec<i32>),
+    /// A vector of 64 bit signed ints
+    I64(Vec<i64>),
+}
+
+impl DecodingResult {
+    pub fn new(
+        sample_format: SampleFormat,
+        bits_per_sample: u16,
+        total_samples: usize,
+    ) -> AsyncTiffResult<Self> {
+        match sample_format {
+            SampleFormat::Uint => match bits_per_sample {
+                8 => Ok(Self::U8(vec![0u8; total_samples])),
+                16 => Ok(Self::U16(vec![0u16; total_samples])),
+                32 => Ok(Self::U32(vec![0u32; total_samples])),
+                64 => Ok(Self::U64(vec![0u64; total_samples])),
+                _ => Err(AsyncTiffError::General(format!(
+                    "cannot create DecodingResult for {bits_per_sample:?} bits per samples"
+                ))),
+            },
+            SampleFormat::Int => match bits_per_sample {
+                8 => Ok(Self::I8(vec![0i8; total_samples])),
+                16 => Ok(Self::I16(vec![0i16; total_samples])),
+                32 => Ok(Self::I32(vec![0i32; total_samples])),
+                64 => Ok(Self::I64(vec![0i64; total_samples])),
+                _ => Err(AsyncTiffError::General(format!(
+                    "cannot create DecodingResult for {bits_per_sample:?} bits per samples"
+                ))),
+            },
+            SampleFormat::IEEEFP => match bits_per_sample {
+                32 => Ok(Self::F32(vec![0f32; total_samples])),
+                64 => Ok(Self::F64(vec![0f64; total_samples])),
+                _ => Err(AsyncTiffError::General(format!(
+                    "cannot create float DecodingResult for {bits_per_sample:?} bits per samples"
+                ))),
+            },
+            format => Err(AsyncTiffError::General(format!(
+                "Unsupported sample format {format:?}"
+            ))),
+        }
+    }
+
+    pub fn u8_buf_mut(&mut self) -> &mut [u8] {
+        match *self {
+            DecodingResult::U8(ref mut buf) => bytemuck::cast_slice_mut(&mut buf[..]),
+            DecodingResult::U16(ref mut buf) => bytemuck::cast_slice_mut(&mut buf[..]),
+            DecodingResult::U32(ref mut buf) => bytemuck::cast_slice_mut(&mut buf[..]),
+            DecodingResult::U64(ref mut buf) => bytemuck::cast_slice_mut(&mut buf[..]),
+            DecodingResult::F32(ref mut buf) => bytemuck::cast_slice_mut(&mut buf[..]),
+            DecodingResult::F64(ref mut buf) => bytemuck::cast_slice_mut(&mut buf[..]),
+            DecodingResult::I8(ref mut buf) => bytemuck::cast_slice_mut(&mut buf[..]),
+            DecodingResult::I16(ref mut buf) => bytemuck::cast_slice_mut(&mut buf[..]),
+            DecodingResult::I32(ref mut buf) => bytemuck::cast_slice_mut(&mut buf[..]),
+            DecodingResult::I64(ref mut buf) => bytemuck::cast_slice_mut(&mut buf[..]),
+        }
+    }
+
+    pub fn u8_buf(&self) -> &[u8] {
+        match *self {
+            DecodingResult::U8(ref buf) => bytemuck::cast_slice(&buf[..]),
+            DecodingResult::U16(ref buf) => bytemuck::cast_slice(&buf[..]),
+            DecodingResult::U32(ref buf) => bytemuck::cast_slice(&buf[..]),
+            DecodingResult::U64(ref buf) => bytemuck::cast_slice(&buf[..]),
+            DecodingResult::F32(ref buf) => bytemuck::cast_slice(&buf[..]),
+            DecodingResult::F64(ref buf) => bytemuck::cast_slice(&buf[..]),
+            DecodingResult::I8(ref buf) => bytemuck::cast_slice(&buf[..]),
+            DecodingResult::I16(ref buf) => bytemuck::cast_slice(&buf[..]),
+            DecodingResult::I32(ref buf) => bytemuck::cast_slice(&buf[..]),
+            DecodingResult::I64(ref buf) => bytemuck::cast_slice(&buf[..]),
+        }
+    }
+
+    pub fn len(&self) -> usize {
+        match self {
+            DecodingResult::U8(v) => v.len(),
+            DecodingResult::U16(v) => v.len(),
+            DecodingResult::U32(v) => v.len(),
+            DecodingResult::U64(v) => v.len(),
+            DecodingResult::F32(v) => v.len(),
+            DecodingResult::F64(v) => v.len(),
+            DecodingResult::I8(v) => v.len(),
+            DecodingResult::I16(v) => v.len(),
+            DecodingResult::I32(v) => v.len(),
+            DecodingResult::I64(v) => v.len(),
+        }
+    }
+
+    pub fn is_empty(&self) -> bool {
+        match self {
+            DecodingResult::U8(v) => v.is_empty(),
+            DecodingResult::U16(v) => v.is_empty(),
+            DecodingResult::U32(v) => v.is_empty(),
+            DecodingResult::U64(v) => v.is_empty(),
+            DecodingResult::F32(v) => v.is_empty(),
+            DecodingResult::F64(v) => v.is_empty(),
+            DecodingResult::I8(v) => v.is_empty(),
+            DecodingResult::I16(v) => v.is_empty(),
+            DecodingResult::I32(v) => v.is_empty(),
+            DecodingResult::I64(v) => v.is_empty(),
+        }
+    }
+}

src/decoding_result.rs

@@ -325,7 +325,7 @@ pub fn rev_predict_f16(input: &mut [u8], output: &mut [u8], samples: usize) {
         input[i] = input[i].wrapping_add(input[i - samples]);
     }
     // reverse byte shuffle and fix endianness
-    for (i, chunk) in output.chunks_mut(2).enumerate() {
+    for (i, chunk) in output.chunks_exact_mut(2).enumerate() {
         chunk.copy_from_slice(&u16::to_ne_bytes(
             // convert to native-endian
             // floating predictor is be-like
@@ -345,7 +345,7 @@ pub fn rev_predict_f32(input: &mut [u8], output: &mut [u8], samples: usize) {
         input[i] = input[i].wrapping_add(input[i - samples]);
     }
     // reverse byte shuffle and fix endianness
-    for (i, chunk) in output.chunks_mut(4).enumerate() {
+    for (i, chunk) in output.chunks_exact_mut(4).enumerate() {
         chunk.copy_from_slice(
             // convert to native-endian
             &u32::to_ne_bytes(
@@ -371,7 +371,7 @@ pub fn rev_predict_f64(input: &mut [u8], output: &mut [u8], samples: usize) {
         input[i] = input[i].wrapping_add(input[i - samples]);
     }
 
-    for (i, chunk) in output.chunks_mut(8).enumerate() {
+    for (i, chunk) in output.chunks_exact_mut(8).enumerate() {
         chunk.copy_from_slice(
             // convert to native-endian
             &u64::to_ne_bytes(