fix(codecs): updated webp encoder to new api

src/codecs/webp/encoder/mod.rs

@@ -1,7 +1,12 @@
-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,
 };
 
@@ -38,9 +43,15 @@ impl EncoderTrait for WebPEncoder {
  "webp"
  }
 
- 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 mut writer = ZWriter::new(sink);
+
  if image.is_animated() {
  let frames = image.flatten_to_u8();
 
@@ -74,7 +85,13 @@ impl EncoderTrait for WebPEncoder {
  Ok(())
  })?;
 
- Ok(vec![])
+ let res = encoder.encode();
+
+ writer.write(&res).map_err(|e| {
+ ImageErrors::EncodeErrors(ImgEncodeErrors::ImageEncodeErrors(format!("{e:?}")))
+ })?;
+
+ Ok(writer.bytes_written())
  } else {
  let data = &image.flatten_to_u8()[0];
 
@@ -92,7 +109,11 @@ impl EncoderTrait for WebPEncoder {
  ImgEncodeErrors::ImageEncodeErrors(format!("webp encoding failed: {e:?}"))
  })?;
 
- Ok(res.to_vec())
+ writer.write(&res).map_err(|e| {
+ ImageErrors::EncodeErrors(ImgEncodeErrors::ImageEncodeErrors(format!("{e:?}")))
+ })?;
+
+ Ok(writer.bytes_written())
  }
  }
 

src/codecs/webp/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 = WebPEncoder::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 = WebPEncoder::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 = WebPEncoder::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 = WebPEncoder::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 = WebPEncoder::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 = WebPEncoder::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 = WebPEncoder::new();
 
- let result = encoder.encode(&image);
+ let buf = Cursor::new(vec![]);
+
+ let result = encoder.encode(&image, buf);
  dbg!(&result);
 
  assert!(result.is_ok());