mirrors/IronRDP
1
0
Fork 0
mirror of https://github.com/Devolutions/IronRDP.git synced 2025-12-23 12:26:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

refactor(session): generalize apply_rgb24()

Browse source 
Add an optional "flip" argument for inverting bitmaps.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Marc-André Lureau 2025-03-05 15:08:25 +04:00 • committed by Benoît Cortier
parent fc604a567b
commit 727c9b7710
2 changed files with 34 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/ironrdp-session/src/fast_path.rs
View file

@ -114,7 +114,7 @@ impl Processor {
usize::from(update.width),
usize::from(update.height),
) {
Ok(()) => image.apply_rgb24_bitmap(&buf, &update.rectangle)?,
Ok(()) => image.apply_rgb24(&buf, &update.rectangle, true)?,
Err(err) => {
warn!("Invalid RDP6_BITMAP_STREAM: {err}");
update.rectangle.clone()

52
crates/ironrdp-session/src/image.rs
View file

@ -570,43 +570,57 @@ impl DecodedImage {
}
// FIXME: this assumes PixelFormat::RgbA32
pub(crate) fn apply_rgb24_bitmap(
fn apply_rgb24_iter<'a, I>(
&mut self,
rgb24: &[u8],
rgb24: I,
update_rectangle: &InclusiveRectangle,
) -> SessionResult<InclusiveRectangle> {
) -> SessionResult<InclusiveRectangle>
where
I: Iterator<Item = &'a [u8]>,
{
const SRC_COLOR_DEPTH: usize = 3;
const DST_COLOR_DEPTH: usize = 4;
let image_width = self.width as usize;
let rectangle_width = usize::from(update_rectangle.width());
let top = usize::from(update_rectangle.top);
let left = usize::from(update_rectangle.left);
let pointer_rendering_state = self.pointer_rendering_begin(update_rectangle)?;
rgb24
.chunks_exact(rectangle_width * SRC_COLOR_DEPTH)
.rev()
.enumerate()
.for_each(|(row_idx, row)| {
row.chunks_exact(SRC_COLOR_DEPTH)
.enumerate()
.for_each(|(col_idx, src_pixel)| {
let dst_idx = ((top + row_idx) * image_width + left + col_idx) * DST_COLOR_DEPTH;
rgb24.enumerate().for_each(|(row_idx, row)| {
row.chunks_exact(SRC_COLOR_DEPTH)
.enumerate()
.for_each(|(col_idx, src_pixel)| {
let dst_idx = ((top + row_idx) * image_width + left + col_idx) * DST_COLOR_DEPTH;
// Copy RGB channels as is
self.data[dst_idx..dst_idx + SRC_COLOR_DEPTH].copy_from_slice(src_pixel);
// Set alpha channel to opaque(0xFF)
self.data[dst_idx + 3] = 0xFF;
})
});
// Copy RGB channels as is
self.data[dst_idx..dst_idx + SRC_COLOR_DEPTH].copy_from_slice(src_pixel);
// Set alpha channel to opaque(0xFF)
self.data[dst_idx + 3] = 0xFF;
})
});
let update_rectangle = self.pointer_rendering_end(pointer_rendering_state)?;
Ok(update_rectangle)
}
pub(crate) fn apply_rgb24(
&mut self,
rgb24: &[u8],
update_rectangle: &InclusiveRectangle,
flip: bool,
) -> SessionResult<InclusiveRectangle> {
const SRC_COLOR_DEPTH: usize = 3;
let rectangle_width = usize::from(update_rectangle.width());
let lines = rgb24.chunks_exact(rectangle_width * SRC_COLOR_DEPTH);
if flip {
self.apply_rgb24_iter(lines.rev(), update_rectangle)
} else {
self.apply_rgb24_iter(lines, update_rectangle)
}
}
// FIXME: this assumes PixelFormat::RgbA32
pub(crate) fn apply_rgb32_bitmap(
&mut self,