Add primitive bitsteam indicator to overlay

4 files changed, 50 insertions, 8 deletions

diff --git a/decode.c b/decode.c
index f58538f..2f86a3f 100644
--- a/decode.c
+++ b/decode.c
@@ -51,6 +51,8 @@ struct DecodeContext {
 
   struct Buffer buffer;
   struct Surface** surfaces;
+
+  size_t bitrate;
 };
 
 static const char* VaStatusString(VAStatus status) {
@@ -492,10 +494,17 @@ again:
     }
 
     BufferDiscard(&decode_context->buffer, sizeof(uint32_t) + packet_size);
+    decode_context->bitrate += (sizeof(uint32_t) + packet_size) * 8;
     goto again;
   }
 }
 
+void DecodeContextGetStats(struct DecodeContext* decode_context,
+                           struct DecodeStats* decode_stats) {
+  decode_stats->bitrate = decode_context->bitrate;
+  decode_context->bitrate = 0;
+}
+
 void DecodeContextDestroy(struct DecodeContext* decode_context) {
   BufferDestroy(&decode_context->buffer);
   MFXClose(decode_context->mfx_session);
diff --git a/decode.h b/decode.h
index 61f8203..730e926 100644
--- a/decode.h
+++ b/decode.h
@@ -25,8 +25,14 @@ struct DecodeContext;
 struct Frame;
 struct Window;
 
+struct DecodeStats {
+  size_t bitrate;
+};
+
 struct DecodeContext* DecodeContextCreate(struct Window* window);
 bool DecodeContextDecode(struct DecodeContext* decode_context, int fd);
+void DecodeContextGetStats(struct DecodeContext* decode_context,
+                           struct DecodeStats* decode_stats);
 void DecodeContextDestroy(struct DecodeContext* decode_context);
 
 #endif  // RECEIVER_DECODE_H_
diff --git a/main.c b/main.c
index f6c61fe..b730c70 100644
--- a/main.c
+++ b/main.c
@@ -30,11 +30,13 @@
 
 #include "decode.h"
 #include "input.h"
+#include "pui/font.h"
+#include "toolbox/perf.h"
 #include "toolbox/utils.h"
 #include "window.h"
 
 #define OVERLAY_WIDTH 256
-#define OVERLAY_HEIGHT 64
+#define OVERLAY_HEIGHT 20
 
 static volatile sig_atomic_t g_signal;
 static void OnSignal(int status) { g_signal = status; }
@@ -145,18 +147,28 @@ static void DecodeContextDtor(struct DecodeContext** decode_context) {
   *decode_context = NULL;
 }
 
-static void RenderOverlay(struct Overlay* overlay) {
+static void RenderOverlay(struct Overlay* overlay, uint64_t clock_delta,
+                          const struct DecodeStats* decode_stats) {
   uint32_t* buffer = OverlayLock(overlay);
   if (!buffer) {
     LOG("Failed to lock overlay");
     return;
   }
 
-  for (int y = 0; y < OVERLAY_HEIGHT; y++) {
-    for (int x = 0; x < OVERLAY_WIDTH; x++) {
+  char bitrate[64];
+  snprintf(bitrate, sizeof(bitrate), "Bitrate: %zu Kbps",
+           decode_stats->bitrate * 1000000 / clock_delta / 1024);
+  size_t overlay_width = PuiStringWidth(bitrate) + 8;
+
+  memset(buffer, 0, OVERLAY_HEIGHT * OVERLAY_WIDTH * 4);
+  for (size_t y = 0; y < OVERLAY_HEIGHT; y++) {
+    for (size_t x = 0; x < overlay_width; x++)
       buffer[x + y * OVERLAY_WIDTH] = 0x40000000;
-    }
   }
+
+  PuiStringRender(bitrate, buffer + OVERLAY_WIDTH * 4 + 4, OVERLAY_WIDTH,
+                  0xffffffff);
+
   OverlayUnlock(overlay);
 }
 
@@ -205,7 +217,7 @@ int main(int argc, char* argv[]) {
 
   struct Overlay __attribute__((cleanup(OverlayDtor)))* overlay = NULL;
   if (stats) {
-    overlay = OverlayCreate(window, 0, 0, OVERLAY_WIDTH, OVERLAY_HEIGHT);
+    overlay = OverlayCreate(window, 4, 4, OVERLAY_WIDTH, OVERLAY_HEIGHT);
     if (!overlay) {
       LOG("Failed to create overlay");
       return EXIT_FAILURE;
@@ -232,6 +244,7 @@ int main(int argc, char* argv[]) {
     return EXIT_FAILURE;
   }
 
+  uint64_t before = MicrosNow();
   while (!g_signal) {
     struct pollfd pfds[] = {
         {.fd = sock, .events = POLLIN},
@@ -249,7 +262,17 @@ int main(int argc, char* argv[]) {
       default:
         break;
     }
-    if (overlay) RenderOverlay(overlay);
+    if (overlay) {
+      uint64_t after = MicrosNow();
+      static const uint64_t timeout = 5 * 1000 * 1000;
+      uint64_t time_delta = after - before;
+      if (time_delta > timeout) {
+        struct DecodeStats decode_stats;
+        DecodeContextGetStats(decode_context, &decode_stats);
+        RenderOverlay(overlay, time_delta, &decode_stats);
+        before = after;
+      }
+    }
     if (pfds[0].revents && !DecodeContextDecode(decode_context, sock)) {
       LOG("Failed to decode incoming data");
       return EXIT_FAILURE;
diff --git a/makefile b/makefile
index 367c04f..9983247 100644
--- a/makefile
+++ b/makefile
@@ -3,7 +3,11 @@ src:=$(wildcard *.c)
 obj:=$(src:.c=.o)
 
 obj+=\
-	toolbox/buffer.o
+	pui/font.o \
+	pui/font_cp00.o \
+	pui/font_cp04.o \
+	toolbox/buffer.o \
+	toolbox/perf.o
 
 libs:=\
 	libva \