mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-18 12:28:40 +00:00
feat(display): black frame insertion on 100 Hz and faster screens (#2653)
* feat(display): black frame insertion on 100 Hz and faster screens * feat(display): black frame insertion lives in Screen effects * test(compositor): cover black frame insertion in the render-on-commit harness * fix(display): keep HDR and pacing intact around black frame insertion * fix(display): gate black frame insertion on the panel's refresh, not the tick rate BFI checked the 100 Hz minimum against g_refresh_ns, an average of the time between handled vsync ticks. BFI presents on every tick, so under load the ticks run late, the average fell to 95-100 Hz on a 120 Hz panel, and BFI switched off and on again many times a second (3793 times in one session on a Retroid Pocket Duo). That showed as uneven flicker. Use the display mode's refresh (g_output_refresh_mhz) instead, which only changes when the mode does. * fix(display): offer black frame insertion for the bottom screen and while it is on * fix(display): capture a picture, not a black refresh, while black frame insertion strobes * fix(display): hold black frame insertion off until the last capture ends * fix(display): keep the game composed while a capture holds black frame insertion * test(display): a picture hold presents only pictures while black frame insertion runs
This commit is contained in:
1 parent
f65e7a3d43
commit
758e7983fa
46 files changed
+343
-29
No files matched your search
@@ -114,6 +114,7 @@ DroidDeck is [GPL-3.0](LICENSE). Steam and Proton belong to Valve Corporation. V
|
||||
- The DroidDeck HUD is [@The412Banner](https://github.com/The412Banner)'s [FusionHUD](https://github.com/The412Banner/FusionHUD) (GPL-3.0 with an attribution term). Its readings match Valve's [MangoHud](https://github.com/flightlessmango/MangoHud) build (MIT), with frame times from gamescope patch 0125.
|
||||
- The HUD's CPU, GPU load, thermal and battery readers come from [@xXJSONDeruloXx](https://github.com/xXJSONDeruloXx)'s work.
|
||||
- LSFG frame generation comes from Camille LaVey and the [Eden](https://eden-emu.dev) project, following [lsfg-vk](https://github.com/PancakeTAS/lsfg-vk), ported by [@maxjivi05](https://github.com/maxjivi05). It needs your own copy of [Lossless Scaling](https://store.steampowered.com/app/993090/) and ships none of its shaders.
|
||||
- Black frame insertion follows the design of [@artzox](https://github.com/artzox)'s [BFI Presenter](https://github.com/artzox/BFI-Presenter) (GPL-3.0): the strobe runs on the display's refresh clock and the game is paced to the lit refresh. Both build on [Blur Busters](https://blurbusters.com)' research on MPRT and motion blur. No BFI Presenter code is used.
|
||||
- Remote Play decodes through Android's MediaCodec or the [FFmpeg](https://ffmpeg.org) (LGPL-2.1-or-later) in Steam's runtime. Qualcomm low latency settings follow [Moonlight](https://github.com/moonlight-stream/moonlight-android) (GPL-3.0).
|
||||
- [PipeWire](https://gitlab.freedesktop.org/pipewire/pipewire) (MIT) sockets use the settings in its `module-access.c`, and [WirePlumber](https://gitlab.freedesktop.org/pipewire/wireplumber) (MIT) keeps those clients at full permissions.
|
||||
|
||||
|
||||
@@ -305,6 +305,14 @@ static int g_fallback_armed;
|
||||
volatile int g_fps_limit;
|
||||
volatile int g_release_unpaced;
|
||||
|
||||
volatile int g_bfi;
|
||||
volatile int g_bfi_picture_hold;
|
||||
static int g_bfi_running;
|
||||
static unsigned g_bfi_phase;
|
||||
static const char *g_bfi_blocked;
|
||||
static int g_scene_layer_only;
|
||||
static struct { unsigned lit, dark, failed; } g_bfi_stats;
|
||||
|
||||
volatile int g_hide_shell;
|
||||
|
||||
volatile int g_zero_copy;
|
||||
@@ -2278,6 +2286,10 @@ static void render_scene(void) {
|
||||
if (hdr_route == 3) { fx_on = 0; framegen = 0; }
|
||||
struct surface *ahb_only = ahb_layer_only_candidate(w, h);
|
||||
struct surface *layer_only = ahb_only ? ahb_only : hdr_unimported_fullscreen(&dl, w, h);
|
||||
g_scene_layer_only = hdr_route == 3 || layer_only;
|
||||
const int bfi = g_bfi_running && !g_scene_layer_only;
|
||||
/* The compositor pass BFI needs is route 2; a fullscreen HDR scene on route 0 would lose its HDR there too. */
|
||||
if (bfi && (hdr_route == 1 || (hdr_route == 0 && hs.n_hdr > 0))) hdr_route = 2;
|
||||
const int cursor_on = hdr_route == 3 || layer_only ? 0 : add_cursor(&dl, w);
|
||||
static int cursor_layer_said;
|
||||
if (layer_only && atomic_load(&g_cursor_composite) && !cursor_layer_said) {
|
||||
@@ -2328,19 +2340,21 @@ static void render_scene(void) {
|
||||
rendered = vkp_render(w, h, dl.d, dl.n) == 0;
|
||||
} else if (hdr_route == 0 || hdr_route == 3) {
|
||||
const int pass_on = fx_on || framegen;
|
||||
int li = (g_zero_copy && !framegen && !cardboard && !cursor_on) ? layer_candidate(&dl, w, h) : -1;
|
||||
int li = (g_zero_copy && !framegen && !bfi && !cardboard && !cursor_on) ? layer_candidate(&dl, w, h) : -1;
|
||||
int over = li >= 0 ? dl.n - 1 - li : 0;
|
||||
const int fx_blocks = (li >= 0 && fx_on && over > 0);
|
||||
if (fx_blocks) { li = -1; over = 0; }
|
||||
const int ov_blocks = (li >= 0 && over > 0 && !fx_blocks && !sc_layer_overlay_affordable());
|
||||
if (ov_blocks) { li = -1; over = 0; }
|
||||
const int blocked = framegen ? 1 : (fx_blocks ? 2 : (ov_blocks ? 3 : 0));
|
||||
const int blocked = framegen ? 1 : bfi ? 4 : (fx_blocks ? 2 : (ov_blocks ? 3 : 0));
|
||||
if (g_zero_copy && !cursor_on && blocked != g_zero_copy_paused) {
|
||||
g_zero_copy_paused = blocked;
|
||||
if (blocked == 1)
|
||||
droiddeck_log("framegen", "zero-copy paused: frame generation needs the compositor pass");
|
||||
else if (blocked == 2)
|
||||
droiddeck_log("effects", "zero-copy paused: a window above the game needs the compositor pass for the whole scene");
|
||||
else if (blocked == 4)
|
||||
droiddeck_log("bfi", "zero-copy paused: black frame insertion needs the compositor pass");
|
||||
else if (blocked == 3)
|
||||
droiddeck_log("layer", "zero-copy paused: a window above the game would need a second display layer, "
|
||||
"which this display cannot compose in hardware - whole scene on the copy path");
|
||||
@@ -2351,6 +2365,7 @@ static void render_scene(void) {
|
||||
if (li < 0) ls = layer_only;
|
||||
if (cardboard) ls = NULL;
|
||||
if (cursor_on) ls = NULL;
|
||||
if (bfi) ls = NULL;
|
||||
if (ls && pass_on && li < 0 && !g_zero_copy_fx_skip_said) {
|
||||
g_zero_copy_fx_skip_said = 1;
|
||||
droiddeck_log(framegen ? "framegen" : "effects",
|
||||
@@ -2392,6 +2407,7 @@ static void render_scene(void) {
|
||||
: fx_blocks ? "a window is above it and screen effects need the whole scene"
|
||||
: !g_zero_copy ? "zero-copy presentation is off"
|
||||
: framegen ? "frame generation needs the compositor pass"
|
||||
: bfi ? "black frame insertion needs the compositor pass"
|
||||
: "it is not the one fullscreen window (only that one gets its own display layer)";
|
||||
}
|
||||
}
|
||||
@@ -2434,7 +2450,8 @@ static int on_fallback_timer(void *data) {
|
||||
}
|
||||
|
||||
static int commit_renders_on(void) {
|
||||
return g_render_on_commit && g_release_unpaced && !atomic_load(&g_stream_on) && !vkp_framegen_active();
|
||||
return g_render_on_commit && g_release_unpaced && !atomic_load(&g_stream_on) && !vkp_framegen_active() &&
|
||||
!g_bfi_running;
|
||||
}
|
||||
|
||||
static int render_on_commit(void) {
|
||||
@@ -2470,6 +2487,61 @@ static void on_commit_idle(void *data) {
|
||||
render_scene();
|
||||
}
|
||||
|
||||
/* Black frame insertion strobes on the display's refresh tick and paces the game to the lit refresh,
|
||||
* the design of BFI Presenter by artzox (https://github.com/artzox/BFI-Presenter, GPL-3.0), after Blur Busters'
|
||||
* research on MPRT and motion blur (https://blurbusters.com). No BFI Presenter code is used. */
|
||||
/* The panel's refresh from its display mode, not the measured tick rate: BFI's own presents can make ticks run
|
||||
* late under load, and a measured rate would then dip under the limit and switch BFI off and on many times a
|
||||
* second. 99 Hz lets panels that report 99.9 Hz for 100 Hz through. */
|
||||
#define BFI_MIN_REFRESH_MHZ 99000
|
||||
|
||||
static const char *bfi_blocked(void) {
|
||||
if (atomic_load(&g_stream_on)) return "the picture is being streamed";
|
||||
if (vkp_framegen_active()) return "frame generation is on";
|
||||
if (vkp_cardboard_active()) return "Cardboard VR is on";
|
||||
if (vkp_quest_layer_presentation()) return "this headset composes its own layers";
|
||||
if (g_scene_layer_only) return "the game's frames cannot be imported, so it is shown on its own display layer";
|
||||
if (atomic_load(&g_output_refresh_mhz) < BFI_MIN_REFRESH_MHZ) return "the screen runs below 100 Hz";
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static void bfi_update(void) {
|
||||
const char *why = g_bfi ? bfi_blocked() : NULL;
|
||||
const int run = g_bfi && !why;
|
||||
if (g_bfi && why && why != g_bfi_blocked)
|
||||
droiddeck_log("bfi", "black frame insertion waits: %s", why);
|
||||
g_bfi_blocked = why;
|
||||
if (run == g_bfi_running) return;
|
||||
g_bfi_running = run;
|
||||
g_bfi_phase = 0;
|
||||
g_dirty = 1;
|
||||
if (run) {
|
||||
const int mhz = atomic_load(&g_output_refresh_mhz);
|
||||
droiddeck_log("bfi", "black frame insertion on: %.0f Hz screen, a black refresh after every picture, "
|
||||
"the game is paced to %.0f fps", mhz / 1000.0, mhz / 2000.0);
|
||||
} else {
|
||||
/* Lit refreshes advanced the frame deadline without being held to it; a stale one would stall rendering. */
|
||||
g_scene_due_ns = 0;
|
||||
droiddeck_log("bfi", "black frame insertion off");
|
||||
}
|
||||
}
|
||||
|
||||
static void bfi_tick(void) {
|
||||
/* A capture copies the surface's last buffer: present pictures only, still composed into that surface. */
|
||||
if (g_bfi_picture_hold) {
|
||||
g_bfi_phase = 0;
|
||||
g_bfi_stats.lit++;
|
||||
render_scene();
|
||||
} else if ((g_bfi_phase++ & 1) == 0) {
|
||||
g_bfi_stats.lit++;
|
||||
render_scene();
|
||||
} else if (vkp_render_plain(g_scene_w, g_scene_h) == 0) {
|
||||
g_bfi_stats.dark++;
|
||||
} else {
|
||||
g_bfi_stats.failed++;
|
||||
}
|
||||
}
|
||||
|
||||
static void on_vsync(int64_t frame_time_ns) {
|
||||
int64_t now = now_ns();
|
||||
g_perf.ticks++;
|
||||
@@ -2491,6 +2563,12 @@ static void on_vsync(int64_t frame_time_ns) {
|
||||
if (vkp_effects_sync()) tick_change = 1;
|
||||
if (vkp_cardboard_pose_changed()) tick_change = 1;
|
||||
if (tick_change) g_dirty = 1;
|
||||
bfi_update();
|
||||
if (g_bfi_running) {
|
||||
g_tick_held = 0;
|
||||
bfi_tick();
|
||||
return;
|
||||
}
|
||||
if (g_tick_held && g_dirty) g_hold_missed_ns = now;
|
||||
g_tick_held = 0;
|
||||
if (!tick_change && commit_renders_on() && g_dirty_since_ns && now - g_dirty_since_ns < g_refresh_ns &&
|
||||
@@ -3862,6 +3940,11 @@ static int on_stats_timer(void *data) {
|
||||
g_pace.renders, g_pace.commit_renders, (unsigned long long)game, g_pace.reattaches, g_pace.null_attaches, g_pace.distinct,
|
||||
g_pace.presented, g_pace.replaced, g_pace.undrawn);
|
||||
}
|
||||
if (g_bfi_stats.lit || g_bfi_stats.dark || g_bfi_stats.failed) {
|
||||
droiddeck_log("bfi", "last 10 s: %u pictures, %u black refreshes, %u black refreshes not presented",
|
||||
g_bfi_stats.lit, g_bfi_stats.dark, g_bfi_stats.failed);
|
||||
memset(&g_bfi_stats, 0, sizeof(g_bfi_stats));
|
||||
}
|
||||
{
|
||||
const uint64_t seen = g_game_frames;
|
||||
memset(&g_pace, 0, sizeof(g_pace));
|
||||
|
||||
@@ -1999,7 +1999,9 @@ static int render_impl(int scene_w, int scene_h, const struct vkp_draw *draws, i
|
||||
1 + vkp_framegen_extra_images(), vkp_framegen_extra_images() ? "s" : "");
|
||||
destroy_swapchain();
|
||||
}
|
||||
const int want_hdr = hf && !hf->tonemap && g_colorspace_ext && !g_swap_hdr_unavailable;
|
||||
/* A black refresh carries no HDR frame; it keeps the swapchain's colour mode rather than flipping it. */
|
||||
const int want_hdr = (g_plain_frame && !hf) ? (g_swapchain && g_swap_is_hdr)
|
||||
: (hf && !hf->tonemap && g_colorspace_ext && !g_swap_hdr_unavailable);
|
||||
if (g_swapchain && want_hdr != g_swap_is_hdr) {
|
||||
droiddeck_log("color", want_hdr ? "HDR frames with frame generation: rebuilding the screen swapchain as HDR10"
|
||||
: hf ? "HDR output switched off: rebuilding the screen swapchain as SDR (frames tone-mapped)"
|
||||
|
||||
@@ -42,6 +42,8 @@ extern void droiddeck_wayland_set_output_refresh_rate(int mhz);
|
||||
extern volatile int g_fps_limit;
|
||||
extern volatile int g_release_unpaced;
|
||||
extern volatile int g_render_on_commit;
|
||||
extern volatile int g_bfi;
|
||||
extern volatile int g_bfi_picture_hold;
|
||||
extern volatile int g_hide_shell;
|
||||
extern volatile int g_zero_copy;
|
||||
extern volatile unsigned g_zero_copy_last;
|
||||
@@ -669,6 +671,17 @@ Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSetRenderOnCommit(JN
|
||||
__android_log_print(ANDROID_LOG_INFO, TAG, "render on commit %s", on ? "on" : "off");
|
||||
}
|
||||
|
||||
JNIEXPORT void JNICALL
|
||||
Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSetBlackFrameInsertion(JNIEnv *env, jclass clazz, jboolean on) {
|
||||
g_bfi = on ? 1 : 0;
|
||||
__android_log_print(ANDROID_LOG_INFO, TAG, "black frame insertion %s", on ? "requested" : "off");
|
||||
}
|
||||
|
||||
JNIEXPORT void JNICALL
|
||||
Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSetPictureHold(JNIEnv *env, jclass clazz, jboolean on) {
|
||||
g_bfi_picture_hold = on ? 1 : 0;
|
||||
}
|
||||
|
||||
JNIEXPORT void JNICALL
|
||||
Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSetFpsLimit(JNIEnv *env, jclass clazz, jint fps) {
|
||||
g_fps_limit = fps > 0 ? fps : 0;
|
||||
|
||||
@@ -500,6 +500,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde
|
||||
private var drawerGameProfileId by mutableStateOf<Long?>(null)
|
||||
private var drawerGameProfileSelectionMade = false
|
||||
private var fpsLimit by mutableStateOf(SessionState.fpsLimit)
|
||||
private var blackFrameInsertion by mutableStateOf(false)
|
||||
|
||||
private fun noSteamSession(): Boolean = (SessionState.mode == SessionService.MODE_RUN &&
|
||||
SessionState.program in setOf(
|
||||
@@ -1588,6 +1589,13 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde
|
||||
fpsLimit = fps
|
||||
applyOutputPacing()
|
||||
},
|
||||
blackFrameInsertion = blackFrameInsertion,
|
||||
blackFrameInsertionAvailable = blackFrameInsertion || blackFrameInsertionAvailable(),
|
||||
onBlackFrameInsertion = { on ->
|
||||
SessionPrefs.setBlackFrameInsertion(this@SessionActivity, on)
|
||||
blackFrameInsertion = on
|
||||
CompositorHost.setBlackFrameInsertion(on, refreshHz(), outputFpsLimit())
|
||||
},
|
||||
onFrameGenPick = { mode ->
|
||||
val appId = frameGenTargetGameId()
|
||||
|
||||
@@ -2402,6 +2410,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde
|
||||
picturePosition = SessionPrefs.picturePosition(this)
|
||||
integerScaling = SessionPrefs.integerScaling(this)
|
||||
hudOn = SessionPrefs.hudEnabled(this)
|
||||
blackFrameInsertion = SessionPrefs.blackFrameInsertion(this)
|
||||
hudConfig = DroidDeckHudConfig.load(this)
|
||||
hudColor = SessionPrefs.hudColor(this)
|
||||
hudOpacity = SessionPrefs.hudOpacity(this)
|
||||
@@ -2871,6 +2880,17 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde
|
||||
return if (capped > 1f) capped else 60f
|
||||
}
|
||||
|
||||
private fun blackFrameInsertionAvailable(): Boolean {
|
||||
// Glasses that present the game run at their own rate, uncapped, as refreshHz() reads them.
|
||||
glassesScreen?.display?.let { glasses ->
|
||||
return (glasses.supportedModes?.maxOfOrNull { it.refreshRate } ?: 0f) >= PerfMode.BFI_MIN_REFRESH_HZ
|
||||
}
|
||||
val display = bottomGame?.takeIf { bottomOutputActive }?.display
|
||||
?: if (Build.VERSION.SDK_INT >= 30) display else @Suppress("DEPRECATION") windowManager.defaultDisplay
|
||||
val peak = display?.supportedModes?.maxOfOrNull { it.refreshRate } ?: 0f
|
||||
return minOf(peak, PerfMode.peakRefreshCap(this)) >= PerfMode.BFI_MIN_REFRESH_HZ
|
||||
}
|
||||
|
||||
private fun mirrorRefreshLimit(): Int =
|
||||
GlassesRendering.mirrorRefreshLimit(glassesSettings, glasses, glassesScreen != null)
|
||||
|
||||
@@ -4194,19 +4214,35 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde
|
||||
onFrame(null)
|
||||
return
|
||||
}
|
||||
try {
|
||||
android.view.PixelCopy.request(source, bitmap, { result ->
|
||||
if (result != android.view.PixelCopy.SUCCESS) {
|
||||
bitmap.recycle()
|
||||
onFrame(null)
|
||||
} else onFrame(bitmap)
|
||||
}, uiHandler)
|
||||
} catch (_: IllegalArgumentException) {
|
||||
bitmap.recycle()
|
||||
onFrame(null)
|
||||
withPictureFrame { done ->
|
||||
try {
|
||||
android.view.PixelCopy.request(source, bitmap, { result ->
|
||||
done()
|
||||
if (result != android.view.PixelCopy.SUCCESS) {
|
||||
bitmap.recycle()
|
||||
onFrame(null)
|
||||
} else onFrame(bitmap)
|
||||
}, uiHandler)
|
||||
} catch (_: IllegalArgumentException) {
|
||||
done()
|
||||
bitmap.recycle()
|
||||
onFrame(null)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** PixelCopy reads the last queued buffer, which black frame insertion makes black every other refresh. */
|
||||
private fun withPictureFrame(copy: (done: () -> Unit) -> Unit) {
|
||||
if (!CompositorHost.holdPicture()) return copy {}
|
||||
uiHandler.postDelayed({
|
||||
var released = false
|
||||
copy {
|
||||
if (!released) CompositorHost.releasePicture()
|
||||
released = true
|
||||
}
|
||||
}, BFI_PICTURE_SETTLE_MS)
|
||||
}
|
||||
|
||||
private fun tapSteamButton() {
|
||||
if (SessionState.mode == SessionService.MODE_STEAM) padBridge?.triggerSteamMenu()
|
||||
}
|
||||
@@ -5311,17 +5347,21 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde
|
||||
val left = surfaceAt[0] - overlayAt[0]
|
||||
val top = surfaceAt[1] - overlayAt[1]
|
||||
val bounds = android.graphics.Rect(left, top, left + width, top + height)
|
||||
try {
|
||||
android.view.PixelCopy.request(surfaceView, bitmap, { result ->
|
||||
if (result == android.view.PixelCopy.SUCCESS && !isDestroyed) {
|
||||
pausedFrame = com.droiddeck.launcher.ui.PausedFrame(bitmap.asImageBitmap(), bounds)
|
||||
pausedFrameWanted = false
|
||||
} else {
|
||||
bitmap.recycle()
|
||||
}
|
||||
}, uiHandler)
|
||||
} catch (_: IllegalArgumentException) {
|
||||
bitmap.recycle()
|
||||
withPictureFrame { done ->
|
||||
try {
|
||||
android.view.PixelCopy.request(surfaceView, bitmap, { result ->
|
||||
done()
|
||||
if (result == android.view.PixelCopy.SUCCESS && !isDestroyed) {
|
||||
pausedFrame = com.droiddeck.launcher.ui.PausedFrame(bitmap.asImageBitmap(), bounds)
|
||||
pausedFrameWanted = false
|
||||
} else {
|
||||
bitmap.recycle()
|
||||
}
|
||||
}, uiHandler)
|
||||
} catch (_: IllegalArgumentException) {
|
||||
done()
|
||||
bitmap.recycle()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6323,6 +6363,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde
|
||||
private const val LEAVE_TIMEOUT_MS = 1_500L
|
||||
private const val TEXT_FIELD_TAP_MS = 1_000L
|
||||
private const val PAUSED_FRAME_MAX_EDGE = 1920f
|
||||
private const val BFI_PICTURE_SETTLE_MS = 50L
|
||||
private const val PAUSED_FRAME_REDRAW_MS = 150L
|
||||
private const val BOTTOM_RECOVERY_MS = 1_000L
|
||||
private const val BOTTOM_RECOVERY_TRIES = 3
|
||||
|
||||
@@ -11,6 +11,7 @@ import android.view.Display
|
||||
|
||||
object PerfMode {
|
||||
private const val TAG = "PerfMode"
|
||||
const val BFI_MIN_REFRESH_HZ = 100f
|
||||
|
||||
fun apply(a: Activity, fpsLimit: Int = 0, refreshLimit: Int = 0): String {
|
||||
val parts = ArrayList<String>(2)
|
||||
|
||||
@@ -85,6 +85,12 @@ object SessionPrefs {
|
||||
prefs(context).edit().putBoolean("launcherFullscreen", on).apply()
|
||||
}
|
||||
|
||||
fun blackFrameInsertion(context: Context): Boolean = prefs(context).getBoolean("blackFrameInsertion", false)
|
||||
|
||||
fun setBlackFrameInsertion(context: Context, on: Boolean) {
|
||||
prefs(context).edit().putBoolean("blackFrameInsertion", on).apply()
|
||||
}
|
||||
|
||||
fun animationsEnabled(context: Context): Boolean = prefs(context).getBoolean("animations", true)
|
||||
|
||||
fun setAnimationsEnabled(context: Context, on: Boolean) {
|
||||
|
||||
@@ -24,7 +24,7 @@ object SettingsReset {
|
||||
"directAudio", "mic", "wifiDiscovery", "clientCpusOverride", "clientCpus", "gameCpus",
|
||||
"noXalia", "fastSync", "fsyncFirst", "syncFallback", "prootNoSeccomp", "prootFastPath", "nativeUserland", "cursorComposite",
|
||||
"guestHostname", "fexPreset", "forceSsbs", "logs", "gameDebugLogsEnabled", "enhancedDiagnosticsNext", "storageDiagnostics", "buildWatermark",
|
||||
"upscaler", "upscaleSharpness", "screenEffects", "textureAnisotropy", "textureLodBias",
|
||||
"upscaler", "upscaleSharpness", "screenEffects", "blackFrameInsertion", "textureAnisotropy", "textureLodBias",
|
||||
"steamDownloadsInBackground", "steam_offline", "bootMovie", "bootMovieSound", "bootMovieVolume", "bootMovieSeconds", "skipBootMovie",
|
||||
"bootMovieApplyNext", "bootMovieSteamSeen", "bootMovieShuffle",
|
||||
"questDefaultsV1", "telemetryAuto", "telemetryOff", "statsStrip", "statsHud", "bottomHud", "bottomStripMetrics", "bottomStripTabs", "statsDash", "statsSpeedUnit",
|
||||
|
||||
@@ -275,6 +275,9 @@ class DrawerActions(
|
||||
val onFrameGenReset: () -> Unit = {},
|
||||
val fpsLimit: Int = 0,
|
||||
val onFpsLimit: (Int) -> Unit = {},
|
||||
val blackFrameInsertion: Boolean = false,
|
||||
val blackFrameInsertionAvailable: Boolean = false,
|
||||
val onBlackFrameInsertion: (Boolean) -> Unit = {},
|
||||
val onImportLossless: () -> Unit,
|
||||
val onKeyboard: () -> Unit,
|
||||
val onHardwareKeyboard: () -> Unit,
|
||||
@@ -1112,6 +1115,9 @@ private fun ScreenEffectsGroup(
|
||||
ToggleRow(host, "crt", stringResource(R.string.drawer_crt), null, e.crt, chipModifier = track("crt")) { a.onEffects(e.copy(crt = it)) }
|
||||
ToggleRow(host, "ntsc", stringResource(R.string.drawer_ntsc), null, e.ntsc, chipModifier = track("ntsc")) { a.onEffects(e.copy(ntsc = it)) }
|
||||
ToggleRow(host, "fake-hdr", stringResource(R.string.drawer_fake_hdr), null, e.hdr, chipModifier = track("fake-hdr")) { a.onEffects(e.copy(hdr = it)) }
|
||||
if (a.blackFrameInsertionAvailable) ToggleRow(host, "bfi", stringResource(R.string.drawer_bfi),
|
||||
stringResource(R.string.drawer_bfi_note), a.blackFrameInsertion,
|
||||
chipModifier = track("bfi"), onChange = a.onBlackFrameInsertion)
|
||||
}
|
||||
val source = remember { MutableInteractionSource() }
|
||||
val hot = source.collectIsFocusedAsState().value || source.collectIsHoveredAsState().value
|
||||
|
||||
@@ -53,6 +53,8 @@ object CompositorHost {
|
||||
WaylandCompositor.nativeSetClockControl(java.io.File(context.filesDir, "${com.droiddeck.launcher.runtime.LinuxRuntime.DIR}/tmp/.bl-clock").path)
|
||||
ownVsyncThread = SessionPrefs.vsyncThread(context)
|
||||
WaylandCompositor.nativeSetRenderOnCommit(SessionPrefs.renderOnCommit(context))
|
||||
blackFrameInsertion = SessionPrefs.blackFrameInsertion(context)
|
||||
WaylandCompositor.nativeSetBlackFrameInsertion(blackFrameInsertion)
|
||||
pace(refreshHz, fpsLimit)
|
||||
if (!SessionState.running) WaylandCompositor.nativeSetOutputSize(outputWidth, outputHeight)
|
||||
if (started) {
|
||||
@@ -72,9 +74,12 @@ object CompositorHost {
|
||||
return true
|
||||
}
|
||||
|
||||
private var blackFrameInsertion = false
|
||||
private var pictureHolds = 0
|
||||
|
||||
private fun pace(refreshHz: Float, fpsLimit: Int) {
|
||||
WaylandCompositor.nativeSetFpsLimit(fpsLimit)
|
||||
WaylandCompositor.nativeSetLayerFrameRate(if (fpsLimit > 0) fpsLimit.toFloat() else refreshHz)
|
||||
WaylandCompositor.nativeSetLayerFrameRate(if (fpsLimit > 0 && !blackFrameInsertion) fpsLimit.toFloat() else refreshHz)
|
||||
WaylandCompositor.nativeSetOutputRefreshRate(refreshHz)
|
||||
SessionState.refreshHz = refreshHz
|
||||
}
|
||||
@@ -84,6 +89,27 @@ object CompositorHost {
|
||||
if (started) pace(refreshHz, fpsLimit)
|
||||
}
|
||||
|
||||
@Synchronized
|
||||
fun setBlackFrameInsertion(on: Boolean, refreshHz: Float, fpsLimit: Int) {
|
||||
blackFrameInsertion = on
|
||||
WaylandCompositor.nativeSetBlackFrameInsertion(on)
|
||||
if (started) pace(refreshHz, fpsLimit)
|
||||
}
|
||||
|
||||
/** Presents only pictures until the matching release; false when nothing is strobing. */
|
||||
@Synchronized
|
||||
fun holdPicture(): Boolean {
|
||||
if (!started || !blackFrameInsertion) return false
|
||||
if (pictureHolds++ == 0) WaylandCompositor.nativeSetPictureHold(true)
|
||||
return true
|
||||
}
|
||||
|
||||
@Synchronized
|
||||
fun releasePicture() {
|
||||
if (pictureHolds == 0) return
|
||||
if (--pictureHolds == 0) WaylandCompositor.nativeSetPictureHold(false)
|
||||
}
|
||||
|
||||
@Synchronized
|
||||
fun resize(surface: Surface, rearm: () -> Unit) {
|
||||
if (!started) return
|
||||
|
||||
@@ -321,6 +321,10 @@ public final class WaylandCompositor {
|
||||
|
||||
public static native void nativeSetFpsLimit(int fps);
|
||||
|
||||
public static native void nativeSetBlackFrameInsertion(boolean on);
|
||||
|
||||
public static native void nativeSetPictureHold(boolean on);
|
||||
|
||||
public static native void nativeSetRenderOnCommit(boolean on);
|
||||
|
||||
public static native void nativeSetGpuTurbo(boolean on);
|
||||
|
||||
@@ -683,6 +683,8 @@
|
||||
<string name="drawer_page_display">العرض</string>
|
||||
<string name="drawer_frame_limit">حد الإطارات</string>
|
||||
<string name="drawer_frame_limit_note">يحدّ هذه اللعبة. تنتقل الشاشة إلى معدل تحديث يقبل القسمة على الحد إن وُجد، وقد تبدو الحدود الأخرى غير منتظمة. تستخدم ألعاب Steam حد الإطارات في Steam ضمن قائمة الوصول السريع.</string>
|
||||
<string name="drawer_bfi">إدراج إطار أسود</string>
|
||||
<string name="drawer_bfi_note">حركة أوضح: يتبع كل إطار تحديث أسود. يتطلب 100 هرتز أو أكثر؛ تعمل اللعبة بنصف معدل التحديث وتبدو أغمق. يتوقف أثناء تشغيل توليد الإطارات.</string>
|
||||
<string name="drawer_page_effects">المؤثرات</string>
|
||||
<string name="drawer_page_controls">عناصر التحكم</string>
|
||||
<string name="drawer_page_components">المكوّنات</string>
|
||||
|
||||
@@ -677,6 +677,8 @@
|
||||
<string name="drawer_page_display">Pantalla</string>
|
||||
<string name="drawer_frame_limit">Límite de fotogramas</string>
|
||||
<string name="drawer_frame_limit_note">Limita este juego. La pantalla cambia a una frecuencia de actualización que sea múltiplo exacto del límite cuando la hay; otros límites pueden verse irregulares. Los juegos de Steam usan el Límite de fotogramas de Steam en el menú Quick Access.</string>
|
||||
<string name="drawer_bfi">Inserción de cuadros negros</string>
|
||||
<string name="drawer_bfi_note">Movimiento más nítido: cada cuadro va seguido de un refresco negro. Requiere 100 Hz o más; el juego corre a la mitad de la frecuencia y se ve más oscuro. Se apaga con la generación de cuadros.</string>
|
||||
<string name="drawer_page_effects">Efectos</string>
|
||||
<string name="drawer_page_controls">Controles</string>
|
||||
<string name="drawer_page_components">Componentes</string>
|
||||
|
||||
@@ -675,6 +675,8 @@
|
||||
<string name="drawer_page_display">Екран</string>
|
||||
<string name="drawer_frame_limit">Ограничение на кадрите</string>
|
||||
<string name="drawer_frame_limit_note">Ограничава тази игра. Екранът преминава към честота на опресняване, която се дели точно на ограничението, ако има такава; другите ограничения може да изглеждат неравномерни. Игрите в Steam използват Frame Limit на Steam в менюто Quick Access.</string>
|
||||
<string name="drawer_bfi">Вмъкване на черни кадри</string>
|
||||
<string name="drawer_bfi_note">По-ясно движение: след всеки кадър следва черно опресняване. Нужни са 100 Hz или повече; играта върви на половината честота и изглежда по-тъмна. Изключено при генериране на кадри.</string>
|
||||
<string name="drawer_page_effects">Ефекти</string>
|
||||
<string name="drawer_page_controls">Контроли</string>
|
||||
<string name="drawer_page_components">Компоненти</string>
|
||||
|
||||
@@ -679,6 +679,8 @@
|
||||
<string name="drawer_page_display">Displej</string>
|
||||
<string name="drawer_frame_limit">Limit snímků</string>
|
||||
<string name="drawer_frame_limit_note">Omezí tuto hru. Displej se přepne na obnovovací frekvenci, kterou limit beze zbytku dělí, pokud nějakou má; jiné limity mohou působit nerovnoměrně. Hry ze Steamu používají Limit snímků Steamu v nabídce Rychlý přístup.</string>
|
||||
<string name="drawer_bfi">Vkládání černých snímků</string>
|
||||
<string name="drawer_bfi_note">Ostřejší pohyb: po každém snímku následuje černé obnovení. Vyžaduje 100 Hz a více; hra běží na polovině obnovovací frekvence a je tmavší. Vypnuto při generování snímků.</string>
|
||||
<string name="drawer_page_effects">Efekty</string>
|
||||
<string name="drawer_page_controls">Ovládání</string>
|
||||
<string name="drawer_page_components">Komponenty</string>
|
||||
|
||||
@@ -675,6 +675,8 @@
|
||||
<string name="drawer_page_display">Skærm</string>
|
||||
<string name="drawer_frame_limit">Billedgrænse</string>
|
||||
<string name="drawer_frame_limit_note">Begrænser dette spil. Skærmen skifter til en opdateringshastighed, som grænsen går lige op i, når den har en; andre grænser kan virke ujævne. Steam-spil bruger Steams Frame Limit i Hurtig adgang-menuen.</string>
|
||||
<string name="drawer_bfi">Indsættelse af sorte billeder</string>
|
||||
<string name="drawer_bfi_note">Skarpere bevægelse: hvert billede efterfølges af en sort opdatering. Kræver 100 Hz eller mere; spillet kører ved halv opdateringshastighed og ser mørkere ud. Slået fra under billedgenerering.</string>
|
||||
<string name="drawer_page_effects">Effekter</string>
|
||||
<string name="drawer_page_controls">Kontroller</string>
|
||||
<string name="drawer_page_components">Komponenter</string>
|
||||
|
||||
@@ -675,6 +675,8 @@
|
||||
<string name="drawer_page_display">Anzeige</string>
|
||||
<string name="drawer_frame_limit">Bildratenlimit</string>
|
||||
<string name="drawer_frame_limit_note">Begrenzt dieses Spiel. Der Bildschirm wechselt zu einer Bildwiederholrate, die durch das Limit glatt teilbar ist, sofern vorhanden; andere Limits können ungleichmäßig wirken. Steam-Spiele nutzen das Bildratenlimit von Steam im Schnellzugriffsmenü.</string>
|
||||
<string name="drawer_bfi">Schwarzbild-Einfügung</string>
|
||||
<string name="drawer_bfi_note">Schärfere Bewegung: Auf jedes Bild folgt ein schwarzer Refresh. Braucht 100 Hz oder mehr; das Spiel läuft mit halber Bildwiederholrate und wirkt dunkler. Aus, solange Frame Generation läuft.</string>
|
||||
<string name="drawer_page_effects">Effekte</string>
|
||||
<string name="drawer_page_controls">Steuerung</string>
|
||||
<string name="drawer_page_components">Komponenten</string>
|
||||
|
||||
@@ -675,6 +675,8 @@
|
||||
<string name="drawer_page_display">Οθόνη</string>
|
||||
<string name="drawer_frame_limit">Όριο καρέ</string>
|
||||
<string name="drawer_frame_limit_note">Περιορίζει αυτό το παιχνίδι. Η οθόνη αλλάζει σε ρυθμό ανανέωσης που διαιρείται ακριβώς με το όριο, αν υπάρχει· άλλα όρια μπορεί να φαίνονται ανομοιόμορφα. Τα παιχνίδια Steam χρησιμοποιούν το Frame Limit του Steam στο μενού Quick Access.</string>
|
||||
<string name="drawer_bfi">Εισαγωγή μαύρων καρέ</string>
|
||||
<string name="drawer_bfi_note">Πιο καθαρή κίνηση: κάθε καρέ ακολουθείται από μαύρη ανανέωση. Απαιτεί 100 Hz ή περισσότερα· το παιχνίδι τρέχει στον μισό ρυθμό ανανέωσης και φαίνεται πιο σκοτεινό. Ανενεργό όσο λειτουργεί η δημιουργία καρέ.</string>
|
||||
<string name="drawer_page_effects">Εφέ</string>
|
||||
<string name="drawer_page_controls">Χειριστήρια</string>
|
||||
<string name="drawer_page_components">Στοιχεία</string>
|
||||
|
||||
@@ -677,6 +677,8 @@
|
||||
<string name="drawer_page_display">Pantalla</string>
|
||||
<string name="drawer_frame_limit">Límite de fotogramas</string>
|
||||
<string name="drawer_frame_limit_note">Limita este juego. La pantalla cambia a una frecuencia de actualización que sea múltiplo exacto del límite cuando la hay; otros límites pueden verse irregulares. Los juegos de Steam usan el Límite de fotogramas de Steam en el menú Quick Access.</string>
|
||||
<string name="drawer_bfi">Inserción de fotogramas negros</string>
|
||||
<string name="drawer_bfi_note">Movimiento más nítido: cada fotograma va seguido de un refresco negro. Requiere 100 Hz o más; el juego va a la mitad de la frecuencia y se ve más oscuro. Desactivado con la generación de fotogramas.</string>
|
||||
<string name="drawer_page_effects">Efectos</string>
|
||||
<string name="drawer_page_controls">Controles</string>
|
||||
<string name="drawer_page_components">Componentes</string>
|
||||
|
||||
@@ -675,6 +675,8 @@
|
||||
<string name="drawer_page_display">Näyttö</string>
|
||||
<string name="drawer_frame_limit">Kuvanopeusraja</string>
|
||||
<string name="drawer_frame_limit_note">Rajoittaa tätä peliä. Näyttö vaihtaa virkistystaajuuteen, joka on rajan tasakerrannainen, jos sellainen on; muut rajat voivat näyttää epätasaisilta. Steam-pelit käyttävät Steamin Frame Limit -asetusta Pikavalikossa.</string>
|
||||
<string name="drawer_bfi">Mustien kuvien lisäys</string>
|
||||
<string name="drawer_bfi_note">Terävämpi liike: jokaista kuvaa seuraa musta päivitys. Vaatii vähintään 100 Hz; peli pyörii puolella virkistystaajuudesta ja näyttää tummemmalta. Pois päältä kuvien generoinnin aikana.</string>
|
||||
<string name="drawer_page_effects">Tehosteet</string>
|
||||
<string name="drawer_page_controls">Ohjaimet</string>
|
||||
<string name="drawer_page_components">Komponentit</string>
|
||||
|
||||
@@ -677,6 +677,8 @@
|
||||
<string name="drawer_page_display">Affichage</string>
|
||||
<string name="drawer_frame_limit">Limite d\'images</string>
|
||||
<string name="drawer_frame_limit_note">Limite ce jeu. L\'écran passe à une fréquence de rafraîchissement multiple de la limite lorsqu\'il en propose une ; les autres limites peuvent paraître irrégulières. Les jeux Steam utilisent la limite d\'images de Steam dans le menu d\'accès rapide.</string>
|
||||
<string name="drawer_bfi">Insertion d\'images noires</string>
|
||||
<string name="drawer_bfi_note">Mouvement plus net : chaque image est suivie d\'un rafraîchissement noir. Nécessite 100 Hz ou plus ; le jeu tourne à la moitié de la fréquence et paraît plus sombre. Désactivé avec la génération d\'images.</string>
|
||||
<string name="drawer_page_effects">Effets</string>
|
||||
<string name="drawer_page_controls">Contrôles</string>
|
||||
<string name="drawer_page_components">Composants</string>
|
||||
|
||||
@@ -675,6 +675,8 @@
|
||||
<string name="drawer_page_display">डिस्प्ले</string>
|
||||
<string name="drawer_frame_limit">फ़्रेम सीमा</string>
|
||||
<string name="drawer_frame_limit_note">इस गेम को सीमित करता है। अगर डिस्प्ले में ऐसा रिफ़्रेश रेट है जिसे सीमा बराबर भाग देती है, तो वह उस पर चला जाता है; दूसरी सीमाएं असमान लग सकती हैं। Steam गेम, Quick Access मेनू में Steam की Frame Limit इस्तेमाल करते हैं।</string>
|
||||
<string name="drawer_bfi">ब्लैक फ़्रेम इंसर्शन</string>
|
||||
<string name="drawer_bfi_note">ज़्यादा साफ़ मोशन: हर फ़्रेम के बाद एक काला रिफ़्रेश आता है। 100 Hz या ज़्यादा चाहिए; गेम आधे रिफ़्रेश रेट पर चलता है और गहरा दिखता है। फ़्रेम जनरेशन चालू होने पर बंद रहता है।</string>
|
||||
<string name="drawer_page_effects">इफ़ेक्ट</string>
|
||||
<string name="drawer_page_controls">कंट्रोल</string>
|
||||
<string name="drawer_page_components">कॉम्पोनेंट</string>
|
||||
|
||||
@@ -675,6 +675,8 @@
|
||||
<string name="drawer_page_display">Kijelző</string>
|
||||
<string name="drawer_frame_limit">Képkockakorlát</string>
|
||||
<string name="drawer_frame_limit_note">Korlátozza ezt a játékot. A kijelző olyan frissítési frekvenciára vált, amelyet a korlát egyenletesen oszt, ha van ilyen; más korlátok egyenetlennek tűnhetnek. A Steam-játékok a Steam képkockakorlátját használják a Gyors hozzáférés menüben.</string>
|
||||
<string name="drawer_bfi">Fekete képkocka beszúrása</string>
|
||||
<string name="drawer_bfi_note">Élesebb mozgás: minden képkockát fekete frissítés követ. Legalább 100 Hz kell; a játék a frissítési frekvencia felével fut és sötétebb. Képkocka-generálás közben ki van kapcsolva.</string>
|
||||
<string name="drawer_page_effects">Effektek</string>
|
||||
<string name="drawer_page_controls">Vezérlők</string>
|
||||
<string name="drawer_page_components">Összetevők</string>
|
||||
|
||||
@@ -673,6 +673,8 @@
|
||||
<string name="drawer_page_display">Tampilan</string>
|
||||
<string name="drawer_frame_limit">Batas frame</string>
|
||||
<string name="drawer_frame_limit_note">Membatasi gim ini. Layar beralih ke refresh rate yang habis dibagi batas tersebut jika ada; batas lain bisa terlihat tidak rata. Gim Steam menggunakan Frame Limit milik Steam di menu Quick Access.</string>
|
||||
<string name="drawer_bfi">Penyisipan bingkai hitam</string>
|
||||
<string name="drawer_bfi_note">Gerakan lebih tajam: setiap bingkai diikuti refresh hitam. Butuh 100 Hz atau lebih; game berjalan di setengah refresh rate dan terlihat lebih gelap. Mati saat pembuatan bingkai aktif.</string>
|
||||
<string name="drawer_page_effects">Efek</string>
|
||||
<string name="drawer_page_controls">Kontrol</string>
|
||||
<string name="drawer_page_components">Komponen</string>
|
||||
|
||||
@@ -677,6 +677,8 @@
|
||||
<string name="drawer_page_display">Schermo</string>
|
||||
<string name="drawer_frame_limit">Limite frame</string>
|
||||
<string name="drawer_frame_limit_note">Limita questo gioco. Lo schermo passa a una frequenza di aggiornamento divisibile per il limite, se disponibile; altri limiti possono risultare irregolari. I giochi Steam usano il Limite frame di Steam nel menu di accesso rapido.</string>
|
||||
<string name="drawer_bfi">Inserimento di fotogrammi neri</string>
|
||||
<string name="drawer_bfi_note">Movimento più nitido: ogni fotogramma è seguito da un refresh nero. Richiede almeno 100 Hz; il gioco gira a metà della frequenza e appare più scuro. Disattivato con la generazione di fotogrammi.</string>
|
||||
<string name="drawer_page_effects">Effetti</string>
|
||||
<string name="drawer_page_controls">Controlli</string>
|
||||
<string name="drawer_page_components">Componenti</string>
|
||||
|
||||
@@ -673,6 +673,8 @@
|
||||
<string name="drawer_page_display">表示</string>
|
||||
<string name="drawer_frame_limit">フレームレート制限</string>
|
||||
<string name="drawer_frame_limit_note">このゲームのフレームレートを制限します。上限で割り切れるリフレッシュレートがあれば画面はそれに切り替わり、それ以外の上限では表示が不均一になることがあります。SteamゲームではクイックアクセスメニューにあるSteamのフレームレート制限を使用します。</string>
|
||||
<string name="drawer_bfi">黒フレーム挿入</string>
|
||||
<string name="drawer_bfi_note">動きがくっきり: 各フレームの後に黒いリフレッシュが入ります。100 Hz 以上が必要で、ゲームはリフレッシュレートの半分で動作し、画面は暗くなります。フレーム生成中はオフです。</string>
|
||||
<string name="drawer_page_effects">エフェクト</string>
|
||||
<string name="drawer_page_controls">コントロール</string>
|
||||
<string name="drawer_page_components">コンポーネント</string>
|
||||
|
||||
@@ -673,6 +673,8 @@
|
||||
<string name="drawer_page_display">디스플레이</string>
|
||||
<string name="drawer_frame_limit">프레임 제한</string>
|
||||
<string name="drawer_frame_limit_note">이 게임의 프레임을 제한합니다. 제한값으로 나누어떨어지는 주사율이 있으면 디스플레이가 그 주사율로 전환되며, 그 밖의 제한값은 고르지 않게 보일 수 있습니다. Steam 게임은 빠른 액세스 메뉴의 Steam 프레임 제한을 사용합니다.</string>
|
||||
<string name="drawer_bfi">블랙 프레임 삽입</string>
|
||||
<string name="drawer_bfi_note">더 선명한 움직임: 매 프레임 뒤에 검은 화면 갱신이 들어갑니다. 100Hz 이상이 필요하며 게임은 주사율의 절반으로 실행되고 더 어둡게 보입니다. 프레임 생성 중에는 꺼집니다.</string>
|
||||
<string name="drawer_page_effects">효과</string>
|
||||
<string name="drawer_page_controls">컨트롤</string>
|
||||
<string name="drawer_page_components">구성 요소</string>
|
||||
|
||||
@@ -673,6 +673,8 @@
|
||||
<string name="drawer_page_display">Paparan</string>
|
||||
<string name="drawer_frame_limit">Had bingkai</string>
|
||||
<string name="drawer_frame_limit_note">Mengehadkan permainan ini. Paparan bertukar kepada kadar segar semula yang boleh dibahagi sama rata dengan had jika ada; had lain mungkin kelihatan tidak sekata. Permainan Steam menggunakan Frame Limit Steam dalam menu Akses Pantas.</string>
|
||||
<string name="drawer_bfi">Sisipan bingkai hitam</string>
|
||||
<string name="drawer_bfi_note">Gerakan lebih tajam: setiap bingkai diikuti segar semula hitam. Perlu 100 Hz atau lebih; permainan berjalan pada separuh kadar segar semula dan kelihatan lebih gelap. Dimatikan semasa penjanaan bingkai.</string>
|
||||
<string name="drawer_page_effects">Kesan</string>
|
||||
<string name="drawer_page_controls">Kawalan</string>
|
||||
<string name="drawer_page_components">Komponen</string>
|
||||
|
||||
@@ -675,6 +675,8 @@
|
||||
<string name="drawer_page_display">Skjerm</string>
|
||||
<string name="drawer_frame_limit">Bildefrekvensgrense</string>
|
||||
<string name="drawer_frame_limit_note">Begrenser dette spillet. Skjermen bytter til en oppdateringsfrekvens som grensen går opp i når det finnes en; andre grenser kan se ujevne ut. Steam-spill bruker Steams Frame Limit i Hurtigmenyen.</string>
|
||||
<string name="drawer_bfi">Innsetting av svarte bilder</string>
|
||||
<string name="drawer_bfi_note">Skarpere bevegelse: hvert bilde etterfølges av en svart oppdatering. Krever 100 Hz eller mer; spillet kjører på halv oppdateringsfrekvens og ser mørkere ut. Av mens bildegenerering er på.</string>
|
||||
<string name="drawer_page_effects">Effekter</string>
|
||||
<string name="drawer_page_controls">Kontroller</string>
|
||||
<string name="drawer_page_components">Komponenter</string>
|
||||
|
||||
@@ -675,6 +675,8 @@
|
||||
<string name="drawer_page_display">Scherm</string>
|
||||
<string name="drawer_frame_limit">Framelimiet</string>
|
||||
<string name="drawer_frame_limit_note">Begrenst deze game. Het scherm schakelt over naar een vernieuwingsfrequentie die precies deelbaar is door de limiet, als die er is; andere limieten kunnen ongelijkmatig ogen. Steam-games gebruiken de framelimiet van Steam in het Snelmenu.</string>
|
||||
<string name="drawer_bfi">Zwarte frames invoegen</string>
|
||||
<string name="drawer_bfi_note">Scherpere beweging: na elk frame volgt een zwarte verversing. Vereist 100 Hz of meer; de game draait op de helft van de verversingssnelheid en oogt donkerder. Uit zolang framegeneratie aanstaat.</string>
|
||||
<string name="drawer_page_effects">Effecten</string>
|
||||
<string name="drawer_page_controls">Bediening</string>
|
||||
<string name="drawer_page_components">Componenten</string>
|
||||
|
||||
@@ -679,6 +679,8 @@
|
||||
<string name="drawer_page_display">Wyświetlacz</string>
|
||||
<string name="drawer_frame_limit">Limit klatek</string>
|
||||
<string name="drawer_frame_limit_note">Ogranicza tę grę. Wyświetlacz przełącza się na częstotliwość odświeżania podzielną przez limit, jeśli taka jest; inne limity mogą wyglądać nierówno. Gry Steam używają limitu klatek Steam w menu szybkiego dostępu.</string>
|
||||
<string name="drawer_bfi">Wstawianie czarnych klatek</string>
|
||||
<string name="drawer_bfi_note">Ostrzejszy ruch: po każdej klatce następuje czarne odświeżenie. Wymaga 100 Hz lub więcej; gra działa z połową częstotliwości odświeżania i jest ciemniejsza. Wyłączone przy generowaniu klatek.</string>
|
||||
<string name="drawer_page_effects">Efekty</string>
|
||||
<string name="drawer_page_controls">Sterowanie</string>
|
||||
<string name="drawer_page_components">Komponenty</string>
|
||||
|
||||
@@ -677,6 +677,8 @@
|
||||
<string name="drawer_page_display">Ecrã</string>
|
||||
<string name="drawer_frame_limit">Limite de fotogramas</string>
|
||||
<string name="drawer_frame_limit_note">Limita este jogo. O ecrã muda para uma taxa de atualização que o limite divida de forma exata, quando existe; outros limites podem parecer irregulares. Os jogos Steam utilizam o Limite de fotogramas do Steam no Menu de acesso rápido.</string>
|
||||
<string name="drawer_bfi">Inserção de fotogramas pretos</string>
|
||||
<string name="drawer_bfi_note">Movimento mais nítido: cada fotograma é seguido de uma atualização preta. Requer 100 Hz ou mais; o jogo corre a metade da taxa de atualização e fica mais escuro. Desligado com a geração de fotogramas.</string>
|
||||
<string name="drawer_page_effects">Efeitos</string>
|
||||
<string name="drawer_page_controls">Controlos</string>
|
||||
<string name="drawer_page_components">Componentes</string>
|
||||
|
||||
@@ -677,6 +677,8 @@
|
||||
<string name="drawer_page_display">Tela</string>
|
||||
<string name="drawer_frame_limit">Limite de quadros</string>
|
||||
<string name="drawer_frame_limit_note">Limita este jogo. A tela muda para uma taxa de atualização que o limite divida por igual, quando houver; outros limites podem parecer irregulares. Jogos da Steam usam o Limite de quadros da Steam no menu de Acesso rápido.</string>
|
||||
<string name="drawer_bfi">Inserção de quadros pretos</string>
|
||||
<string name="drawer_bfi_note">Movimento mais nítido: cada quadro é seguido por uma atualização preta. Requer 100 Hz ou mais; o jogo roda na metade da taxa de atualização e fica mais escuro. Desligado com a geração de quadros.</string>
|
||||
<string name="drawer_page_effects">Efeitos</string>
|
||||
<string name="drawer_page_controls">Controles</string>
|
||||
<string name="drawer_page_components">Componentes</string>
|
||||
|
||||
@@ -677,6 +677,8 @@
|
||||
<string name="drawer_page_display">Afișaj</string>
|
||||
<string name="drawer_frame_limit">Limită de cadre</string>
|
||||
<string name="drawer_frame_limit_note">Limitează acest joc. Afișajul trece la o rată de reîmprospătare pe care limita o împarte exact, dacă există; alte limite pot părea neuniforme. Jocurile Steam folosesc Limita de cadre a Steam din meniul Acces rapid.</string>
|
||||
<string name="drawer_bfi">Inserare de cadre negre</string>
|
||||
<string name="drawer_bfi_note">Mișcare mai clară: fiecare cadru este urmat de o reîmprospătare neagră. Necesită 100 Hz sau mai mult; jocul rulează la jumătate din rată și pare mai întunecat. Oprit cât timp generarea de cadre e activă.</string>
|
||||
<string name="drawer_page_effects">Efecte</string>
|
||||
<string name="drawer_page_controls">Comenzi</string>
|
||||
<string name="drawer_page_components">Componente</string>
|
||||
|
||||
@@ -679,6 +679,8 @@
|
||||
<string name="drawer_page_display">Экран</string>
|
||||
<string name="drawer_frame_limit">Ограничение кадров</string>
|
||||
<string name="drawer_frame_limit_note">Ограничивает эту игру. Экран переключается на частоту обновления, которая делится на ограничение без остатка, если такая есть; при других ограничениях движение может быть неровным. Игры Steam используют ограничение кадров Steam в меню быстрого доступа.</string>
|
||||
<string name="drawer_bfi">Вставка чёрных кадров</string>
|
||||
<string name="drawer_bfi_note">Более чёткое движение: после каждого кадра идёт чёрное обновление. Нужно 100 Гц или больше; игра работает на половине частоты обновления и выглядит темнее. Отключено при генерации кадров.</string>
|
||||
<string name="drawer_page_effects">Эффекты</string>
|
||||
<string name="drawer_page_controls">Управление</string>
|
||||
<string name="drawer_page_components">Компоненты</string>
|
||||
|
||||
@@ -675,6 +675,8 @@
|
||||
<string name="drawer_page_display">Skärm</string>
|
||||
<string name="drawer_frame_limit">Bildgräns</string>
|
||||
<string name="drawer_frame_limit_note">Begränsar det här spelet. Skärmen byter till en uppdateringsfrekvens som gränsen delar jämnt när en sådan finns; andra gränser kan se ojämna ut. Steam-spel använder Steams Frame Limit i snabbåtkomstmenyn.</string>
|
||||
<string name="drawer_bfi">Infogning av svarta bilder</string>
|
||||
<string name="drawer_bfi_note">Skarpare rörelser: varje bild följs av en svart uppdatering. Kräver 100 Hz eller mer; spelet körs på halva uppdateringsfrekvensen och ser mörkare ut. Av medan bildgenerering är på.</string>
|
||||
<string name="drawer_page_effects">Effekter</string>
|
||||
<string name="drawer_page_controls">Kontroller</string>
|
||||
<string name="drawer_page_components">Komponenter</string>
|
||||
|
||||
@@ -673,6 +673,8 @@
|
||||
<string name="drawer_page_display">หน้าจอ</string>
|
||||
<string name="drawer_frame_limit">จำกัดเฟรม</string>
|
||||
<string name="drawer_frame_limit_note">จำกัดเฟรมเรตของเกมนี้ หน้าจอจะเปลี่ยนไปใช้อัตรารีเฟรชที่หารด้วยค่าที่จำกัดได้ลงตัวหากมี ค่าอื่นอาจดูไม่สม่ำเสมอ เกม Steam ใช้ Frame Limit ของ Steam ในเมนู Quick Access</string>
|
||||
<string name="drawer_bfi">แทรกเฟรมสีดำ</string>
|
||||
<string name="drawer_bfi_note">ภาพเคลื่อนไหวคมขึ้น: ทุกเฟรมตามด้วยการรีเฟรชสีดำ ต้องใช้ 100 Hz ขึ้นไป เกมจะทำงานที่ครึ่งหนึ่งของรีเฟรชเรตและดูมืดลง ปิดอยู่ขณะเปิดการสร้างเฟรม</string>
|
||||
<string name="drawer_page_effects">เอฟเฟกต์</string>
|
||||
<string name="drawer_page_controls">การควบคุม</string>
|
||||
<string name="drawer_page_components">คอมโพเนนต์</string>
|
||||
|
||||
@@ -675,6 +675,8 @@
|
||||
<string name="drawer_page_display">Ekran</string>
|
||||
<string name="drawer_frame_limit">Kare sınırı</string>
|
||||
<string name="drawer_frame_limit_note">Bu oyunu sınırlar. Ekran, varsa sınırın tam böldüğü bir yenileme hızına geçer; diğer sınırlar düzensiz görünebilir. Steam oyunları Hızlı erişim menüsündeki Steam\'in Kare Sınırı ayarını kullanır.</string>
|
||||
<string name="drawer_bfi">Siyah kare ekleme</string>
|
||||
<string name="drawer_bfi_note">Daha net hareket: her kareyi siyah bir yenileme izler. 100 Hz veya üzeri gerekir; oyun yenileme hızının yarısında çalışır ve daha koyu görünür. Kare üretimi açıkken kapalıdır.</string>
|
||||
<string name="drawer_page_effects">Efektler</string>
|
||||
<string name="drawer_page_controls">Kontroller</string>
|
||||
<string name="drawer_page_components">Bileşenler</string>
|
||||
|
||||
@@ -679,6 +679,8 @@
|
||||
<string name="drawer_page_display">Екран</string>
|
||||
<string name="drawer_frame_limit">Обмеження кадрів</string>
|
||||
<string name="drawer_frame_limit_note">Обмежує цю гру. Екран перемикається на частоту оновлення, яка ділиться на обмеження без залишку, якщо така є; інші обмеження можуть виглядати нерівно. Ігри Steam використовують обмеження кадрів Steam у меню швидкого доступу.</string>
|
||||
<string name="drawer_bfi">Вставлення чорних кадрів</string>
|
||||
<string name="drawer_bfi_note">Чіткіший рух: після кожного кадру йде чорне оновлення. Потрібно 100 Гц або більше; гра працює на половині частоти оновлення й виглядає темнішою. Вимкнено під час генерації кадрів.</string>
|
||||
<string name="drawer_page_effects">Ефекти</string>
|
||||
<string name="drawer_page_controls">Керування</string>
|
||||
<string name="drawer_page_components">Компоненти</string>
|
||||
|
||||
@@ -673,6 +673,8 @@
|
||||
<string name="drawer_page_display">Hiển thị</string>
|
||||
<string name="drawer_frame_limit">Giới hạn khung hình</string>
|
||||
<string name="drawer_frame_limit_note">Giới hạn game này. Màn hình chuyển sang tần số quét chia hết cho mức giới hạn nếu có; các mức khác có thể trông không đều. Game Steam dùng Frame Limit của Steam trong menu Quick Access.</string>
|
||||
<string name="drawer_bfi">Chèn khung hình đen</string>
|
||||
<string name="drawer_bfi_note">Chuyển động sắc nét hơn: mỗi khung hình được theo sau bởi một lần làm mới màu đen. Cần 100 Hz trở lên; trò chơi chạy ở một nửa tần số quét và trông tối hơn. Tắt khi bật tạo khung hình.</string>
|
||||
<string name="drawer_page_effects">Hiệu ứng</string>
|
||||
<string name="drawer_page_controls">Điều khiển</string>
|
||||
<string name="drawer_page_components">Thành phần</string>
|
||||
|
||||
@@ -673,6 +673,8 @@
|
||||
<string name="drawer_page_display">显示</string>
|
||||
<string name="drawer_frame_limit">帧率限制</string>
|
||||
<string name="drawer_frame_limit_note">限制此游戏的帧率。如有能被上限整除的刷新率,显示屏会切换到该刷新率;其他上限可能导致画面不均匀。Steam 游戏请使用快捷访问菜单中的 Steam 帧率限制。</string>
|
||||
<string name="drawer_bfi">黑帧插入</string>
|
||||
<string name="drawer_bfi_note">动态更清晰:每帧之后插入一次黑色刷新。需要 100 Hz 或更高;游戏以一半刷新率运行,画面更暗。开启帧生成时不可用。</string>
|
||||
<string name="drawer_page_effects">画面效果</string>
|
||||
<string name="drawer_page_controls">控制</string>
|
||||
<string name="drawer_page_components">组件</string>
|
||||
|
||||
@@ -673,6 +673,8 @@
|
||||
<string name="drawer_page_display">顯示</string>
|
||||
<string name="drawer_frame_limit">幀率限制</string>
|
||||
<string name="drawer_frame_limit_note">限制此遊戲的幀率。若有能被此上限整除的螢幕更新率,顯示器會切換至該更新率;其他上限可能看起來不平順。Steam 遊戲請使用快速存取選單中 Steam 的幀率限制。</string>
|
||||
<string name="drawer_bfi">黑幀插入</string>
|
||||
<string name="drawer_bfi_note">動態更清晰:每幀之後插入一次黑色更新。需要 100 Hz 或更高;遊戲以一半更新率運行,畫面較暗。開啟幀生成時不可用。</string>
|
||||
<string name="drawer_page_effects">效果</string>
|
||||
<string name="drawer_page_controls">控制</string>
|
||||
<string name="drawer_page_components">組件</string>
|
||||
|
||||
@@ -673,6 +673,8 @@
|
||||
<string name="drawer_page_display">顯示</string>
|
||||
<string name="drawer_frame_limit">影格率限制</string>
|
||||
<string name="drawer_frame_limit_note">限制此遊戲的影格率。若有能被此上限整除的螢幕更新率,顯示器會切換至該更新率;其他上限可能看起來不平順。Steam 遊戲請使用快速存取選單中 Steam 的影格率限制。</string>
|
||||
<string name="drawer_bfi">黑幀插入</string>
|
||||
<string name="drawer_bfi_note">動態更清晰:每幀之後插入一次黑色更新。需要 100 Hz 或更高;遊戲以一半更新率執行,畫面較暗。開啟幀生成時不可用。</string>
|
||||
<string name="drawer_page_effects">效果</string>
|
||||
<string name="drawer_page_controls">控制</string>
|
||||
<string name="drawer_page_components">元件</string>
|
||||
|
||||
@@ -703,6 +703,8 @@
|
||||
<string name="drawer_page_display">Display</string>
|
||||
<string name="drawer_frame_limit">Frame limit</string>
|
||||
<string name="drawer_frame_limit_note">Caps this game. The display switches to a refresh rate the cap divides evenly when it has one; other caps can look uneven. Steam games use Steam\'s Frame Limit in the Quick Access menu.</string>
|
||||
<string name="drawer_bfi">Black frame insertion</string>
|
||||
<string name="drawer_bfi_note">Sharper motion: a black refresh follows every frame. Needs 100 Hz or more; the game runs at half the refresh rate and looks dimmer. Off while frame generation is on.</string>
|
||||
<string name="drawer_page_effects">Effects</string>
|
||||
<string name="drawer_page_controls">Controls</string>
|
||||
<string name="drawer_page_components">Components</string>
|
||||
|
||||
@@ -13,7 +13,7 @@ SOURCE = ROOT / 'app/src/main/cpp/waylandcomp/src/compositor.c'
|
||||
|
||||
|
||||
def extract_function(source, name):
|
||||
match = re.search(r'^(?:static )?(?:void|int|uint32_t) ' + re.escape(name) + r'\([^;]*?\) \{',
|
||||
match = re.search(r'^(?:static )?(?:void |int |uint32_t |const char \*)' + re.escape(name) + r'\([^;]*?\) \{',
|
||||
source, re.MULTILINE)
|
||||
if match is None:
|
||||
raise AssertionError(f'Missing compositor function: {name}')
|
||||
|
||||
@@ -51,6 +51,19 @@ static int vkp_cardboard_pose_changed(void) { return pose_changes; }
|
||||
static void render_scene(void) { renders++; g_dirty = 0; g_dirty_since_ns = 0; g_rendered_tick_ns = g_tick_vsync_ns; g_tick_held = 0; }
|
||||
static int on_fallback_timer(void *data) { return 0; }
|
||||
static void on_commit_idle(void *data);
|
||||
volatile int g_bfi;
|
||||
volatile int g_bfi_picture_hold;
|
||||
static int g_bfi_running, g_scene_layer_only, cardboard, quest, blacks;
|
||||
static unsigned g_bfi_phase;
|
||||
static const char *g_bfi_blocked;
|
||||
static struct { unsigned lit, dark, failed; } g_bfi_stats;
|
||||
static int g_scene_w, g_scene_h;
|
||||
#define BFI_MIN_REFRESH_MHZ 99000
|
||||
static atomic_int g_output_refresh_mhz = 144000;
|
||||
static int vkp_cardboard_active(void) { return cardboard; }
|
||||
static int vkp_quest_layer_presentation(void) { return quest; }
|
||||
static int vkp_render_plain(int w, int h) { blacks++; return 0; }
|
||||
static void droiddeck_log(const char *tag, const char *fmt, ...) {}
|
||||
'''
|
||||
|
||||
CHECKS = r'''
|
||||
@@ -186,6 +199,57 @@ int main(void) {
|
||||
assert(renders - r0 == c + 1);
|
||||
}
|
||||
|
||||
/* black frame insertion alternates the scene and black on every tick, and arrivals draw nothing */
|
||||
{
|
||||
const int idles_before = idles_added;
|
||||
const int b0 = blacks;
|
||||
g_bfi = 1;
|
||||
r0 = renders;
|
||||
for (int i = 0; i < 10; i++) {
|
||||
arrive(1 * ms);
|
||||
tick(t += refresh);
|
||||
}
|
||||
assert(g_bfi_running == 1 && idles_added == idles_before);
|
||||
assert(renders - r0 == 5 && blacks - b0 == 5 && g_bfi_stats.lit == 5 && g_bfi_stats.dark == 5);
|
||||
|
||||
/* a capture's picture hold presents only pictures and keeps BFI composing the scene */
|
||||
g_bfi_picture_hold = 1;
|
||||
r0 = renders;
|
||||
const int hb = blacks;
|
||||
for (int i = 0; i < 4; i++) tick(t += refresh);
|
||||
assert(g_bfi_running == 1 && renders - r0 == 4 && blacks == hb);
|
||||
g_bfi_picture_hold = 0;
|
||||
r0 = renders;
|
||||
for (int i = 0; i < 4; i++) tick(t += refresh);
|
||||
assert(renders - r0 == 2 && blacks - hb == 2);
|
||||
|
||||
/* frame generation, a slow screen or a layer-only game make it wait and the tick draws as before */
|
||||
framegen = 1;
|
||||
tick(t += refresh);
|
||||
assert(g_bfi_running == 0 && g_bfi_blocked != NULL);
|
||||
framegen = 0;
|
||||
tick(t += refresh);
|
||||
assert(g_bfi_running == 1);
|
||||
g_output_refresh_mhz = 60000;
|
||||
tick(t += refresh);
|
||||
assert(g_bfi_running == 0);
|
||||
g_output_refresh_mhz = 144000;
|
||||
tick(t += refresh);
|
||||
assert(g_bfi_running == 1);
|
||||
/* late ticks under load do not switch it off while the panel runs fast */
|
||||
g_refresh_ns = 16666667;
|
||||
tick(t += refresh);
|
||||
assert(g_bfi_running == 1);
|
||||
g_refresh_ns = refresh;
|
||||
g_scene_layer_only = 1;
|
||||
tick(t += refresh);
|
||||
assert(g_bfi_running == 0);
|
||||
g_scene_layer_only = 0;
|
||||
g_bfi = 0;
|
||||
tick(t += refresh);
|
||||
assert(g_bfi_running == 0 && g_bfi_blocked == NULL);
|
||||
}
|
||||
|
||||
/* without screen ticks the fallback timer still draws */
|
||||
clock_ns += 200000000LL;
|
||||
schedule_render();
|
||||
@@ -206,7 +270,8 @@ class RenderOnCommitTest(unittest.TestCase):
|
||||
render = extract_function(source, 'render_scene')
|
||||
self.assertIn('g_rendered_tick_ns = g_tick_vsync_ns;', render)
|
||||
self.assertIn('g_tick_held = 0;', render)
|
||||
functions = ('scene_held_for_limit', 'commit_renders_on', 'render_on_commit', 'schedule_render', 'scene_waits_for_game', 'on_commit_idle', 'on_vsync')
|
||||
functions = ('scene_held_for_limit', 'commit_renders_on', 'render_on_commit', 'schedule_render', 'scene_waits_for_game', 'on_commit_idle',
|
||||
'bfi_blocked', 'bfi_update', 'bfi_tick', 'on_vsync')
|
||||
harness = PREAMBLE + '\n'.join(extract_function(source, name) for name in functions) + CHECKS
|
||||
with tempfile.TemporaryDirectory(prefix='droiddeck-render-on-commit-') as folder:
|
||||
path = Path(folder)
|
||||
|
||||
Reference in new issue
Block a user