mjpeg, yuv test

Author: l1npengtul

nokhwa-core/src/decoder.rs

@@ -1,11 +1,11 @@
 use crate::error::NokhwaError;
 use crate::frame_buffer::FrameBuffer;
 use crate::image::{DecodedImage, NonFloatScalarWidth};
-use crate::types::{Resolution};
+use crate::pixel_destination::PixelDestination;
+use crate::types::Resolution;
+use bytemuck::try_cast_slice_mut;
 pub use image::{ImageBuffer, Pixel, Primitive};
 use std::fmt::Debug;
-use bytemuck::try_cast_slice_mut;
-use crate::pixel_destination::PixelDestination;
 
 pub trait Decoder {
     type Config: Clone + Debug + ConfigHasResolution;
@@ -23,14 +23,25 @@ pub trait Decoder {
         destination_format: PixelDestination,
     ) -> Result<Self::OutputMeta, NokhwaError>;
 
-    fn decode_to_pixel_buffer<P: Pixel>(&mut self, to_decode: FrameBuffer, mut buffer: impl AsMut<[P::Subpixel]>) -> Result<Self::OutputMeta, NokhwaError>
+    fn decode_to_pixel_buffer<P: Pixel>(
+        &mut self,
+        to_decode: FrameBuffer,
+        mut buffer: impl AsMut<[P::Subpixel]>,
+    ) -> Result<Self::OutputMeta, NokhwaError>
     where
-        <P as Pixel>::Subpixel: NonFloatScalarWidth
+        <P as Pixel>::Subpixel: NonFloatScalarWidth,
     {
-        let Some(destination) = PixelDestination::get_by_pixel::<P>() else { return Err(NokhwaError::DecoderUnknownDestinationPixelFormat(P::COLOR_MODEL, P::Subpixel::WIDTH_BYTES)) };
+        let Some(destination) = PixelDestination::get_by_pixel::<P>() else {
+            return Err(NokhwaError::DecoderUnknownDestinationPixelFormat(
+                P::COLOR_MODEL,
+                P::Subpixel::WIDTH_BYTES,
+            ));
+        };
 
         if !Self::supports_destination(destination) {
-            return Err(NokhwaError::DecoderUnsupportedDestinationPixelFormat(destination))
+            return Err(NokhwaError::DecoderUnsupportedDestinationPixelFormat(
+                destination,
+            ));
         }
 
         let buffer = buffer.as_mut();
@@ -52,28 +63,35 @@ pub trait Decoder {
         let mut out_buffer: Vec<P::Subpixel> = vec![P::Subpixel::DEFAULT_MIN_VALUE; min_size_alloc];
         let meta = self.decode_to_pixel_buffer::<P>(to_decode, &mut out_buffer)?;
         Ok(DecodedImage::new(
-            ImageBuffer::from_vec(
-                resolution.width(),
-                resolution.height(),
-                out_buffer,
-            )
-                .ok_or(NokhwaError::Decoder(
-                    "failed to convert into an image buffer".to_string(),
-                ))?,
+            ImageBuffer::from_vec(resolution.width(), resolution.height(), out_buffer).ok_or(
+                NokhwaError::Decoder("failed to convert into an image buffer".to_string()),
+            )?,
             meta,
         ))
     }
-    
-    fn output_decoder_min_size_pixel<P>(&self, resolution: Resolution) -> Result<usize, NokhwaError> where
-        P: Pixel,
-        <P as Pixel>::Subpixel: NonFloatScalarWidth {
-        PixelDestination::get_by_pixel::<P>().map(|dest| self.output_decoder_min_size(resolution, dest)).ok_or(NokhwaError::DecoderUnknownDestinationPixelFormat(P::COLOR_MODEL, P::Subpixel::WIDTH_BYTES))?
 
+    fn output_decoder_min_size_pixel<P>(&self, resolution: Resolution) -> Result<usize, NokhwaError>
+    where
+        P: Pixel,
+        <P as Pixel>::Subpixel: NonFloatScalarWidth,
+    {
+        PixelDestination::get_by_pixel::<P>()
+            .map(|dest| self.output_decoder_min_size(resolution, dest))
+            .ok_or(NokhwaError::DecoderUnknownDestinationPixelFormat(
+                P::COLOR_MODEL,
+                P::Subpixel::WIDTH_BYTES,
+            ))?
     }
-    
-    fn output_decoder_min_size(&self, resolution: Resolution, destination_format: PixelDestination) -> Result<usize, NokhwaError> {
+
+    fn output_decoder_min_size(
+        &self,
+        resolution: Resolution,
+        destination_format: PixelDestination,
+    ) -> Result<usize, NokhwaError> {
         if !Self::supports_destination(destination_format) {
-            return Err(NokhwaError::DecoderUnsupportedDestinationPixelFormat(destination_format))
+            return Err(NokhwaError::DecoderUnsupportedDestinationPixelFormat(
+                destination_format,
+            ));
         }
 
         let px_size = match destination_format {
@@ -83,7 +101,7 @@ pub trait Decoder {
             PixelDestination::Rgba16 | PixelDestination::Bgra16 => 4_u32 * 2_u32,
             PixelDestination::Luma8 => 1_u32,
             PixelDestination::LumaA8 | PixelDestination::Luma16 => 2_u32,
-            };
+        };
         let reso = resolution.width() * resolution.height();
         Ok((reso as usize) * (px_size as usize))
     }

nokhwa-core/src/frame_buffer.rs

@@ -146,3 +146,24 @@ impl Deref for FrameBuffer<'_> {
         self.buffer.as_ref()
     }
 }
+
+impl From<Vec<u8>> for FrameBuffer<'_> {
+    fn from(value: Vec<u8>) -> Self {
+        let buffer = Cow::Owned(value);
+
+        FrameBuffer {
+            buffer,
+            metadata: None,
+        }
+    }
+}
+
+impl<'a> From<&'a [u8]> for FrameBuffer<'a> {
+    fn from(value: &'a [u8]) -> Self {
+        let buffer = Cow::Borrowed(value);
+        FrameBuffer {
+            buffer,
+            metadata: None,
+        }
+    }
+}

nokhwa-decoders/Cargo.toml

@@ -1,53 +1,53 @@
 [package]
-name = "nokhwa-decoders"
+name    = "nokhwa-decoders"
 version = "0.1.0"
 edition = "2024"
 
 [features]
-ffmpeg = ["ffmpeg-the-third"]
-yuyv = ["dcv-color-primitives", "yuv"]
-mjpeg = ["zune-jpeg", "zune-core"]
-luma = ["nokhwa-iter-extensions", "itermore"]
-static = ["ffmpeg-the-third/static"]
+ffmpeg = [ "ffmpeg-the-third" ]
+yuyv   = [ "dcv-color-primitives", "yuv" ]
+mjpeg  = [ "zune-jpeg", "zune-core" ]
+luma   = [ "nokhwa-iter-extensions", "itermore" ]
+# static = ["ffmpeg-the-third/static"]
 #async = []
 
 [dependencies]
 bytemuck = "1.23"
 
 [dependencies.nokhwa-core]
 version = "0.2"
-path = "../nokhwa-core"
+path    = "../nokhwa-core"
 
 [dependencies.ffmpeg-the-third]
-version = "4.0.0"
+version  = "4.0.0"
 optional = true
 
 [dependencies.yuv]
-version = "0.8"
+version  = "0.8"
 optional = true
 
 [dependencies.dcv-color-primitives]
-version = "0.7"
+version  = "0.7"
 optional = true
 
 [dependencies.zune-jpeg]
-version = "0.5.0-rc9"
+version  = "0.5.0-rc9"
 optional = true
 
 [dependencies.zune-core]
-version = "0.5.0-rc2"
+version  = "0.5.0-rc2"
 optional = true
 
 [dependencies.itermore]
-version = "0.8"
-features = ["array_chunks"]
+version  = "0.8"
+features = [ "array_chunks" ]
 optional = true
 
 [dependencies.nokhwa-iter-extensions]
-version = "0.1"
-path = "../nokhwa-iter-extensions"
+version  = "0.1"
+path     = "../nokhwa-iter-extensions"
 optional = true
 
 [dev-dependencies.image]
 workspace = true
-features = ["png", "jpeg", "avif"]
+features  = [ "png", "jpeg", "avif" ]