fix(codecs): updated avif encoder to new api

src/codecs/avif/encoder/mod.rs

@@ -1,9 +1,14 @@
 use ravif::Img;
 use rgb::FromSlice;
-use zune_core::{bit_depth::BitDepth, colorspace::ColorSpace};
+use zune_core::{
+ bit_depth::BitDepth,
+ bytestream::{ZByteWriterTrait, ZWriter},
+ colorspace::ColorSpace,
+};
 use zune_image::{
  codecs::ImageFormat,
  errors::{ImageErrors, ImgEncodeErrors},
+ image::Image,
  traits::EncoderTrait,
 };
 
@@ -61,10 +66,16 @@ impl EncoderTrait for AvifEncoder {
  "avif"
  }
 
- fn encode_inner(&mut self, image: &zune_image::image::Image) -> Result<Vec<u8>, ImageErrors> {
+ fn encode_inner<T: ZByteWriterTrait>(
+ &mut self,
+ image: &Image,
+ sink: T,
+ ) -> Result<usize, ImageErrors> {
  let (width, height) = image.dimensions();
  let data = &image.flatten_to_u8()[0];
 
+ let mut writer = ZWriter::new(sink);
+
  let encoder = ravif::Encoder::new()
  .with_quality(self.options.quality)
  .with_alpha_quality(self.options.alpha_quality.unwrap_or(self.options.quality))
@@ -79,15 +90,23 @@ impl EncoderTrait for AvifEncoder {
  .encode_rgb(img)
  .map_err(|e| ImgEncodeErrors::ImageEncodeErrors(e.to_string()))?;
 
- Ok(result.avif_file)
+ writer.write(&result.avif_file).map_err(|e| {
+ ImageErrors::EncodeErrors(ImgEncodeErrors::ImageEncodeErrors(format!("{e:?}")))
+ })?;
+
+ Ok(writer.bytes_written())
  }
  ColorSpace::RGBA => {
  let img = Img::new(data.as_slice().as_rgba(), width, height);
  let result = encoder
  .encode_rgba(img)
  .map_err(|e| ImgEncodeErrors::ImageEncodeErrors(e.to_string()))?;
 
- Ok(result.avif_file)
+ writer.write(&result.avif_file).map_err(|e| {
+ ImageErrors::EncodeErrors(ImgEncodeErrors::ImageEncodeErrors(format!("{e:?}")))
+ })?;
+
+ Ok(writer.bytes_written())
  }
  cs => Err(ImageErrors::EncodeErrors(
  ImgEncodeErrors::UnsupportedColorspace(cs, self.supported_colorspaces()),

src/codecs/avif/encoder/tests.rs

@@ -1,3 +1,5 @@
+use std::io::Cursor;
+
 use zune_core::colorspace::ColorSpace;
 
 use crate::test_utils::*;
@@ -19,7 +21,9 @@ fn encode_colorspaces_u8() {
 
  let mut encoder = AvifEncoder::new();
 
- let result = encoder.encode(&image);
+ let buf = Cursor::new(vec![]);
+
+ let result = encoder.encode(&image, buf);
 
  if result.is_err() {
  dbg!(&result);
@@ -50,7 +54,9 @@ fn encode_colorspaces_u16() {
 
  let mut encoder = AvifEncoder::new();
 
- let result = encoder.encode(&image);
+ let buf = Cursor::new(vec![]);
+
+ let result = encoder.encode(&image, buf);
 
  if result.is_err() {
  dbg!(&result);
@@ -81,7 +87,9 @@ fn encode_colorspaces_f32() {
 
  let mut encoder = AvifEncoder::new();
 
- let result = encoder.encode(&image);
+ let buf = Cursor::new(vec![]);
+
+ let result = encoder.encode(&image, buf);
 
  if result.is_err() {
  dbg!(&result);
@@ -102,7 +110,9 @@ fn encode_u8() {
  let image = create_test_image_u8(200, 200, ColorSpace::RGB);
  let mut encoder = AvifEncoder::new();
 
- let result = encoder.encode(&image);
+ let buf = Cursor::new(vec![]);
+
+ let result = encoder.encode(&image, buf);
  dbg!(&result);
 
  assert!(result.is_ok());
@@ -113,7 +123,9 @@ fn encode_u16() {
  let image = create_test_image_u16(200, 200, ColorSpace::RGB);
  let mut encoder = AvifEncoder::new();
 
- let result = encoder.encode(&image);
+ let buf = Cursor::new(vec![]);
+
+ let result = encoder.encode(&image, buf);
  dbg!(&result);
 
  assert!(result.is_ok());
@@ -124,7 +136,9 @@ fn encode_f32() {
  let image = create_test_image_f32(200, 200, ColorSpace::RGB);
  let mut encoder = AvifEncoder::new();
 
- let result = encoder.encode(&image);
+ let buf = Cursor::new(vec![]);
+
+ let result = encoder.encode(&image, buf);
  dbg!(&result);
 
  assert!(result.is_ok());
@@ -135,7 +149,9 @@ fn encode_animated() {
  let image = create_test_image_animated(200, 200, ColorSpace::RGB);
  let mut encoder = AvifEncoder::new();
 
- let result = encoder.encode(&image);
+ let buf = Cursor::new(vec![]);
+
+ let result = encoder.encode(&image, buf);
  dbg!(&result);
 
  assert!(result.is_ok());