[Spice-commits] src/channel-display.c src/channel-display-mjpeg.c

[GitLab Mirror]

 src/channel-display-mjpeg.c |    1 +
 src/channel-display.c       |    5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit fbf61c0aead3e86f75a9420be1e700189e734b5a
Author: Snir Sheriber <ssheribe at redhat.com>
Date:   Sun Jul 15 16:43:40 2018 +0300

    Update dropping frames debug messages
    
    Decoded frames are not necessarily dropped, update related debug
    messages and comment
    
    Signed-off-by: Snir Sheriber <ssheribe at redhat.com>
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/src/channel-display-mjpeg.c b/src/channel-display-mjpeg.c
index 7b2f775..6f7ded6 100644
--- a/src/channel-display-mjpeg.c
+++ b/src/channel-display-mjpeg.c
@@ -262,6 +262,7 @@ static gboolean mjpeg_decoder_queue_frame(VideoDecoder *video_decoder,
      * So drop late frames as early as possible to save on processing time.
      */
     if (latency < 0) {
+        SPICE_DEBUG("dropping a late MJPEG frame");
         frame->free(frame);
         return TRUE;
     }
diff --git a/src/channel-display.c b/src/channel-display.c
index 44ba043..993d9b7 100644
--- a/src/channel-display.c
+++ b/src/channel-display.c
@@ -1544,11 +1544,14 @@ static void display_handle_stream_data(SpiceChannel *channel, SpiceMsgIn *in)
 
     latency = op->multi_media_time - mmtime;
     if (latency < 0) {
-        CHANNEL_DEBUG(channel, "stream data too late by %u ms (ts: %u, mmtime: %u), dropping",
+        CHANNEL_DEBUG(channel, "stream data too late by %u ms (ts: %u, mmtime: %u)",
                       mmtime - op->multi_media_time, op->multi_media_time, mmtime);
         st->arrive_late_time += mmtime - op->multi_media_time;
         st->arrive_late_count++;
 
+        /* Late frames are counted as drops in the stats but aren't necessarily dropped - depends
+         * on codec and decoder
+         */
         if (!st->cur_drops_seq_stats.len) {
             st->cur_drops_seq_stats.start_mm_time = op->multi_media_time;
         }