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

[Yonit Halperin]

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

New commits:
commit 30e84783cad7a5d4cd345367a267cafbfd0571af
Author: Yonit Halperin <yhalperi at redhat.com>
Date:   Wed Jan 9 16:11:29 2013 -0500

    add SPICE_MSG_PLAYBACK_LATENCY
    
    SPICE_MSG_PLAYBACK_LATENCY is intended for adjusting the
    latency of the audio playback. It is used for synchronizing
    the audio and video playback.
    The corresponding capability is SPICE_PLAYBACK_CAP_LATENCY.

diff --git a/common/messages.h b/common/messages.h
index 1d30b87..a8a0eee 100644
--- a/common/messages.h
+++ b/common/messages.h
@@ -469,6 +469,10 @@ typedef struct SpiceMsgPlaybackPacket {
     uint32_t data_size;
 } SpiceMsgPlaybackPacket, SpiceMsgcRecordPacket;
 
+typedef struct SpiceMsgPlaybackLatency {
+    uint32_t latency_ms;
+} SpiceMsgPlaybackLatency;
+
 typedef struct SpiceMsgRecordStart {
     uint32_t channels;
     uint32_t format; //SPICE_AUDIO_FMT_?
diff --git a/spice-protocol b/spice-protocol
index a04cc68..4f868cc 160000
--- a/spice-protocol
+++ b/spice-protocol
@@ -1 +1 @@
-Subproject commit a04cc68ba16c5ad8cf1f35b61c1464ef96bdfb0c
+Subproject commit 4f868cc354b617f55a0983fd2b2eafcb223b5772
diff --git a/spice.proto b/spice.proto
index 97d1e1b..5eede6b 100644
--- a/spice.proto
+++ b/spice.proto
@@ -1102,6 +1102,10 @@ channel PlaybackChannel : BaseChannel {
     Empty stop;
     AudioVolume volume;
     AudioMute mute;
+
+    message {
+        uint32 latency_ms;
+    } latency;
 };
 
 channel RecordChannel : BaseChannel {
commit 7cdf8de00a573b6bdb4ec4582c87aa79b25796d3
Author: Yonit Halperin <yhalperi at redhat.com>
Date:   Mon Feb 18 14:26:25 2013 -0500

    add stream report messages
    
    If the server & client support SPICE_DISPLAY_CAP_STREAM_REPORT,
    the server first sends SPICE_MSG_DISPLAY_STREAM_ACTIVATE_REPORT. Then,
    the client periodically sends SPICE_MSGC_DISPLAY_STREAM_REPORT
    messages that supply the server details about the current quality of
    the video streaming on the client side. The server analyses the
    report and adjust the stream parameters accordingly.

diff --git a/common/client_marshallers.h b/common/client_marshallers.h
index 9a2385d..85051a0 100644
--- a/common/client_marshallers.h
+++ b/common/client_marshallers.h
@@ -44,6 +44,7 @@ typedef struct {
     void (*msgc_main_agent_token)(SpiceMarshaller *m, SpiceMsgcMainAgentTokens *msg);
     void (*msgc_main_migrate_dst_do_seamless)(SpiceMarshaller *m, SpiceMsgcMainMigrateDstDoSeamless *msg);
     void (*msgc_display_init)(SpiceMarshaller *m, SpiceMsgcDisplayInit *msg);
+    void (*msgc_display_stream_report)(SpiceMarshaller *m, SpiceMsgcDisplayStreamReport *msg);
     void (*msgc_inputs_key_down)(SpiceMarshaller *m, SpiceMsgcKeyDown *msg);
     void (*msgc_inputs_key_up)(SpiceMarshaller *m, SpiceMsgcKeyUp *msg);
     void (*msgc_inputs_key_modifiers)(SpiceMarshaller *m, SpiceMsgcKeyModifiers *msg);
diff --git a/common/messages.h b/common/messages.h
index b145cfc..1d30b87 100644
--- a/common/messages.h
+++ b/common/messages.h
@@ -357,6 +357,24 @@ typedef struct SpiceMsgDisplayStreamDestroy {
     uint32_t id;
 } SpiceMsgDisplayStreamDestroy;
 
+typedef struct SpiceMsgDisplayStreamActivateReport {
+    uint32_t stream_id;
+    uint32_t unique_id;
+    uint32_t max_window_size;
+    uint32_t timeout_ms;
+} SpiceMsgDisplayStreamActivateReport;
+
+typedef struct SpiceMsgcDisplayStreamReport {
+    uint32_t stream_id;
+    uint32_t unique_id;
+    uint32_t start_frame_mm_time;
+    uint32_t end_frame_mm_time;
+    uint32_t num_frames;
+    uint32_t num_drops;
+    int32_t last_frame_delay;
+    uint32_t audio_delay;
+} SpiceMsgcDisplayStreamReport;
+
 typedef struct SpiceMsgCursorInit {
     SpicePoint16 position;
     uint16_t trail_length;
diff --git a/spice-protocol b/spice-protocol
index df6bc62..a04cc68 160000
--- a/spice-protocol
+++ b/spice-protocol
@@ -1 +1 @@
-Subproject commit df6bc6269ebd3144663cbdb8457fbe71d9202b6a
+Subproject commit a04cc68ba16c5ad8cf1f35b61c1464ef96bdfb0c
diff --git a/spice.proto b/spice.proto
index 655352a..97d1e1b 100644
--- a/spice.proto
+++ b/spice.proto
@@ -890,6 +890,13 @@ channel DisplayChannel : BaseChannel {
 	} data;
     } draw_composite;
 
+    message {
+        uint32 stream_id;
+        uint32 unique_id;
+        uint32 max_window_size;
+        uint32 timeout_ms;
+    } stream_activate_report;
+
  client:
     message {
 	uint8 pixmap_cache_id;
@@ -897,6 +904,17 @@ channel DisplayChannel : BaseChannel {
 	uint8 glz_dictionary_id;
 	int32 glz_dictionary_window_size;  // in pixels
     } init = 101;
+
+    message {
+        uint32 stream_id;
+        uint32 unique_id;
+        uint32 start_frame_mm_time;
+        uint32 end_frame_mm_time;
+        uint32 num_frames;
+        uint32 num_drops;
+        int32 last_frame_delay;
+        uint32 audio_delay;
+    } stream_report;
 };
 
 flags16 keyboard_modifier_flags {