Changeset 4208

Timestamp:

02/08/10 23:40:20 (5 weeks ago)

Author:

andoma

Message:

Add displaying of some stats when playing video

Location:

trunk/showtime

Files:

• glwthemes/default/pages/video.view (modified) (1 diff)
• glwthemes/default/universe.view (modified) (1 diff)
• src/audio/audio_decoder.c (modified) (2 diffs)
• src/event.c (modified) (2 diffs)
• src/event.h (modified) (1 diff)
• src/media.c (modified) (22 diffs)
• src/media.h (modified) (5 diffs)
• src/video/video_decoder.c (modified) (5 diffs)
• src/video/video_decoder.h (modified) (2 diffs)

trunk/showtime/glwthemes/default/pages/video.view

@@ -29 +29 @@
       });
     });
+
+    widget(label, {
+      .alpha = $self.media.stats;
+      .caption = "Video queue len: " + int2str($self.media.video.dqlen);
+    });
+
+    widget(label, {
+      .alpha = $self.media.stats;
+      .caption = "Audio queue len: " + int2str($self.media.audio.dqlen);
+    });
+
+    widget(label, {
+      .alpha = $self.media.stats;
+      .caption = "Video decode time: " +
+        int2str($self.media.video.decodetime_avg) + " ms";
+    });
   });
 });

trunk/showtime/glwthemes/default/universe.view

@@ -295 +295 @@
                 });
 
+                widget(container_x, {
+                  
+                  widget(label, {
+                    .align = right;
+                    .caption = "Show stats";
+                  });
+
+                  widget(backdrop, {
+                    
+                    BUTTON_PROPS(1.0);
+    
+                    onEvent(enter, event(MediaStats))
+                    
+                    widget(label, {
+                      .align = left;
+                      .caption = translate($global.media.current.stats,
+                                           "Unknown",
+                                           0, "Off",
+                                           1, "On");
+                    });
+                  });
+                });
+
                 HORIZONTAL_SEPARATOR($global.media.current.type != "video");
               });

trunk/showtime/src/audio/audio_decoder.c

@@ -149 +149 @@
     TAILQ_REMOVE(&mq->mq_q, mb, mb_link);
     mq->mq_len--;
+    if(mp->mp_stats)
+      prop_set_int(mq->mq_prop_qlen_cur, mq->mq_len);
     hts_cond_signal(&mp->mp_backpressure);
     hts_mutex_unlock(&mp->mp_mutex);
@@ -329 +331 @@
     data_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
     r = avcodec_decode_audio2(ctx, ad->ad_outbuf, &data_size, buf, size);
+
     if(r == -1)
       break;

trunk/showtime/src/event.c

@@ -184 +184 @@
   { "Increase",              ACTION_INCR },
   { "Decrease",              ACTION_DECR },
+  { "MediaStats",            ACTION_SHOW_MEDIA_STATS },
 };
 
@@ -365 +366 @@
             event_is_action(e, ACTION_PREV_TRACK) ||
             event_is_action(e, ACTION_NEXT_TRACK) ||
-            event_is_action(e, ACTION_RESTART_TRACK)) {
+            event_is_action(e, ACTION_RESTART_TRACK) ||
+            event_is_action(e, ACTION_SHOW_MEDIA_STATS)
+            ) {
 
     event_to_prop(prop_get_by_name(PNVEC("global", "media", "eventsink"),

trunk/showtime/src/event.h

@@ -82 +82 @@
   ACTION_RELOAD_UI,
 
+  ACTION_SHOW_MEDIA_STATS,
+
   ACTION_last_mappable
 } action_type_t;

trunk/showtime/src/media.c

@@ -41 +41 @@
 static void seek_by_propchange(void *opaque, prop_event_t event, ...);
 
-static void update_avdelta(void *opaque, prop_event_t event, ...);
+static void update_avdelta(void *opaque, int value);
+
+static void update_stats(void *opaque, int value);
 
 static void media_eventsink(void *opaque, prop_event_t event, ...);
@@ -96 +98 @@
   mq->mq_stream = -1;
   hts_cond_init(&mq->mq_avail);
-  mq->mq_prop_qlen_cur = prop_create(p, "qlen");
-  mq->mq_prop_qlen_max = prop_create(p, "qmax");
+  mq->mq_prop_qlen_cur = prop_create(p, "dqlen");
+  mq->mq_prop_qlen_max = prop_create(p, "dqmax");
+
+  mq->mq_prop_decode_avg  = prop_create(p, "decodetime_avg");
+  mq->mq_prop_decode_peak = prop_create(p, "decodetime_peak");
+
+  mq->mq_prop_upload_avg  = prop_create(p, "uploadtime_avg");
+  mq->mq_prop_upload_peak = prop_create(p, "uploadtime_peak");
 }
 
@@ -139 +147 @@
   }
 
-  mq_init(&mp->mp_audio, prop_create(mp->mp_prop_root, "audio"));
-  mq_init(&mp->mp_video, prop_create(mp->mp_prop_root, "video"));
+  mp->mp_prop_audio = prop_create(mp->mp_prop_root, "audio");
+  mq_init(&mp->mp_audio, mp->mp_prop_audio);
+
+  mp->mp_prop_video = prop_create(mp->mp_prop_root, "video");
+  mq_init(&mp->mp_video, mp->mp_prop_video);
 
   mp->mp_prop_metadata    = prop_create(mp->mp_prop_root, "metadata");
@@ -147 +158 @@
   mp->mp_prop_avdelta     = prop_create(mp->mp_prop_root, "avdelta");
   prop_set_float(mp->mp_prop_avdelta, 0);
+
+  mp->mp_prop_stats       = prop_create(mp->mp_prop_root, "stats");
+  prop_set_int(mp->mp_prop_stats, mp->mp_stats);
 
   mp->mp_prop_url         = prop_create(mp->mp_prop_root, "url");
@@ -176 +190 @@
   mp->mp_sub_avdelta = 
     prop_subscribe(PROP_SUB_NO_INITIAL_UPDATE,
-                   PROP_TAG_CALLBACK, update_avdelta, mp,
+                   PROP_TAG_CALLBACK_INT, update_avdelta, mp,
                    PROP_TAG_COURIER, mp->mp_pc,
                    PROP_TAG_ROOT, mp->mp_prop_avdelta,
+                   NULL);
+
+  mp->mp_sub_stats =
+    prop_subscribe(PROP_SUB_NO_INITIAL_UPDATE,
+                   PROP_TAG_CALLBACK_INT, update_stats, mp,
+                   PROP_TAG_COURIER, mp->mp_pc,
+                   PROP_TAG_ROOT, mp->mp_prop_stats,
                    NULL);
   return mp;
@@ -199 +220 @@
   prop_unsubscribe(mp->mp_sub_currenttime);
   prop_unsubscribe(mp->mp_sub_avdelta);
+  prop_unsubscribe(mp->mp_sub_stats);
 
   prop_courier_destroy(mp->mp_pc);
@@ -319 +341 @@
  */
 static void
-mb_enq_tail(media_queue_t *mq, media_buf_t *mb)
+mb_enq_tail(media_pipe_t *mp, media_queue_t *mq, media_buf_t *mb)
 {
   TAILQ_INSERT_TAIL(&mq->mq_q, mb, mb_link);
   mq->mq_len++;
+  if(mp->mp_stats)
+    prop_set_int(mq->mq_prop_qlen_cur, mq->mq_len);
   hts_cond_signal(&mq->mq_avail);
-  prop_set_int(mq->mq_prop_qlen_cur, mq->mq_len);
-}
-
-/**
- *
- */
-static void
-mb_enq_head(media_queue_t *mq, media_buf_t *mb)
+}
+
+/**
+ *
+ */
+static void
+mb_enq_head(media_pipe_t *mp, media_queue_t *mq, media_buf_t *mb)
 {
   TAILQ_INSERT_HEAD(&mq->mq_q, mb, mb_link);
   mq->mq_len++;
+  if(mp->mp_stats)
+    prop_set_int(mq->mq_prop_qlen_cur, mq->mq_len);
   hts_cond_signal(&mq->mq_avail);
-  prop_set_int(mq->mq_prop_qlen_cur, mq->mq_len);
 }
 
@@ -368 +392 @@
   }
 
-  mb_enq_tail(mq, mb);
+  mb_enq_tail(mp, mq, mb);
   hts_mutex_unlock(&mp->mp_mutex);
   return NULL;
@@ -402 +426 @@
   }
   
-  mb_enq_tail(mq, mb);
+  mb_enq_tail(mp, mq, mb);
   hts_mutex_unlock(&mp->mp_mutex);
   return 0;
@@ -415 +439 @@
 {
   hts_mutex_lock(&mp->mp_mutex);
-  mb_enq_tail(mq, mb);
-  hts_mutex_unlock(&mp->mp_mutex);
-}
-
-
-/*
+  mb_enq_tail(mp, mq, mb);
+  hts_mutex_unlock(&mp->mp_mutex);
+}
+
+
+/**
  * Must be called with mp locked
  */
-
-void
-mq_flush(media_queue_t *mq)
+static void
+mq_flush(media_pipe_t *mp, media_queue_t *mq)
 {
   media_buf_t *mb;
@@ -434 +457 @@
   }
   mq->mq_len = 0;
+  if(mp->mp_stats)
+    prop_set_int(mq->mq_prop_qlen_cur, mq->mq_len);
 }
 
@@ -450 +475 @@
   hts_mutex_lock(&mp->mp_mutex);
 
-  mq_flush(a);
-  mq_flush(v);
+  mq_flush(mp, a);
+  mq_flush(mp, v);
 
   if(v->mq_stream >= 0) {
     mb = media_buf_alloc();
     mb->mb_data_type = MB_FLUSH;
-    mb_enq_tail(v, mb);
+    mb_enq_tail(mp, v, mb);
   }
 
@@ -462 +487 @@
     mb = media_buf_alloc();
     mb->mb_data_type = MB_FLUSH;
-    mb_enq_tail(a, mb);
+    mb_enq_tail(mp, a, mb);
   }
   hts_mutex_unlock(&mp->mp_mutex);
@@ -483 +508 @@
     mb = media_buf_alloc();
     mb->mb_data_type = MB_END;
-    mb_enq_tail(v, mb);
+    mb_enq_tail(mp, v, mb);
   }
 
@@ -489 +514 @@
     mb = media_buf_alloc();
     mb->mb_data_type = MB_END;
-    mb_enq_tail(a, mb);
+    mb_enq_tail(mp, a, mb);
   }
   hts_mutex_unlock(&mp->mp_mutex);
@@ -529 +554 @@
   mb->mb_data = NULL;
   mb->mb_data_type = cmd;
-  mb_enq_tail(mq, mb);
+  mb_enq_tail(mp, mq, mb);
   hts_mutex_unlock(&mp->mp_mutex);
 }
@@ -547 +572 @@
   mb->mb_data = NULL;
   mb->mb_data_type = cmd;
-  mb_enq_head(mq, mb);
+  mb_enq_head(mp, mq, mb);
   hts_mutex_unlock(&mp->mp_mutex);
 }
@@ -566 +591 @@
   mb->mb_data_type = cmd;
   mb->mb_data = d;
-  mb_enq_tail(mq, mb);
+  mb_enq_tail(mp, mq, mb);
   hts_mutex_unlock(&mp->mp_mutex);
 }
@@ -586 +611 @@
   mb->mb_data = NULL;
   mb->mb_data32 = u;
-  mb_enq_head(mq, mb);
+  mb_enq_head(mp, mq, mb);
   hts_mutex_unlock(&mp->mp_mutex);
 }
@@ -606 +631 @@
   mb->mb_data = NULL;
   mb->mb_data32 = u;
-  mb_enq_tail(mq, mb);
+  mb_enq_tail(mp, mq, mb);
   hts_mutex_unlock(&mp->mp_mutex);
 }
@@ -968 +993 @@
  */
 static void
-update_avdelta(void *opaque, prop_event_t event, ...)
+update_avdelta(void *opaque, int v)
 {
   media_pipe_t *mp = opaque;
-  int t;
-
-  va_list ap;
-  va_start(ap, event);
-
-  switch(event) {
-  case PROP_SET_INT:
-    t = va_arg(ap, int);
-    break;
-  case PROP_SET_FLOAT:
-    t = va_arg(ap, double);
-    break;
-  default:
-    return;
-  }
-
-  mp->mp_avdelta = t * 1000;
-  TRACE(TRACE_DEBUG, "AVSYNC", "Set to %d ms", t);
+  mp->mp_avdelta = v * 1000;
+  TRACE(TRACE_DEBUG, "AVSYNC", "Set to %d ms", v);
+}
+
+
+/**
+ *
+ */
+static void
+update_stats(void *opaque, int v)
+{
+  media_pipe_t *mp = opaque;
+  mp->mp_stats = v;
 }
 
@@ -1023 +1043 @@
 
   if(media_primary != NULL) {
-    mp_enqueue_event(media_primary, e);
+
+
+    if(event_is_action(e, ACTION_SHOW_MEDIA_STATS)) {
+      prop_toggle_int(media_primary->mp_prop_stats);
+    } else {
+      mp_enqueue_event(media_primary, e);
+    }
   } else {
     playqueue_event_handler(e);

trunk/showtime/src/media.h

@@ -133 +133 @@
   prop_t *mq_prop_qlen_cur;
   prop_t *mq_prop_qlen_max;
+
+  prop_t *mq_prop_decode_avg;
+  prop_t *mq_prop_decode_peak;
+
+  prop_t *mq_prop_upload_avg;
+  prop_t *mq_prop_upload_peak;
 } media_queue_t;
 
@@ -160 +166 @@
   int mp_audio_clock_epoch;
   int mp_avdelta;
+  int mp_stats;
 
   struct audio_decoder *mp_audio_decoder;
@@ -172 +179 @@
   prop_t *mp_prop_currenttime;
   prop_t *mp_prop_avdelta;
+  prop_t *mp_prop_stats;
   prop_t *mp_prop_url;
 
@@ -180 +188 @@
   prop_t *mp_prop_canEject;
 
+  prop_t *mp_prop_video;
+  prop_t *mp_prop_audio;
+
   prop_courier_t *mp_pc;
   prop_sub_t *mp_sub_currenttime;
   prop_sub_t *mp_sub_avdelta;
+  prop_sub_t *mp_sub_stats;
 
 } media_pipe_t;
@@ -222 +234 @@
 void mp_ref_dec(media_pipe_t *mp);
 
-void mq_flush(media_queue_t *mq);
-
 int mb_enqueue_no_block(media_pipe_t *mp, media_queue_t *mq, media_buf_t *mb);
 event_t *mb_enqueue_with_events(media_pipe_t *mp, media_queue_t *mq, 

trunk/showtime/src/video/video_decoder.c

@@ -36 +36 @@
 #include "yadif.h"
 #include "event.h"
-
-#include "misc/perftimer.h"
 
 static void
@@ -164 +162 @@
 
 static void 
-vd_decode_video(video_decoder_t *vd, media_buf_t *mb)
+vd_decode_video(video_decoder_t *vd, media_queue_t *mq, media_buf_t *mb)
 {
   int64_t pts, dts, t;
@@ -202 +200 @@
     vd->vd_skip = 1;
 
-  //  static perftimer_t pt;
-  //  perftimer_start(&pt);
+  if(mp->mp_stats)
+    avgtime_start(&vd->vd_decode_time);
+
   avcodec_decode_video(ctx, frame, &got_pic, mb->mb_data, mb->mb_size);
-  //  perftimer_stop(&pt, "videodecode");
+
+  if(mp->mp_stats)
+    avgtime_stop(&vd->vd_decode_time, mq->mq_prop_decode_avg,
+                 mq->mq_prop_decode_peak);
 
   if(got_pic == 0 || mb->mb_skip == 1) 
@@ -373 +375 @@
     TAILQ_REMOVE(&mq->mq_q, mb, mb_link);
     mq->mq_len--;
+    if(mp->mp_stats)
+      prop_set_int(mq->mq_prop_qlen_cur, mq->mq_len);
+
     hts_cond_signal(&mp->mp_backpressure);
     hts_mutex_unlock(&mp->mp_mutex);
@@ -395 +400 @@
 
     case MB_VIDEO:
-      vd_decode_video(vd, mb);
+      vd_decode_video(vd, mq, mb);
       break;
 

trunk/showtime/src/video/video_decoder.h

@@ -21 +21 @@
 
 #include "media.h"
+#include "misc/avgtime.h"
 
 struct AVCodecContext;
@@ -202 +203 @@
 #endif
   
+  /* stats */
+
+  avgtime_t vd_decode_time;
+  avgtime_t vd_upload_time;
+
+
   /* Kalman filter for AVdiff compensation */