4 files changed, 36 insertions, 6 deletions

diff --git a/common/messages.h b/common/messages.h
index 106a8d3..e3677d1 100644
--- a/common/messages.h
+++ b/common/messages.h
@@ -308,13 +308,26 @@ typedef struct SpiceMsgDisplayStreamCreate {
     SpiceClip clip;
 } SpiceMsgDisplayStreamCreate;
 
-typedef struct SpiceMsgDisplayStreamData {
+typedef struct SpiceStreamDataHeader {
     uint32_t id;
     uint32_t multi_media_time;
+} SpiceStreamDataHeader;
+
+typedef struct SpiceMsgDisplayStreamData {
+    SpiceStreamDataHeader base;
     uint32_t data_size;
     uint8_t data[0];
 } SpiceMsgDisplayStreamData;
 
+typedef struct SpiceMsgDisplayStreamDataSized {
+    SpiceStreamDataHeader base;
+    uint32_t width;
+    uint32_t height;
+    SpiceRect dest;
+    uint32_t data_size;
+    uint8_t data[0];
+} SpiceMsgDisplayStreamDataSized;
+
 typedef struct SpiceMsgDisplayStreamClip {
     uint32_t id;
     SpiceClip clip;
diff --git a/spice-protocol b/spice-protocol
-Subproject 2d24f61aae4f92746940fd1c0daf546c7a51dae
+Subproject bf0daeb3a3c834133e781439f76b1c702470581
diff --git a/spice.proto b/spice.proto
index 513fe87..71be9ac 100644
--- a/spice.proto
+++ b/spice.proto
@@ -591,6 +591,11 @@ struct String {
     } u @anon;
 };
 
+struct StreamDataHeader {
+	uint32 id;
+	uint32 multi_media_time;
+};
+
 channel DisplayChannel : BaseChannel {
  server:
     message {
@@ -637,10 +642,9 @@ channel DisplayChannel : BaseChannel {
     } stream_create = 122;
 
     message {
-	uint32 id;
-	uint32 multi_media_time;
+	StreamDataHeader base;
 	uint32 data_size;
-	uint8 data[data_size] @end  @nomarshal;
+	uint8 data[data_size] @end @nomarshal;
     } stream_data;
 
     message {
@@ -785,6 +789,15 @@ channel DisplayChannel : BaseChannel {
 	uint32 surface_id;
     } @ctype(SpiceMsgSurfaceDestroy) surface_destroy;
 
+    message {
+	StreamDataHeader base;
+	uint32 width;
+	uint32 height;
+	Rect dest;
+	uint32 data_size;
+	uint8 data[data_size] @end @nomarshal;
+    } stream_data_sized;
+
  client:
     message {
 	uint8 pixmap_cache_id;
diff --git a/spice1.proto b/spice1.proto
index fa2524b..2ed1058 100644
--- a/spice1.proto
+++ b/spice1.proto
@@ -533,6 +533,11 @@ struct String {
     } u @anon;
 };
 
+struct StreamDataHeader {
+	uint32 id;
+	uint32 multi_media_time;
+};
+
 channel DisplayChannel : BaseChannel {
  server:
     message {
@@ -580,8 +585,7 @@ channel DisplayChannel : BaseChannel {
     } stream_create = 122;
 
     message {
-	uint32 id;
-	uint32 multi_media_time;
+	StreamDataHeader base;
 	uint32 data_size;
 	uint32 pad_size @zero;
 	uint8 data[data_size] @end  @nomarshal;