Merge pull request #183 from Shnatsel/zune-inflate

Use zune-inflate for decompression, take 2

Author: johannesvollmer

Cargo.lock

@@ -31,6 +31,7 @@ lebe = "^0.5.2"                # generic binary serialization
 half = "^2.1.0"                # 16 bit float pixel data type
 bit_field = "^0.10.1"          # exr file version bit flags
 miniz_oxide = "^0.6.2"         # zip compression for pxr24
+zune-inflate = { version = "^0.2.3", default-features = false, features = ["zlib"] }  # zip decompression, faster than miniz_oxide
 smallvec = "^1.7.0"            # make cache-friendly allocations        TODO profile if smallvec is really an improvement!
 threadpool = "^1.8.1"          # threading for parallel compression     TODO make this an optional feature?
 flume = "^0.10.9"              # crossbeam, but less unsafe code        TODO make this an optional feature?

Cargo.toml

@@ -145,8 +145,9 @@ pub fn decompress(channels: &ChannelList, bytes: ByteVec, area: IntegerBounds, e
         ))
     }
 
-    let raw = miniz_oxide::inflate
-        ::decompress_to_vec_zlib_with_limit(&bytes, expected_byte_size)
+    let options = zune_inflate::DeflateOptions::default().set_limit(expected_byte_size).set_size_hint(expected_byte_size);
+    let mut decoder = zune_inflate::DeflateDecoder::new_with_options(&bytes, options);
+    let raw = decoder.decode_zlib()
         .map_err(|_| Error::invalid("zlib-compressed data malformed"))?; // TODO share code with zip?
 
     let mut read = raw.as_slice();

src/compression/pxr24.rs

@@ -19,8 +19,9 @@ pub fn decompress_bytes(
     expected_byte_size: usize,
     _pedantic: bool,
 ) -> Result<ByteVec> {
-    let mut decompressed = miniz_oxide::inflate
-    ::decompress_to_vec_zlib_with_limit(&data, expected_byte_size)
+    let options = zune_inflate::DeflateOptions::default().set_limit(expected_byte_size).set_size_hint(expected_byte_size);
+    let mut decoder = zune_inflate::DeflateDecoder::new_with_options(&data, options);
+    let mut decompressed = decoder.decode_zlib()
         .map_err(|_| Error::invalid("zlib-compressed data malformed"))?;
 
     differences_to_samples(&mut decompressed);