[Spice-devel,04/11] client: handle the new SpiceMsgDisplayStreamData (common/messages.h)

Submitted by Yonit Halperin on April 8, 2012, 3:43 p.m.

Details

Message ID 1333899800-1341-4-git-send-email-yhalperi@redhat.com
State New
Headers show

Not browsing as part of any series.

Commit Message

Yonit Halperin April 8, 2012, 3:43 p.m.
SpiceMsgDisplayStreamData now contains SpiceStreamDataHeader,
which is shared with SpiceMsgDisplayStreamDataSized.

Signed-off-by: Yonit Halperin <yhalperi@redhat.com>
---
 client/display_channel.cpp |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/client/display_channel.cpp b/client/display_channel.cpp
index ebeacd2..17bdf6a 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)

Comments

On Sun, Apr 08, 2012 at 06:43:13PM +0300, Yonit Halperin wrote:
> SpiceMsgDisplayStreamData now contains SpiceStreamDataHeader,
> which is shared with SpiceMsgDisplayStreamDataSized.
> 
> Signed-off-by: Yonit Halperin <yhalperi@redhat.com>
> ---
>  client/display_channel.cpp |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)

I don't see a spice-protocol/spice-common update there, this means
compilation will be broken before or after this change.

Christophe
> 
> diff --git a/client/display_channel.cpp b/client/display_channel.cpp
> index ebeacd2..17bdf6a 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)
> -- 
> 1.7.7.6
> 
> _______________________________________________
> Spice-devel mailing list
> Spice-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/spice-devel
On 04/10/2012 01:31 PM, Christophe Fergeau wrote:
> On Sun, Apr 08, 2012 at 06:43:13PM +0300, Yonit Halperin wrote:
>> SpiceMsgDisplayStreamData now contains SpiceStreamDataHeader,
>> which is shared with SpiceMsgDisplayStreamDataSized.
>>
>> Signed-off-by: Yonit Halperin<yhalperi@redhat.com>
>> ---
>>   client/display_channel.cpp |    6 ++++--
>>   1 files changed, 4 insertions(+), 2 deletions(-)
>
> I don't see a spice-protocol/spice-common update there, this means
> compilation will be broken before or after this change.
>
The spice-common commit was part of patch 3 (d36f538). So the client 
build breaks after patch 3. I didn't want to put the sever & client 
patches in the same commit.
> Christophe
>>

>> diff --git a/client/display_channel.cpp b/client/display_channel.cpp
>> index ebeacd2..17bdf6a 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)
>> --
>> 1.7.7.6
>>
>> _______________________________________________
>> Spice-devel mailing list
>> Spice-devel@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/spice-devel
On Tue, Apr 10, 2012 at 01:37:25PM +0300, Yonit Halperin wrote:
> 
> On 04/10/2012 01:31 PM, Christophe Fergeau wrote:
> >On Sun, Apr 08, 2012 at 06:43:13PM +0300, Yonit Halperin wrote:
> >>SpiceMsgDisplayStreamData now contains SpiceStreamDataHeader,
> >>which is shared with SpiceMsgDisplayStreamDataSized.
> >>
> >>Signed-off-by: Yonit Halperin<yhalperi@redhat.com>
> >>---
> >>  client/display_channel.cpp |    6 ++++--
> >>  1 files changed, 4 insertions(+), 2 deletions(-)
> >
> >I don't see a spice-protocol/spice-common update there, this means
> >compilation will be broken before or after this change.
> >
> The spice-common commit was part of patch 3 (d36f538). So the client
> build breaks after patch 3. I didn't want to put the sever & client
> patches in the same commit.

I think it would be better to have a commit with only the spice-common
update + the changes to make sure everything compiles, and then do the
functional changes introduced by patch 3.

Christophe