@@ -76,21 +76,24 @@ impl DoubleBuffer { |
| 76 | 76 | pub struct AnimationRenderer { |
| 77 | 77 | /// Double buffer for smooth rendering |
| 78 | 78 | buffer: DoubleBuffer, |
| 79 | + /// Reusable BGRA conversion buffer (avoids per-frame allocation) |
| 80 | + bgra_buf: Vec<u8>, |
| 79 | 81 | } |
| 80 | 82 | |
| 81 | 83 | impl AnimationRenderer { |
| 82 | 84 | /// Create a new animation renderer |
| 83 | 85 | pub fn new(conn: &Connection) -> Result<Self> { |
| 84 | 86 | let buffer = DoubleBuffer::new(conn)?; |
| 85 | | - Ok(Self { buffer }) |
| 87 | + Ok(Self { buffer, bgra_buf: Vec::new() }) |
| 86 | 88 | } |
| 87 | 89 | |
| 88 | 90 | /// Render a frame to the back buffer |
| 89 | 91 | pub fn render_frame(&mut self, conn: &mut Connection, frame: &image::RgbaImage) -> Result<()> { |
| 90 | 92 | let (width, height) = self.buffer.dimensions(); |
| 91 | 93 | |
| 92 | | - // Convert RGBA to BGRA (X11 native format) |
| 93 | | - let bgra_data = rgba_to_bgra(frame); |
| 94 | + // Convert RGBA to BGRA in-place using reusable buffer |
| 95 | + rgba_to_bgra_into(frame, &mut self.bgra_buf); |
| 96 | + let bgra_data = &self.bgra_buf; |
| 94 | 97 | |
| 95 | 98 | let gc = conn.gc(); |
| 96 | 99 | let x11_conn = conn.conn(); |
@@ -188,14 +191,16 @@ impl AnimationRenderer { |
| 188 | 191 | } |
| 189 | 192 | } |
| 190 | 193 | |
| 191 | | -/// Convert RGBA to BGRA (X11 native format for 32-bit visuals) |
| 192 | | -fn rgba_to_bgra(image: &image::RgbaImage) -> Vec<u8> { |
| 193 | | - let mut bgra = Vec::with_capacity(image.len()); |
| 194 | | - for pixel in image.pixels() { |
| 195 | | - bgra.push(pixel[2]); // B |
| 196 | | - bgra.push(pixel[1]); // G |
| 197 | | - bgra.push(pixel[0]); // R |
| 198 | | - bgra.push(pixel[3]); // A |
| 194 | +/// Convert RGBA to BGRA into a reusable buffer (X11 native format for 32-bit visuals) |
| 195 | +fn rgba_to_bgra_into(image: &image::RgbaImage, buf: &mut Vec<u8>) { |
| 196 | + let raw = image.as_raw(); |
| 197 | + buf.clear(); |
| 198 | + buf.reserve(raw.len()); |
| 199 | + // Process 4 bytes at a time (one pixel) |
| 200 | + for chunk in raw.chunks_exact(4) { |
| 201 | + buf.push(chunk[2]); // B |
| 202 | + buf.push(chunk[1]); // G |
| 203 | + buf.push(chunk[0]); // R |
| 204 | + buf.push(chunk[3]); // A |
| 199 | 205 | } |
| 200 | | - bgra |
| 201 | 206 | } |