moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-03 08:15:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Request our desired refresh rate rather than the actual frame rate

Browse Source 
This ensures we'll get the highest compatible refresh rate rather than the lowest.
This commit is contained in:
Cameron Gutman 2022-12-15 22:53:25 -06:00
parent 970423f873
commit 1e828a10b9
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,6 +125,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
private int suppressPipRefCount = 0; private int suppressPipRefCount = 0;
private String pcName; private String pcName;
private String appName; private String appName;
private float desiredRefreshRate;
private InputCaptureProvider inputCaptureProvider; private InputCaptureProvider inputCaptureProvider;
private int modifierFlags = 0; private int modifierFlags = 0;
@ -976,6 +977,9 @@ public class Game extends Activity implements SurfaceHolder.Callback,
streamView.setDesiredAspectRatio((double)prefConfig.width / (double)prefConfig.height); streamView.setDesiredAspectRatio((double)prefConfig.width / (double)prefConfig.height);
} }
// Set the desired refresh rate that will get passed into setFrameRate() later
desiredRefreshRate = displayRefreshRate;
if (getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEVISION) || if (getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEVISION) ||
getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK)) { getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK)) {
// TVs may take a few moments to switch refresh rates, and we can probably assume // TVs may take a few moments to switch refresh rates, and we can probably assume
@ -2097,19 +2101,37 @@ public class Game extends Activity implements SurfaceHolder.Callback,
@Override @Override
public void surfaceCreated(SurfaceHolder holder) { public void surfaceCreated(SurfaceHolder holder) {
float desiredFrameRate;
surfaceCreated = true; surfaceCreated = true;
// Android will pick the lowest matching refresh rate for a given frame rate value, so we want
// to report the true FPS value if refresh rate reduction is enabled. We also report the true
// FPS value if there's no suitable matching refresh rate. In that case, Android could try to
// select a lower refresh rate that avoids uneven pull-down (ex: 30 Hz for a 60 FPS stream on
// a display that maxes out at 50 Hz).
if (mayReduceRefreshRate() || desiredRefreshRate < prefConfig.fps) {
desiredFrameRate = prefConfig.fps;
}
else {
// Otherwise, we will pretend that our frame rate matches the refresh rate we picked in
// prepareDisplayForRendering(). This will usually be the highest refresh rate that our
// frame rate evenly divides into, which ensures the lowest possible display latency.
desiredFrameRate = desiredRefreshRate;
}
// Tell the OS about our frame rate to allow it to adapt the display refresh rate appropriately // Tell the OS about our frame rate to allow it to adapt the display refresh rate appropriately
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
// We want to change frame rate even if it's not seamless, since prepareDisplayForRendering() // We want to change frame rate even if it's not seamless, since prepareDisplayForRendering()
// will not set the display mode on S+ if it only differs by the refresh rate. It depends // will not set the display mode on S+ if it only differs by the refresh rate. It depends
// on us to trigger the frame rate switch here. // on us to trigger the frame rate switch here.
holder.getSurface().setFrameRate(prefConfig.fps, holder.getSurface().setFrameRate(desiredFrameRate,
Surface.FRAME_RATE_COMPATIBILITY_FIXED_SOURCE, Surface.FRAME_RATE_COMPATIBILITY_FIXED_SOURCE,
Surface.CHANGE_FRAME_RATE_ALWAYS); Surface.CHANGE_FRAME_RATE_ALWAYS);
} }
else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
holder.getSurface().setFrameRate(prefConfig.fps, Surface.FRAME_RATE_COMPATIBILITY_FIXED_SOURCE); holder.getSurface().setFrameRate(desiredFrameRate,
Surface.FRAME_RATE_COMPATIBILITY_FIXED_SOURCE);
} }
} }