|
 |
e2c81d |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
fce154 |
From: Christophe Fergeau <cfergeau@redhat.com>
|
|
|
fce154 |
Date: Wed, 26 Feb 2014 15:40:55 +0100
|
|
|
fce154 |
Subject: [PATCH] mjpeg: Don't warn on unsupported image formats
|
|
|
fce154 |
|
|
|
fce154 |
When trying to start mjpeg compression mode, mjpeg_encoder_start_frame()
|
|
|
fce154 |
tests the image format as its only able to compress 24/32bpp images. On
|
|
|
fce154 |
images with lower bit depths, we return MJPEG_ENCODER_FRAME_UNSUPPORTED to
|
|
|
fce154 |
indicate this is not a format we can compress. However, this return goes
|
|
|
fce154 |
with a spice_warning("unsupported format"). As the rest of the code can
|
|
|
fce154 |
cope with this unsupported format by not doing mjpeg compression, it's
|
|
|
fce154 |
nicer to downgrade this spice_warning() to spice_debug().
|
|
|
fce154 |
|
|
|
fce154 |
This fixes https://bugzilla.redhat.com/show_bug.cgi?id=1070028
|
|
|
fce154 |
|
|
|
fce154 |
(cherry picked from commit 67be56ad8a6b10a5307939a700115d6be3fb8433)
|
|
|
fce154 |
---
|
|
|
fce154 |
server/mjpeg_encoder.c | 2 +-
|
|
|
fce154 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
fce154 |
|
|
|
fce154 |
diff --git a/server/mjpeg_encoder.c b/server/mjpeg_encoder.c
|
|
|
fce154 |
index 223fe64..ea9f3af 100644
|
|
|
fce154 |
--- a/server/mjpeg_encoder.c
|
|
|
fce154 |
+++ b/server/mjpeg_encoder.c
|
|
|
fce154 |
@@ -799,7 +799,7 @@ int mjpeg_encoder_start_frame(MJpegEncoder *encoder, SpiceBitmapFmt format,
|
|
|
fce154 |
#endif
|
|
|
fce154 |
break;
|
|
|
fce154 |
default:
|
|
|
fce154 |
- spice_warning("unsupported format %d", format);
|
|
|
fce154 |
+ spice_debug("unsupported format %d", format);
|
|
|
fce154 |
return MJPEG_ENCODER_FRAME_UNSUPPORTED;
|
|
|
fce154 |
}
|
|
|
fce154 |
|