summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYonit Halperin <yhalperi@redhat.com>2012-05-02 14:59:19 +0300
committerYonit Halperin <yhalperi@redhat.com>2012-05-03 12:31:03 +0300
commit0f1fb0ecc2a2f5a3086b7697e26228c16b97693e (patch)
tree93923d1b821a1841b737ed8edff93af8c23f7a2f
parent21b857f3ce568735a8c7951652f3e412d69b6df8 (diff)
downloadspice-0f1fb0ecc2a2f5a3086b7697e26228c16b97693e.tar.gz
spice-0f1fb0ecc2a2f5a3086b7697e26228c16b97693e.tar.xz
spice-0f1fb0ecc2a2f5a3086b7697e26228c16b97693e.zip
Update the spice-common submodule
spice-common changes: STREAM_DATA_SIZED message was added in order to support video streams with frames that their size is different from the initial size that the stream was created with. This patch also includes server and client adjustments to the new SpiceMsgDisplayStreamData.
-rw-r--r--client/display_channel.cpp6
-rw-r--r--server/red_worker.c4
m---------spice-common0
3 files changed, 6 insertions, 4 deletions
diff --git a/client/display_channel.cpp b/client/display_channel.cpp
index ebeacd2c..17bdf6a6 100644
--- a/client/display_channel.cpp
+++ b/client/display_channel.cpp
@@ -1419,7 +1419,7 @@ void DisplayChannel::handle_stream_data(RedPeer::InMessage* message)
SpiceMsgDisplayStreamData* stream_data = (SpiceMsgDisplayStreamData*)message->data();
VideoStream* stream;
- if (stream_data->id >= _streams.size() || !(stream = _streams[stream_data->id])) {
+ if (stream_data->base.id >= _streams.size() || !(stream = _streams[stream_data->base.id])) {
THROW("invalid stream");
}
@@ -1427,7 +1427,9 @@ void DisplayChannel::handle_stream_data(RedPeer::InMessage* message)
THROW("access violation");
}
- stream->push_data(stream_data->multi_media_time, stream_data->data_size, stream_data->data);
+ stream->push_data(stream_data->base.multi_media_time,
+ stream_data->data_size,
+ stream_data->data);
}
void DisplayChannel::handle_stream_clip(RedPeer::InMessage* message)
diff --git a/server/red_worker.c b/server/red_worker.c
index 85ad7b8a..823c25b6 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -8133,8 +8133,8 @@ static inline int red_marshall_stream_data(RedChannelClient *rcc,
SpiceMsgDisplayStreamData stream_data;
- stream_data.id = get_stream_id(worker, stream);
- stream_data.multi_media_time = drawable->red_drawable->mm_time;
+ stream_data.base.id = get_stream_id(worker, stream);
+ stream_data.base.multi_media_time = drawable->red_drawable->mm_time;
stream_data.data_size = n;
spice_marshall_msg_display_stream_data(base_marshaller, &stream_data);
spice_marshaller_add_ref(base_marshaller,
diff --git a/spice-common b/spice-common
-Subproject 178c7eaff6fa45b9051bb4d3cf90f45ea9319f8
+Subproject 22fc0b0145876b90385c1c88923bcd72a638081