[Spice-commits] 2 commits - common/client_marshallers.h common/messages.h spice-protocol spice.proto

[Christophe Fergau]

 common/client_marshallers.h |    1 +
 common/messages.h           |    4 ++++
 spice-protocol              |    2 +-
 spice.proto                 |   15 +++++++++++++++
 4 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit dcebede0ca3d012786b9ab8fd95961c637b0b4a7
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Tue May 12 18:18:20 2015 +0200

    Update spice-protocol
    
    Christophe Fergeau (1):
          Post-release version bump
    
    Javier Celaya (2):
          Update enums.h for preferred compression message
          Add a preferred compression capability

diff --git a/spice-protocol b/spice-protocol
index 9acfaa6..67fb330 160000
--- a/spice-protocol
+++ b/spice-protocol
@@ -1 +1 @@
-Subproject commit 9acfaa66df90cb1475db7c09da09b6e9b5f5dd00
+Subproject commit 67fb3306f8b2db55c378e550adfd0d8e9fe40d9e
commit 127a76a3b8ddd949ffc56ff70db470ed1c17be39
Author: Javier Celaya <javier.celaya at flexvm.es>
Date:   Mon Apr 27 10:01:00 2015 +0200

    Proto: Add preferred compression message and constants.
    
    When accessing a virtual desktop from different devices, some may have
    different image compression requirements, e.g. slow devices may prefer
    the faster LZ4 over GLZ. This message instructs the server to switch the
    image compression algorithm. This patch also promotes the
    SPICE_IMAGE_COMPRESS_* constants so that they are available from both
    the server and the client.

diff --git a/common/client_marshallers.h b/common/client_marshallers.h
index 85051a0..522f620 100644
--- a/common/client_marshallers.h
+++ b/common/client_marshallers.h
@@ -72,6 +72,7 @@ typedef struct {
     void (*msgc_smartcard_reader_add)(SpiceMarshaller *m, VSCMsgReaderAdd *msg);
 #endif
     void (*msgc_port_event)(SpiceMarshaller *m, SpiceMsgcPortEvent *msg);
+    void (*msgc_display_preferred_compression)(SpiceMarshaller *m, SpiceMsgcDisplayPreferredCompression *msg);
 } SpiceMessageMarshallers;
 
 SpiceMessageMarshallers *spice_message_marshallers_get(void);
diff --git a/common/messages.h b/common/messages.h
index a8a0eee..5f5de54 100644
--- a/common/messages.h
+++ b/common/messages.h
@@ -630,6 +630,10 @@ typedef struct SpiceMsgcPortEvent {
     uint8_t event;
 } SpiceMsgcPortEvent;
 
+typedef struct SpiceMsgcDisplayPreferredCompression {
+    uint8_t image_compression;
+} SpiceMsgcDisplayPreferredCompression;
+
 SPICE_END_DECLS
 
 #endif /* _H_SPICE_PROTOCOL */
diff --git a/spice.proto b/spice.proto
index 01493c9..2889802 100644
--- a/spice.proto
+++ b/spice.proto
@@ -361,6 +361,17 @@ enum8 image_type {
     LZ4,
 };
 
+enum8 image_compress {
+    INVALID  = 0,
+    OFF,
+    AUTO_GLZ,
+    AUTO_LZ,
+    QUIC,
+    GLZ,
+    LZ,
+    LZ4,
+};
+
 flags8 image_flags {
     CACHE_ME,
     HIGH_BITS_SET,
@@ -922,6 +933,10 @@ channel DisplayChannel : BaseChannel {
         int32 last_frame_delay;
         uint32 audio_delay;
     } stream_report;
+
+    message {
+        uint8 image_compression;
+    } preferred_compression;
 };
 
 flags16 keyboard_modifier_flags {