moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-18 10:32:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Calculate FPS using the actual display refresh rate rather than the requested one"

Browse Source 
This breaks refresh rate detection on the Shield Android TV.

This reverts commit af5e7a0e3320e19e21061bd78d1ab22a1f270456.
This commit is contained in:
Cameron Gutman 2020-03-21 13:31:48 -07:00
parent 977a1d4a3c
commit f7ed7e06db
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/limelight/Game.java
View File

@ -621,6 +621,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
private float prepareDisplayForRendering() { private float prepareDisplayForRendering() {
Display display = getWindowManager().getDefaultDisplay(); Display display = getWindowManager().getDefaultDisplay();
WindowManager.LayoutParams windowLayoutParams = getWindow().getAttributes(); WindowManager.LayoutParams windowLayoutParams = getWindow().getAttributes();
float displayRefreshRate;
// On M, we can explicitly set the optimal display mode // On M, we can explicitly set the optimal display mode
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
@ -664,6 +665,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
LimeLog.info("Selected display mode: "+bestMode.getPhysicalWidth()+"x"+ LimeLog.info("Selected display mode: "+bestMode.getPhysicalWidth()+"x"+
bestMode.getPhysicalHeight()+"x"+bestMode.getRefreshRate()); bestMode.getPhysicalHeight()+"x"+bestMode.getRefreshRate());
windowLayoutParams.preferredDisplayModeId = bestMode.getModeId(); windowLayoutParams.preferredDisplayModeId = bestMode.getModeId();
displayRefreshRate = bestMode.getRefreshRate();
} }
// On L, we can at least tell the OS that we want a refresh rate // On L, we can at least tell the OS that we want a refresh rate
else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
@ -684,10 +686,12 @@ public class Game extends Activity implements SurfaceHolder.Callback,
} }
LimeLog.info("Selected refresh rate: "+bestRefreshRate); LimeLog.info("Selected refresh rate: "+bestRefreshRate);
windowLayoutParams.preferredRefreshRate = bestRefreshRate; windowLayoutParams.preferredRefreshRate = bestRefreshRate;
displayRefreshRate = bestRefreshRate;
} }
else { else {
// Otherwise, the active display refresh rate is just // Otherwise, the active display refresh rate is just
// whatever is currently in use. // whatever is currently in use.
displayRefreshRate = display.getRefreshRate();
} }
// Enable HDMI ALLM (game mode) on Android R // Enable HDMI ALLM (game mode) on Android R
@ -727,9 +731,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
streamView.setDesiredAspectRatio((double)prefConfig.width / (double)prefConfig.height); streamView.setDesiredAspectRatio((double)prefConfig.width / (double)prefConfig.height);
} }
// Use the actual refresh rate of the display, since the preferred refresh rate or mode return displayRefreshRate;
// may not actually be applied (ex: Pixel 4 with Smooth Display disabled).
return getWindowManager().getDefaultDisplay().getRefreshRate();
} }
@SuppressLint("InlinedApi") @SuppressLint("InlinedApi")