[Spice-commits] 2 commits - src/channel-display.c src/channel-display-priv.h

[GitLab Mirror]

 src/channel-display-priv.h |    4 ++--
 src/channel-display.c      |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit aae7fc74be3670a4a2b4f5bfb14c8b27e072cb17
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Thu May 9 18:31:27 2019 +0100

    channel-display: Use proper sized maximum
    
    "audio_delay" is 32 bit as defined by protocol.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Snir Sheriber <ssheribe at redhat.com>

diff --git a/src/channel-display.c b/src/channel-display.c
index b26326d..9a83c53 100644
--- a/src/channel-display.c
+++ b/src/channel-display.c
@@ -1473,7 +1473,7 @@ static void display_update_stream_report(SpiceDisplayChannel *channel, uint32_t
         if (spice_session_is_playback_active(session)) {
             report.audio_delay = spice_session_get_playback_latency(session);
         } else {
-            report.audio_delay = UINT_MAX;
+            report.audio_delay = UINT32_MAX;
         }
 
         msg = spice_msg_out_new(SPICE_CHANNEL(channel), SPICE_MSGC_DISPLAY_STREAM_REPORT);
commit fed427738e10e7ac4bcea1c3a763dbf9e82565f6
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Thu May 9 18:30:45 2019 +0100

    Replace some missing "latency" terms
    
    This follows up commit 887aedff41bdb89845e7cb349454a8dcbb515db4
    "The video latency is in fact a margin".
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Snir Sheriber <ssheribe at redhat.com>

diff --git a/src/channel-display-priv.h b/src/channel-display-priv.h
index 495df7a..16c12c6 100644
--- a/src/channel-display-priv.h
+++ b/src/channel-display-priv.h
@@ -63,12 +63,12 @@ struct VideoDecoder {
      *
      * @decoder:   The video decoder.
      * @frame:     The compressed Spice frame.
-     * @latency:   How long in milliseconds until the frame should be
+     * @margin:    How long in milliseconds until the frame should be
      *             displayed. Negative values mean the frame is late.
      * @return:    False if the decoder can no longer decode frames,
      *             True otherwise.
      */
-    gboolean (*queue_frame)(VideoDecoder *video_decoder, SpiceFrame *frame, int latency);
+    gboolean (*queue_frame)(VideoDecoder *video_decoder, SpiceFrame *frame, int margin);
 
     /* The format of the encoded video. */
     int codec_type;