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.
This commit is contained in:
Yonit Halperin 2012-05-02 14:59:19 +03:00
parent 21b857f3ce
commit 0f1fb0ecc2
3 changed files with 7 additions and 5 deletions

View File

@ -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)

View File

@ -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,

@ -1 +1 @@
Subproject commit 178c7eaff6fa45b9051bb4d3cf90f45ea9319f83
Subproject commit 22fc0b0145876b90385c1c88923bcd72a6380812