Remove 1 or 2 unneeded resizes when rotating image buffers.

waycrate · Oct 6, 2023 · 4f3086c · 4f3086c
1 parent 0151346
commit 4f3086c
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 46 deletions.
diff --git a/libwayshot/src/image_util.rs b/libwayshot/src/image_util.rs
@@ -1,47 +1,36 @@
-use image::{GenericImageView, ImageBuffer, Pixel};
+use image::RgbaImage;
 use wayland_client::protocol::wl_output::Transform;
 
-pub(crate) fn rotate_image_buffer<T: GenericImageView>(
-    image: &T,
+pub(crate) fn rotate_image_buffer(
+    image: RgbaImage,
     transform: Transform,
     width: u32,
     height: u32,
-) -> ImageBuffer<T::Pixel, Vec<<T::Pixel as Pixel>::Subpixel>>
-where
-    T::Pixel: 'static,
-    <T::Pixel as Pixel>::Subpixel: 'static,
-{
-    let final_buffer: ImageBuffer<
-        <T as GenericImageView>::Pixel,
-        Vec<<<T as GenericImageView>::Pixel as Pixel>::Subpixel>,
-    > = match transform {
-        Transform::_90 => image::imageops::rotate90(image),
-        Transform::_180 => image::imageops::rotate180(image),
-        Transform::_270 => image::imageops::rotate270(image),
-        Transform::Flipped => image::imageops::flip_horizontal(image),
+) -> RgbaImage {
+    let final_buffer = match transform {
+        Transform::_90 => image::imageops::rotate90(&image),
+        Transform::_180 => image::imageops::rotate180(&image),
+        Transform::_270 => image::imageops::rotate270(&image),
+        Transform::Flipped => image::imageops::flip_horizontal(&image),
         Transform::Flipped90 => {
-            let flipped_buffer = image::imageops::flip_horizontal(image);
+            let flipped_buffer = image::imageops::flip_horizontal(&image);
             image::imageops::rotate90(&flipped_buffer)
         }
         Transform::Flipped180 => {
-            let flipped_buffer = image::imageops::flip_horizontal(image);
+            let flipped_buffer = image::imageops::flip_horizontal(&image);
             image::imageops::rotate180(&flipped_buffer)
         }
         Transform::Flipped270 => {
-            let flipped_buffer = image::imageops::flip_horizontal(image);
+            let flipped_buffer = image::imageops::flip_horizontal(&image);
             image::imageops::rotate270(&flipped_buffer)
         }
-        _ => {
-            let final_buffer = image::imageops::resize(
-                image,
-                width,
-                height,
-                image::imageops::FilterType::Gaussian,
-            );
-            return final_buffer;
-        }
+        _ => image,
     };
 
+    if final_buffer.dimensions() == (width, height) {
+        return final_buffer;
+    }
+
     image::imageops::resize(
         &final_buffer,
         width,

diff --git a/libwayshot/src/lib.rs b/libwayshot/src/lib.rs
@@ -18,7 +18,7 @@ use std::{
     sync::atomic::{AtomicBool, Ordering},
 };
 
-use image::{imageops::overlay, DynamicImage, RgbaImage};
+use image::{imageops::overlay, RgbaImage};
 use memmap2::MmapMut;
 use wayland_client::{
     globals::{registry_queue_init, GlobalList},
@@ -414,9 +414,9 @@ impl WayshotConnection {
             let (width, height) = frame_copy.1.unwrap();
             let frame_copy = &frame_copy.0[0];
 
-            let image: DynamicImage = frame_copy.try_into()?;
+            let image = frame_copy.try_into()?;
             composited_image = image_util::rotate_image_buffer(
-                &image,
+                image,
                 frame_copy.transform,
                 width as u32,
                 height as u32,
@@ -426,9 +426,9 @@ impl WayshotConnection {
             let (frame_copy, region) = frame_copy;
             let (width, height) = region.unwrap();
             for frame_copy in frame_copy {
-                let image: DynamicImage = (&frame_copy).try_into()?;
+                let image = (&frame_copy).try_into()?;
                 let image = image_util::rotate_image_buffer(
-                    &image,
+                    image,
                     frame_copy.transform,
                     width as u32,
                     height as u32,
@@ -456,8 +456,7 @@ impl WayshotConnection {
             output_info.transform,
             None,
         )?;
-        let dynamic_image: DynamicImage = (&frame_copy).try_into()?;
-        Ok(dynamic_image.into_rgba8())
+        Ok((&frame_copy).try_into()?)
     }
 
     /// Take a screenshot from all of the specified outputs.

diff --git a/libwayshot/src/screencopy.rs b/libwayshot/src/screencopy.rs
@@ -4,7 +4,7 @@ use std::{
     time::{SystemTime, UNIX_EPOCH},
 };
 
-use image::{ColorType, DynamicImage, ImageBuffer, Pixel};
+use image::{ColorType, ImageBuffer, Pixel, RgbaImage};
 use memmap2::MmapMut;
 use nix::{
     fcntl,
@@ -46,19 +46,14 @@ pub struct FrameCopy {
     pub transform: wl_output::Transform,
 }
 
-impl TryFrom<&FrameCopy> for DynamicImage {
+impl TryFrom<&FrameCopy> for RgbaImage {
     type Error = Error;
 
     fn try_from(value: &FrameCopy) -> Result<Self> {
         Ok(match value.frame_color_type {
-            ColorType::Rgb8 => DynamicImage::ImageRgb8(create_image_buffer(
-                &value.frame_format,
-                &value.frame_mmap,
-            )?),
-            ColorType::Rgba8 => DynamicImage::ImageRgba8(create_image_buffer(
-                &value.frame_format,
-                &value.frame_mmap,
-            )?),
+            ColorType::Rgb8 | ColorType::Rgba8 => {
+                create_image_buffer(&value.frame_format, &value.frame_mmap)?.into()
+            }
             _ => return Err(Error::InvalidColor),
         })
     }

diff --git a/wayshot/src/wayshot.rs b/wayshot/src/wayshot.rs
@@ -22,7 +22,8 @@ where
         .with_prompt("Choose Screen")
         .default(0)
         .items(ouputs)
-        .interact() else {
+        .interact()
+    else {
         return None;
     };
     Some(selection)