Version 7.4

app/build.gradle

@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    buildToolsVersion '28.0.3'
-    compileSdkVersion 28
+    buildToolsVersion '29.0.0'
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 29
 
-        versionName "7.2"
-        versionCode = 191
+        versionName "7.4"
+        versionCode = 195
     }
 
     flavorDimensions "root"

app/src/main/java/com/limelight/Game.java

@@ -119,7 +119,8 @@ public class Game extends Activity implements SurfaceHolder.Callback,
     private MediaCodecDecoderRenderer decoderRenderer;
     private boolean reportedCrash;
 
-    private WifiManager.WifiLock wifiLock;
+    private WifiManager.WifiLock highPerfWifiLock;
+    private WifiManager.WifiLock lowLatencyWifiLock;
 
     private boolean connectedToUsbDriverService = false;
     private ServiceConnection usbDriverServiceConnection = new ServiceConnection() {
@@ -228,9 +229,15 @@ public class Game extends Activity implements SurfaceHolder.Callback,
 
         // Make sure Wi-Fi is fully powered up
         WifiManager wifiMgr = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
-        wifiLock = wifiMgr.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, "Limelight");
-        wifiLock.setReferenceCounted(false);
-        wifiLock.acquire();
+        highPerfWifiLock = wifiMgr.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, "Moonlight High Perf Lock");
+        highPerfWifiLock.setReferenceCounted(false);
+        highPerfWifiLock.acquire();
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            lowLatencyWifiLock = wifiMgr.createWifiLock(WifiManager.WIFI_MODE_FULL_LOW_LATENCY, "Moonlight Low Latency Lock");
+            lowLatencyWifiLock.setReferenceCounted(false);
+            lowLatencyWifiLock.acquire();
+        }
 
         String host = Game.this.getIntent().getStringExtra(EXTRA_HOST);
         String appName = Game.this.getIntent().getStringExtra(EXTRA_APP_NAME);
@@ -510,8 +517,17 @@ public class Game extends Activity implements SurfaceHolder.Callback,
             // Capture is lost when focus is lost, so it must be requested again
             // when focus is regained.
             if (inputCaptureProvider.isCapturingEnabled() && hasFocus) {
-                // Recapture the pointer if focus was regained
-                streamView.requestPointerCapture();
+                // Recapture the pointer if focus was regained. On Android Q,
+                // we have to delay a bit before requesting capture because otherwise
+                // we'll hit the "requestPointerCapture called for a window that has no focus"
+                // error and it will not actually capture the cursor.
+                Handler h = new Handler();
+                h.postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        streamView.requestPointerCapture();
+                    }
+                }, 500);
             }
         }
     }
@@ -702,7 +718,12 @@ public class Game extends Activity implements SurfaceHolder.Callback,
             inputManager.unregisterInputDeviceListener(controllerHandler);
         }
 
-        wifiLock.release();
+        if (lowLatencyWifiLock != null) {
+            lowLatencyWifiLock.release();
+        }
+        if (highPerfWifiLock != null) {
+            highPerfWifiLock.release();
+        }
 
         if (connectedToUsbDriverService) {
             // Unbind from the discovery service
@@ -1382,10 +1403,18 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                 connected = true;
                 connecting = false;
 
-                // Hide the mouse cursor now. Doing it before
-                // dismissing the spinner seems to be undone
-                // when the spinner gets displayed.
-                inputCaptureProvider.enableCapture();
+                // Hide the mouse cursor now after a short delay.
+                // Doing it before dismissing the spinner seems to be undone
+                // when the spinner gets displayed. On Android Q, even now
+                // is too early to capture. We will delay a second to allow
+                // the spinner to dismiss before capturing.
+                Handler h = new Handler();
+                h.postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        inputCaptureProvider.enableCapture();
+                    }
+                }, 500);
 
                 // Keep the display on
                 getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);

app/src/main/java/com/limelight/binding/audio/AndroidAudioRenderer.java

@@ -168,8 +168,17 @@ public class AndroidAudioRenderer implements AudioRenderer {
     }
 
     @Override
-    public void playDecodedAudio(byte[] audioData) {
-        track.write(audioData, 0, audioData.length);
+    public void playDecodedAudio(short[] audioData) {
+        // Only queue up to 40 ms of pending audio data in addition to what AudioTrack is buffering for us.
+        if (MoonBridge.getPendingAudioFrames() < 8) {
+            // This will block until the write is completed. That can cause a backlog
+            // of pending audio data, so we do the above check to be able to bound
+            // latency at 40 ms in that situation.
+            track.write(audioData, 0, audioData.length);
+        }
+        else {
+            LimeLog.info("Too many pending audio frames: " + MoonBridge.getPendingAudioFrames());
+        }
     }
 
     @Override

app/src/main/java/com/limelight/binding/input/ControllerHandler.java

@@ -335,17 +335,23 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
     }
 
     private static boolean isExternal(InputDevice dev) {
-        try {
-            // Landroid/view/InputDevice;->isExternal()Z is on the light graylist in Android P
-            return (Boolean)dev.getClass().getMethod("isExternal").invoke(dev);
-        } catch (NoSuchMethodException e) {
-            e.printStackTrace();
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        } catch (InvocationTargetException e) {
-            e.printStackTrace();
-        } catch (ClassCastException e) {
-            e.printStackTrace();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            // Landroid/view/InputDevice;->isExternal()Z is officially public on Android Q
+            return dev.isExternal();
+        }
+        else {
+            try {
+                // Landroid/view/InputDevice;->isExternal()Z is on the light graylist in Android P
+                return (Boolean)dev.getClass().getMethod("isExternal").invoke(dev);
+            } catch (NoSuchMethodException e) {
+                e.printStackTrace();
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            } catch (InvocationTargetException e) {
+                e.printStackTrace();
+            } catch (ClassCastException e) {
+                e.printStackTrace();
+            }
         }
 
         // Answer true if we don't know

app/src/main/java/com/limelight/binding/input/driver/AbstractXboxController.java

@@ -30,6 +30,18 @@ public abstract class AbstractXboxController extends AbstractController {
     private Thread createInputThread() {
         return new Thread() {
             public void run() {
+                try {
+                    // Delay for a moment before reporting the new gamepad and
+                    // accepting new input. This allows time for the old InputDevice
+                    // to go away before we reclaim its spot. If the old device is still
+                    // around when we call notifyDeviceAdded(), we won't be able to claim
+                    // the controller number used by the original InputDevice.
+                    Thread.sleep(1000);
+                } catch (InterruptedException e) {}
+
+                // Report that we're added _before_ reporting input
+                notifyDeviceAdded();
+
                 while (!isInterrupted() && !stopped) {
                     byte[] buffer = new byte[64];
 
@@ -114,9 +126,6 @@ public abstract class AbstractXboxController extends AbstractController {
             return false;
         }
 
-        // Report that we're added _before_ starting the input thread
-        notifyDeviceAdded();
-
         // Start listening for controller input
         inputThread = createInputThread();
         inputThread.start();

app/src/main/java/com/limelight/binding/video/MediaCodecHelper.java

@@ -474,6 +474,24 @@ public class MediaCodecHelper {
 		
 		return null;
 	}
+
+	private static boolean isCodecBlacklisted(MediaCodecInfo codecInfo) {
+		// Use the new isSoftwareOnly() function on Android Q
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+			if (codecInfo.isSoftwareOnly()) {
+				LimeLog.info("Skipping software-only decoder: "+codecInfo.getName());
+				return true;
+			}
+		}
+
+		// Check for explicitly blacklisted decoders
+		if (isDecoderInList(blacklistedDecoderPrefixes, codecInfo.getName())) {
+			LimeLog.info("Skipping blacklisted decoder: "+codecInfo.getName());
+			return true;
+		}
+
+		return false;
+	}
 	
 	public static MediaCodecInfo findFirstDecoder(String mimeType) {
 		for (MediaCodecInfo codecInfo : getMediaCodecList()) {
@@ -482,15 +500,14 @@ public class MediaCodecHelper {
 				continue;
 			}
 			
-			// Check for explicitly blacklisted decoders
-			if (isDecoderInList(blacklistedDecoderPrefixes, codecInfo.getName())) {
-				LimeLog.info("Skipping blacklisted decoder: "+codecInfo.getName());
-				continue;
-			}
-			
 			// Find a decoder that supports the specified video format
 			for (String mime : codecInfo.getSupportedTypes()) {
 				if (mime.equalsIgnoreCase(mimeType)) {
+					// Skip blacklisted codecs
+					if (isCodecBlacklisted(codecInfo)) {
+						continue;
+					}
+
 					LimeLog.info("First decoder choice is "+codecInfo.getName());
 					return codecInfo;
 				}
@@ -530,17 +547,16 @@ public class MediaCodecHelper {
 				continue;
 			}
 			
-			// Check for explicitly blacklisted decoders
-			if (isDecoderInList(blacklistedDecoderPrefixes, codecInfo.getName())) {
-				LimeLog.info("Skipping blacklisted decoder: "+codecInfo.getName());
-				continue;
-			}
-			
 			// Find a decoder that supports the requested video format
 			for (String mime : codecInfo.getSupportedTypes()) {
 				if (mime.equalsIgnoreCase(mimeType)) {
 					LimeLog.info("Examining decoder capabilities of "+codecInfo.getName());
 
+					// Skip blacklisted codecs
+					if (isCodecBlacklisted(codecInfo)) {
+						//continue;
+					}
+
 					CodecCapabilities caps = codecInfo.getCapabilitiesForType(mime);
 
 					if (requiredProfile != -1) {

app/src/main/res/drawable/ic_pc_offline.xml

@@ -1,9 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="128dp"
-        android:height="128dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:pathData="M23.64,7c-0.45,-0.34 -4.93,-4 -11.64,-4 -1.5,0 -2.89,0.19 -4.15,0.48L18.18,13.8 23.64,7zM17.04,15.22L3.27,1.44 2,2.72l2.05,2.06C1.91,5.76 0.59,6.82 0.36,7l11.63,14.49 0.01,0.01 0.01,-0.01 3.9,-4.86 3.32,3.32 1.27,-1.27 -3.46,-3.46z"
-        android:fillColor="#FFFFFF"/>
+<vector android:height="128dp" android:width="128dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
 </vector>

app/src/main/res/values-v29/styles.xml

@@ -0,0 +1,6 @@
+<resources>
+    <style name="AppBaseTheme" parent="android:Theme.Material">
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
+</resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -97,27 +97,51 @@
     <string name="category_basic_settings"> 基本設置 </string>
     <string name="title_resolution_list"> 選擇目標解析度和幀數 </string>
     <string name="summary_resolution_list"> 過高的設定會引起串流卡頓甚至軟體閃退 </string>
-    <string name="title_seekbar_bitrate"> 選擇目標視頻碼率 </string>
+    <string name="title_fps_list">影像幀數</string>
+    <string name="summary_fps_list">增加以提供更流暢的影像串流. 減少以在較低的配備上獲得較好的效能.</string>
+    <string name="title_seekbar_bitrate"> 選擇目標影像碼率 </string>
     <string name="summary_seekbar_bitrate"> 低碼率減少卡頓，高碼率提高畫質 </string>
     <string name="suffix_seekbar_bitrate">Kbps</string>
+    <string name="title_unlock_fps">解鎖所有可使用的幀率</string>
+    <string name="summary_unlock_fps">串流於90或120幀下可以減少高級配備的延遲, 但可能導致無法支持的配備出現延遲或崩潰</string>
     <string name="title_checkbox_stretch_video"> 將畫面拉伸至全屏 </string>
     <string name="title_checkbox_disable_warnings"> 禁用錯誤提示 </string>
     <string name="summary_checkbox_disable_warnings"> 串流過程中禁用連接錯誤提示 </string>
+    <string name="title_checkbox_enable_pip">啟用子母畫面</string>
+    <string name="summary_checkbox_enable_pip">當多工處理時, 允許觀看串流畫面(無法控制)</string>
 
     <string name="category_audio_settings"> 音頻設置 </string>
     <string name="title_checkbox_51_surround"> 啟用 5.1 環繞音效 </string>
     <string name="summary_checkbox_51_surround"> 如果你的聲音聽起來有問題請禁用。\n\n需要GeForce Experience 2.7 或更高版本 </string>
 
+    <string name="category_input_settings">輸入設定</string>
     <string name="title_checkbox_multi_controller"> 啟用多手柄支持 </string>
     <string name="summary_checkbox_multi_controller"> 如果禁用，所有手柄將會認作一個手柄 </string>
-    <string name="title_seekbar_deadzone"> 調整搖桿死區 </string>
+    <string name="title_checkbox_vibrate_fallback">以手機模擬手柄震動</string>
+    <string name="summary_checkbox_vibrate_fallback">當手柄不支援震動時, 以手機來模擬</string>
+    <string name="title_seekbar_deadzone"> 調整手柄死區 </string>
     <string name="suffix_seekbar_deadzone">%</string>
     <string name="title_checkbox_xb1_driver">Xbox 360/One 手柄驅動 </string>
     <string name="summary_checkbox_xb1_driver"> 若要在那些沒有原生Xbox手柄驅動的設備上使用Xbox手柄，請勾上此複選框 </string>
+    <string name="title_checkbox_usb_bind_all">覆蓋Android控制器支援</string>
+    <string name="summary_checkbox_usb_bind_all">強制 Moonlight USB驅動程式接管所有支持的Xbox手柄</string>
+    <string name="title_checkbox_mouse_emulation">透過手柄模擬滑鼠</string>
+    <string name="summary_checkbox_mouse_emulation">長按 [Start] 鍵將會切換至滑鼠模式</string>
+    <string name="title_checkbox_mouse_nav_buttons">Enable back and forward mouse buttons</string>
+    <string name="summary_checkbox_mouse_nav_buttons">Enabling this option may break right clicking on some buggy devices</string>
 
-    <string name="category_on_screen_controls_settings"> 觸屏設置 </string>
+    <string name="category_on_screen_controls_settings"> 觸控設置 </string>
     <string name="title_checkbox_show_onscreen_controls"> 啟用虛擬手柄 </string>
     <string name="summary_checkbox_show_onscreen_controls"> 將在串流畫面上顯示一層虛擬手柄 </string>
+    <string name="title_checkbox_vibrate_osc">啟用震動</string>
+    <string name="summary_checkbox_vibrate_osc">在手機上模擬搖桿震動</string>
+    <string name="title_only_l3r3">只顯示[L3]及[R3]</string>
+    <string name="summary_only_l3r3">隱藏所有虛擬按鈕除了L3和R3</string>
+    <string name="title_reset_osc">重設已經保存的觸控按鈕布局</string>
+    <string name="summary_reset_osc">將所有觸控按鈕重設為默認之大小和位置</string>
+    <string name="dialog_title_reset_osc">重設按鈕布局</string>
+    <string name="dialog_text_reset_osc">你確定要刪除所保存的按鈕布局嗎?</string>
+    <string name="toast_reset_osc_success">按鈕布局已經重設</string>
 
     <string name="category_ui_settings"> 界面設置 </string>
     <string name="title_language_list">語言</string>
@@ -134,7 +158,10 @@
     <string name="summary_checkbox_host_audio"> 將在電腦和本設備同時輸出聲音 </string>
 
     <string name="category_advanced_settings"> 高級設置 </string>
+    <string name="title_disable_frame_drop">永遠不掉幀</string>
+    <string name="summary_disable_frame_drop">在一些手機上可能可以減少micro-stuttering, 但可能導致延遲</string>
     <string name="title_video_format"> H.265設置 </string>
-    <string name="summary_video_format">H.265能降低帶寬需求，但是需要設備支持 </string>
-
+    <string name="summary_video_format">H.265能降低頻寬需求，但是需要設備支持 </string>
+    <string name="title_enable_hdr">啟用 HDR (實驗中)</string>
+    <string name="summary_enable_hdr">啟用 HDR 當遊戲與電腦的顯示卡支援時. HDR 需要 GTX 1000 系列之顯示卡或更高.</string>
 </resources>

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath 'com.android.tools.build:gradle:3.4.1'
     }
 }