[Spice-devel] [PATCH 5/6] LZ4: Add support for 24bit pixman surfaces
Javier Celaya
javier.celaya at flexvm.es
Wed Jan 28 02:49:48 PST 2015
---
common/canvas_base.c | 3 +++
common/canvas_utils.c | 8 ++++++++
2 files changed, 11 insertions(+)
diff --git a/common/canvas_base.c b/common/canvas_base.c
index ad43c13..fb35c4a 100644
--- a/common/canvas_base.c
+++ b/common/canvas_base.c
@@ -573,6 +573,9 @@ static pixman_image_t *canvas_get_lz4(CanvasBase *canvas, SpiceImage *image, int
stride_encoded *= 2;
break;
case SPICE_BITMAP_FMT_24BIT:
+ format = PIXMAN_r8g8b8;
+ stride_encoded *= 3;
+ break;
case SPICE_BITMAP_FMT_32BIT:
format = PIXMAN_x8r8g8b8;
stride_encoded *= 4;
diff --git a/common/canvas_utils.c b/common/canvas_utils.c
index d52292b..0d1591a 100644
--- a/common/canvas_utils.c
+++ b/common/canvas_utils.c
@@ -165,6 +165,10 @@ pixman_image_t * surface_create(pixman_format_code_t format, int width, int heig
bitmap_info.inf.bmiHeader.biBitCount = 32;
nstride = width * 4;
break;
+ case PIXMAN_r8g8b8:
+ bitmap_info.inf.bmiHeader.biBitCount = 24;
+ nstride = SPICE_ALIGN(width * 3, 4);
+ break;
case PIXMAN_x1r5g5b5:
case PIXMAN_r5g6b5:
bitmap_info.inf.bmiHeader.biBitCount = 16;
@@ -233,6 +237,10 @@ pixman_image_t * surface_create(pixman_format_code_t format, int width, int heig
case PIXMAN_x8r8g8b8:
stride = width * 4;
break;
+ case PIXMAN_r8g8b8:
+ // NOTE: LZ4 also decodes to RGB24
+ stride = SPICE_ALIGN(width * 3, 4);
+ break;
case PIXMAN_x1r5g5b5:
case PIXMAN_r5g6b5:
stride = SPICE_ALIGN(width * 2, 4);
--
1.9.3
More information about the Spice-devel
mailing list