update pr-1791

Author: busyoGG

src/pw_utils.rs

@@ -8,7 +8,6 @@ use std::ptr::NonNull;
 use std::rc::Rc;
 use std::time::Duration;
 
-use smithay::backend::renderer::ExportMem;
 use anyhow::{ensure};
 use anyhow::Context as _;
 use calloop::timer::{TimeoutAction, Timer};
@@ -17,6 +16,7 @@ use pipewire::context::ContextRc;
 use pipewire::core::{CoreRc, PW_ID_CORE};
 use pipewire::main_loop::MainLoopRc;
 use pipewire::properties::PropertiesBox;
+use smithay::backend::renderer::ExportMem;
 use pipewire::spa::buffer::DataType;
 use pipewire::spa::param::format::{FormatProperties, MediaSubtype, MediaType};
 use pipewire::spa::param::format_utils::parse_format;
@@ -232,12 +232,13 @@ fn make_video_params(
     }
 }
 
-fn make_video_params_for_initial_negotiation(
+/// this function return an extra Vec<u8> to avoid extra allocation when building Pod
+fn make_video_params_for_initial_negotiation_with_extra_buffer(
     possible_modifiers: &FormatSet,
     size: Size<u32, Physical>,
     refresh: u32,
     alpha: bool,
-) -> Vec<pod::Object> {
+) -> Vec<(pod::Object, Vec<u8>)> {
     let f = |alpha| {
         let video_formats = if alpha {
             vec![VideoFormat::BGRA]
@@ -259,34 +260,28 @@ fn make_video_params_for_initial_negotiation(
         trace!("offering: {modifiers:?}");
 
         if modifiers.len() == 0 {
-            vec![make_video_params(
-                &video_formats,
-                &vec![],
-                size,
-                refresh,
-                false,
-            )]
+            vec![
+                (make_video_params(&video_formats, &vec![], size, refresh, false), Vec::new()),
+            ]
         } else {
             vec![
-                make_video_params(&video_formats, &modifiers, size, refresh, false),
-                make_video_params(&video_formats, &vec![], size, refresh, false),
+                (make_video_params(&video_formats, &modifiers, size, refresh, false), Vec::new()),
+                (make_video_params(&video_formats, &vec![], size, refresh, false), Vec::new()),
             ]
         }
     };
-    let pod_objects = if alpha {
+    let pod_objects_with_extra_buffer = if alpha {
         [f(true), f(false)].concat()
     } else {
         f(false)
     };
-    pod_objects
+    pod_objects_with_extra_buffer
 }
 
 macro_rules! make_video_params_for_initial_negotiation_macro {
     ($params:ident, $formats:expr, $size:expr, $refresh:expr, $alpha:expr) => {
-        let $params = make_video_params_for_initial_negotiation($formats, $size, $refresh, $alpha);
-        let mut obj_with_buffer: Vec<(&pod::Object, Vec<u8>)> =
-            $params.iter().map(|obj| (obj, Vec::new())).collect();
-        let $params: Vec<_> = obj_with_buffer
+        let mut $params = make_video_params_for_initial_negotiation_with_extra_buffer($formats, $size, $refresh, $alpha);
+        let $params: Vec<_> = $params
             .iter_mut()
             .map(|(obj, buf)| make_pod(buf, (*obj).clone()))
             .collect();