From 40a3cc2ecb8e3debdf4960e4195178829ec13cbf Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Wed, 10 Jul 2019 20:55:01 -0700
Subject: [PATCH] Tweak on-screen overlay a bit

---
 .../binding/video/MediaCodecDecoderRenderer.java      |  5 +++--
 app/src/main/res/layout/activity_game.xml             | 11 +++++++----
 app/src/main/res/values/dimens.xml                    |  3 ---
 app/src/main/res/values/strings.xml                   |  4 ++--
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/limelight/binding/video/MediaCodecDecoderRenderer.java b/app/src/main/java/com/limelight/binding/video/MediaCodecDecoderRenderer.java
index e46f15e7..7bcc8a37 100644
--- a/app/src/main/java/com/limelight/binding/video/MediaCodecDecoderRenderer.java
+++ b/app/src/main/java/com/limelight/binding/video/MediaCodecDecoderRenderer.java
@@ -622,6 +622,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
                     decoder = "(unknown)";
                 }
 
+                float decodeTimeMs = (float)lastTwo.decoderTimeMs / lastTwo.totalFramesReceived;
                 String perfText = context.getString(
                         R.string.perf_overlay_text,
                         initialWidth + "x" + initialHeight,
@@ -630,8 +631,8 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
                         fps.receivedFps,
                         fps.renderedFps,
                         (float)lastTwo.framesLost / lastTwo.totalFrames * 100,
-                        (float)lastTwo.totalTimeMs / lastTwo.totalFramesReceived,
-                        (float)lastTwo.decoderTimeMs / lastTwo.totalFramesReceived);
+                        ((float)lastTwo.totalTimeMs / lastTwo.totalFramesReceived) - decodeTimeMs,
+                        decodeTimeMs);
                 perfListener.onPerfUpdate(perfText);
             }
 
diff --git a/app/src/main/res/layout/activity_game.xml b/app/src/main/res/layout/activity_game.xml
index 4a67cd70..9bf4bee5 100644
--- a/app/src/main/res/layout/activity_game.xml
+++ b/app/src/main/res/layout/activity_game.xml
@@ -14,19 +14,22 @@
         android:id="@+id/performanceOverlay"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="3dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="10dp"
         android:layout_gravity="left"
         android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textSize="@dimen/font_size_tiny"
         android:gravity="left"
+        android:background="#80000000"
         android:visibility="gone" />
 
     <TextView
         android:id="@+id/notificationOverlay"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginStart="10dp"
+        android:layout_marginRight="10dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginTop="10dp"
         android:layout_gravity="right"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:gravity="right"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 3e290a3d..55c1e590 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -4,7 +4,4 @@
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
 
-    <!-- General sizes -->
-    <dimen name="font_size_tiny">8sp</dimen>
-
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 96413b72..7e2eb098 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -86,7 +86,7 @@
     <string name="delete_pc_msg">Are you sure you want to delete this PC?</string>
     <string name="slow_connection_msg">Slow connection to PC\nReduce your bitrate</string>
     <string name="poor_connection_msg">Poor connection to PC</string>
-    <string name="perf_overlay_text">Video dimensions: %1$s\nDecoder: %2$s\nEstimated host PC frame rate: %3$.2f FPS\nIncoming frame rate from network: %4$.2f FPS\nRendering frame rate: %5$.2f FPS\nFrames dropped by your network connection: %6$.2f%%\nAverage frame time: %7$.2f ms\nAverage decoding time: %8$.2f ms</string>
+    <string name="perf_overlay_text">Video dimensions: %1$s\nDecoder: %2$s\nEstimated host PC frame rate: %3$.2f FPS\nIncoming frame rate from network: %4$.2f FPS\nRendering frame rate: %5$.2f FPS\nFrames dropped by your network connection: %6$.2f%%\nAverage receive time: %7$.2f ms\nAverage decoding time: %8$.2f ms</string>
 
     <!-- AppList activity -->
     <string name="applist_connect_msg">Connecting to PC…</string>
@@ -187,6 +187,6 @@
     <string name="title_enable_hdr">Enable HDR (Experimental)</string>
     <string name="summary_enable_hdr">Stream HDR when the game and PC GPU support it. HDR requires a GTX 1000 series GPU or later.</string>
     <string name="title_enable_perf_overlay">Enable performance overlay</string>
-    <string name="summary_enable_perf_overlay">Display performance stats overlay</string>
+    <string name="summary_enable_perf_overlay">Display an on-screen overlay with real-time performance information while streaming</string>
 
 </resources>