From 758e7983faf74799406bb66b5717d4fcb10b79b2 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 16 Nov 2026 07:33:39 -0500 Subject: [PATCH] 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 --- README.md | 1 + app/src/main/cpp/waylandcomp/src/compositor.c | 89 ++++++++++++++++++- app/src/main/cpp/waylandcomp/src/vk_present.c | 4 +- .../cpp/waylandcomp/src/waylandcomp_jni.c | 13 +++ .../com/droiddeck/launcher/SessionActivity.kt | 83 ++++++++++++----- .../droiddeck/launcher/session/PerfMode.kt | 1 + .../launcher/session/SessionPrefs.kt | 6 ++ .../launcher/session/SettingsReset.kt | 2 +- .../droiddeck/launcher/ui/SessionOverlay.kt | 6 ++ .../launcher/wayland/CompositorHost.kt | 28 +++++- .../launcher/wayland/WaylandCompositor.java | 4 + app/src/main/res/values-ar/strings.xml | 2 + app/src/main/res/values-b+es+419/strings.xml | 2 + app/src/main/res/values-bg/strings.xml | 2 + app/src/main/res/values-cs/strings.xml | 2 + app/src/main/res/values-da/strings.xml | 2 + app/src/main/res/values-de/strings.xml | 2 + app/src/main/res/values-el/strings.xml | 2 + app/src/main/res/values-es/strings.xml | 2 + app/src/main/res/values-fi/strings.xml | 2 + app/src/main/res/values-fr/strings.xml | 2 + app/src/main/res/values-hi/strings.xml | 2 + app/src/main/res/values-hu/strings.xml | 2 + app/src/main/res/values-in/strings.xml | 2 + app/src/main/res/values-it/strings.xml | 2 + app/src/main/res/values-ja/strings.xml | 2 + app/src/main/res/values-ko/strings.xml | 2 + app/src/main/res/values-ms/strings.xml | 2 + app/src/main/res/values-nb/strings.xml | 2 + app/src/main/res/values-nl/strings.xml | 2 + app/src/main/res/values-pl/strings.xml | 2 + app/src/main/res/values-pt-rPT/strings.xml | 2 + app/src/main/res/values-pt/strings.xml | 2 + app/src/main/res/values-ro/strings.xml | 2 + app/src/main/res/values-ru/strings.xml | 2 + app/src/main/res/values-sv/strings.xml | 2 + app/src/main/res/values-th/strings.xml | 2 + app/src/main/res/values-tr/strings.xml | 2 + app/src/main/res/values-uk/strings.xml | 2 + app/src/main/res/values-vi/strings.xml | 2 + app/src/main/res/values-zh-rCN/strings.xml | 2 + app/src/main/res/values-zh-rHK/strings.xml | 2 + app/src/main/res/values-zh-rTW/strings.xml | 2 + app/src/main/res/values/strings.xml | 2 + tools/tests/test_output_refresh.py | 2 +- tools/tests/test_render_on_commit.py | 67 +++++++++++++- 46 files changed, 343 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 2ed4e42f9a..a62414073d 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/app/src/main/cpp/waylandcomp/src/compositor.c b/app/src/main/cpp/waylandcomp/src/compositor.c index 39a20bc7ac..94ec75d26e 100644 --- a/app/src/main/cpp/waylandcomp/src/compositor.c +++ b/app/src/main/cpp/waylandcomp/src/compositor.c @@ -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)); diff --git a/app/src/main/cpp/waylandcomp/src/vk_present.c b/app/src/main/cpp/waylandcomp/src/vk_present.c index e0e494cb87..9844aca302 100644 --- a/app/src/main/cpp/waylandcomp/src/vk_present.c +++ b/app/src/main/cpp/waylandcomp/src/vk_present.c @@ -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)" diff --git a/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c b/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c index 2b6aaa1202..2a6b8e2908 100644 --- a/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c +++ b/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c @@ -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; diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 6aed0ecf48..23fffd4001 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -500,6 +500,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private var drawerGameProfileId by mutableStateOf(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 diff --git a/app/src/main/java/com/droiddeck/launcher/session/PerfMode.kt b/app/src/main/java/com/droiddeck/launcher/session/PerfMode.kt index 98976d2964..531f5f4607 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/PerfMode.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/PerfMode.kt @@ -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(2) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index 9bd15695c9..c9df167716 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -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) { diff --git a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt index 92ec84c13a..0cd971422a 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -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", diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt index 7174fd8b25..1d022d5b12 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -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 diff --git a/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt b/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt index 3a47cfeaa3..ad4878b2ef 100644 --- a/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt @@ -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 diff --git a/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java b/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java index 39c37f0a47..4761bad373 100644 --- a/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java +++ b/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java @@ -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); diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 1f05b663c9..88e150a04a 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -683,6 +683,8 @@ العرض حد الإطارات يحدّ هذه اللعبة. تنتقل الشاشة إلى معدل تحديث يقبل القسمة على الحد إن وُجد، وقد تبدو الحدود الأخرى غير منتظمة. تستخدم ألعاب Steam حد الإطارات في Steam ضمن قائمة الوصول السريع. + إدراج إطار أسود + حركة أوضح: يتبع كل إطار تحديث أسود. يتطلب 100 هرتز أو أكثر؛ تعمل اللعبة بنصف معدل التحديث وتبدو أغمق. يتوقف أثناء تشغيل توليد الإطارات. المؤثرات عناصر التحكم المكوّنات diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 17d84ace22..43000b9a3d 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -677,6 +677,8 @@ Pantalla Límite de fotogramas 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. + Inserción de cuadros negros + 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. Efectos Controles Componentes diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index db5d6f35fd..d2682098c7 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -675,6 +675,8 @@ Екран Ограничение на кадрите Ограничава тази игра. Екранът преминава към честота на опресняване, която се дели точно на ограничението, ако има такава; другите ограничения може да изглеждат неравномерни. Игрите в Steam използват Frame Limit на Steam в менюто Quick Access. + Вмъкване на черни кадри + По-ясно движение: след всеки кадър следва черно опресняване. Нужни са 100 Hz или повече; играта върви на половината честота и изглежда по-тъмна. Изключено при генериране на кадри. Ефекти Контроли Компоненти diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index f640a9b2d4..dd9d5a5794 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -679,6 +679,8 @@ Displej Limit snímků 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. + Vkládání černých snímků + 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ů. Efekty Ovládání Komponenty diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index f24bc117e4..9e1ef1ad76 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -675,6 +675,8 @@ Skærm Billedgrænse 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. + Indsættelse af sorte billeder + 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. Effekter Kontroller Komponenter diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 3836e1672d..b062adf353 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -675,6 +675,8 @@ Anzeige Bildratenlimit 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ü. + Schwarzbild-Einfügung + 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. Effekte Steuerung Komponenten diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 8aab95076f..cc1cdd3ab4 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -675,6 +675,8 @@ Οθόνη Όριο καρέ Περιορίζει αυτό το παιχνίδι. Η οθόνη αλλάζει σε ρυθμό ανανέωσης που διαιρείται ακριβώς με το όριο, αν υπάρχει· άλλα όρια μπορεί να φαίνονται ανομοιόμορφα. Τα παιχνίδια Steam χρησιμοποιούν το Frame Limit του Steam στο μενού Quick Access. + Εισαγωγή μαύρων καρέ + Πιο καθαρή κίνηση: κάθε καρέ ακολουθείται από μαύρη ανανέωση. Απαιτεί 100 Hz ή περισσότερα· το παιχνίδι τρέχει στον μισό ρυθμό ανανέωσης και φαίνεται πιο σκοτεινό. Ανενεργό όσο λειτουργεί η δημιουργία καρέ. Εφέ Χειριστήρια Στοιχεία diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index ab614c3ce7..e206ed3c9d 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -677,6 +677,8 @@ Pantalla Límite de fotogramas 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. + Inserción de fotogramas negros + 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. Efectos Controles Componentes diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 856a984fbd..68e1bac5db 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -675,6 +675,8 @@ Näyttö Kuvanopeusraja 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. + Mustien kuvien lisäys + 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. Tehosteet Ohjaimet Komponentit diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index e2a1c927fa..2d19ea9451 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -677,6 +677,8 @@ Affichage Limite d\'images 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. + Insertion d\'images noires + 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. Effets Contrôles Composants diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 7c32f0bcbe..a759cbf009 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -675,6 +675,8 @@ डिस्प्ले फ़्रेम सीमा इस गेम को सीमित करता है। अगर डिस्प्ले में ऐसा रिफ़्रेश रेट है जिसे सीमा बराबर भाग देती है, तो वह उस पर चला जाता है; दूसरी सीमाएं असमान लग सकती हैं। Steam गेम, Quick Access मेनू में Steam की Frame Limit इस्तेमाल करते हैं। + ब्लैक फ़्रेम इंसर्शन + ज़्यादा साफ़ मोशन: हर फ़्रेम के बाद एक काला रिफ़्रेश आता है। 100 Hz या ज़्यादा चाहिए; गेम आधे रिफ़्रेश रेट पर चलता है और गहरा दिखता है। फ़्रेम जनरेशन चालू होने पर बंद रहता है। इफ़ेक्ट कंट्रोल कॉम्पोनेंट diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 2c8e9de881..6f947cb350 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -675,6 +675,8 @@ Kijelző Képkockakorlát 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. + Fekete képkocka beszúrása + É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. Effektek Vezérlők Összetevők diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 06b1ad1b79..7ee19817c6 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -673,6 +673,8 @@ Tampilan Batas frame 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. + Penyisipan bingkai hitam + 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. Efek Kontrol Komponen diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 8ee4cf0869..17bdc0ded1 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -677,6 +677,8 @@ Schermo Limite frame 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. + Inserimento di fotogrammi neri + 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. Effetti Controlli Componenti diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index dda237f330..cf9e3e333d 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -673,6 +673,8 @@ 表示 フレームレート制限 このゲームのフレームレートを制限します。上限で割り切れるリフレッシュレートがあれば画面はそれに切り替わり、それ以外の上限では表示が不均一になることがあります。SteamゲームではクイックアクセスメニューにあるSteamのフレームレート制限を使用します。 + 黒フレーム挿入 + 動きがくっきり: 各フレームの後に黒いリフレッシュが入ります。100 Hz 以上が必要で、ゲームはリフレッシュレートの半分で動作し、画面は暗くなります。フレーム生成中はオフです。 エフェクト コントロール コンポーネント diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 5516555fb4..de071aeb46 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -673,6 +673,8 @@ 디스플레이 프레임 제한 이 게임의 프레임을 제한합니다. 제한값으로 나누어떨어지는 주사율이 있으면 디스플레이가 그 주사율로 전환되며, 그 밖의 제한값은 고르지 않게 보일 수 있습니다. Steam 게임은 빠른 액세스 메뉴의 Steam 프레임 제한을 사용합니다. + 블랙 프레임 삽입 + 더 선명한 움직임: 매 프레임 뒤에 검은 화면 갱신이 들어갑니다. 100Hz 이상이 필요하며 게임은 주사율의 절반으로 실행되고 더 어둡게 보입니다. 프레임 생성 중에는 꺼집니다. 효과 컨트롤 구성 요소 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 2630036f56..5ebec82c3a 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -673,6 +673,8 @@ Paparan Had bingkai 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. + Sisipan bingkai hitam + 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. Kesan Kawalan Komponen diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 8f3ee6a6aa..f0ff8fa5d5 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -675,6 +675,8 @@ Skjerm Bildefrekvensgrense 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. + Innsetting av svarte bilder + 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å. Effekter Kontroller Komponenter diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 1cd50ef96e..cfd17efa7b 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -675,6 +675,8 @@ Scherm Framelimiet 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. + Zwarte frames invoegen + 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. Effecten Bediening Componenten diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 3ed82432cd..e8e5c335e9 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -679,6 +679,8 @@ Wyświetlacz Limit klatek 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. + Wstawianie czarnych klatek + 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. Efekty Sterowanie Komponenty diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 3ba244fb02..ab4d2b72ca 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -677,6 +677,8 @@ Ecrã Limite de fotogramas 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. + Inserção de fotogramas pretos + 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. Efeitos Controlos Componentes diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 2f4344522e..c142d435e8 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -677,6 +677,8 @@ Tela Limite de quadros 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. + Inserção de quadros pretos + 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. Efeitos Controles Componentes diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 41224c92f0..747dbfd15b 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -677,6 +677,8 @@ Afișaj Limită de cadre 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. + Inserare de cadre negre + 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ă. Efecte Comenzi Componente diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 99a4421e20..3defadddd2 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -679,6 +679,8 @@ Экран Ограничение кадров Ограничивает эту игру. Экран переключается на частоту обновления, которая делится на ограничение без остатка, если такая есть; при других ограничениях движение может быть неровным. Игры Steam используют ограничение кадров Steam в меню быстрого доступа. + Вставка чёрных кадров + Более чёткое движение: после каждого кадра идёт чёрное обновление. Нужно 100 Гц или больше; игра работает на половине частоты обновления и выглядит темнее. Отключено при генерации кадров. Эффекты Управление Компоненты diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index a2f94dc88c..45b8583561 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -675,6 +675,8 @@ Skärm Bildgräns 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. + Infogning av svarta bilder + 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å. Effekter Kontroller Komponenter diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index fa5a17e016..6a96c34838 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -673,6 +673,8 @@ หน้าจอ จำกัดเฟรม จำกัดเฟรมเรตของเกมนี้ หน้าจอจะเปลี่ยนไปใช้อัตรารีเฟรชที่หารด้วยค่าที่จำกัดได้ลงตัวหากมี ค่าอื่นอาจดูไม่สม่ำเสมอ เกม Steam ใช้ Frame Limit ของ Steam ในเมนู Quick Access + แทรกเฟรมสีดำ + ภาพเคลื่อนไหวคมขึ้น: ทุกเฟรมตามด้วยการรีเฟรชสีดำ ต้องใช้ 100 Hz ขึ้นไป เกมจะทำงานที่ครึ่งหนึ่งของรีเฟรชเรตและดูมืดลง ปิดอยู่ขณะเปิดการสร้างเฟรม เอฟเฟกต์ การควบคุม คอมโพเนนต์ diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index cf874e3756..5cac17120b 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -675,6 +675,8 @@ Ekran Kare sınırı 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. + Siyah kare ekleme + 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. Efektler Kontroller Bileşenler diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 94dba311b6..e8a3700511 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -679,6 +679,8 @@ Екран Обмеження кадрів Обмежує цю гру. Екран перемикається на частоту оновлення, яка ділиться на обмеження без залишку, якщо така є; інші обмеження можуть виглядати нерівно. Ігри Steam використовують обмеження кадрів Steam у меню швидкого доступу. + Вставлення чорних кадрів + Чіткіший рух: після кожного кадру йде чорне оновлення. Потрібно 100 Гц або більше; гра працює на половині частоти оновлення й виглядає темнішою. Вимкнено під час генерації кадрів. Ефекти Керування Компоненти diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 78043b8bc6..6bf128970a 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -673,6 +673,8 @@ Hiển thị Giới hạn khung hình 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. + Chèn khung hình đen + 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. Hiệu ứng Điều khiển Thành phần diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index f2dc1017d5..30911b00be 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -673,6 +673,8 @@ 显示 帧率限制 限制此游戏的帧率。如有能被上限整除的刷新率,显示屏会切换到该刷新率;其他上限可能导致画面不均匀。Steam 游戏请使用快捷访问菜单中的 Steam 帧率限制。 + 黑帧插入 + 动态更清晰:每帧之后插入一次黑色刷新。需要 100 Hz 或更高;游戏以一半刷新率运行,画面更暗。开启帧生成时不可用。 画面效果 控制 组件 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 3bf2efdd85..b0e5a656a8 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -673,6 +673,8 @@ 顯示 幀率限制 限制此遊戲的幀率。若有能被此上限整除的螢幕更新率,顯示器會切換至該更新率;其他上限可能看起來不平順。Steam 遊戲請使用快速存取選單中 Steam 的幀率限制。 + 黑幀插入 + 動態更清晰:每幀之後插入一次黑色更新。需要 100 Hz 或更高;遊戲以一半更新率運行,畫面較暗。開啟幀生成時不可用。 效果 控制 組件 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 219bf2d709..39ba5d5095 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -673,6 +673,8 @@ 顯示 影格率限制 限制此遊戲的影格率。若有能被此上限整除的螢幕更新率,顯示器會切換至該更新率;其他上限可能看起來不平順。Steam 遊戲請使用快速存取選單中 Steam 的影格率限制。 + 黑幀插入 + 動態更清晰:每幀之後插入一次黑色更新。需要 100 Hz 或更高;遊戲以一半更新率執行,畫面較暗。開啟幀生成時不可用。 效果 控制 元件 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 30875a9553..a675abc5c4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -703,6 +703,8 @@ Display Frame limit 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. + Black frame insertion + 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. Effects Controls Components diff --git a/tools/tests/test_output_refresh.py b/tools/tests/test_output_refresh.py index 5ad9aa36ed..8896d3e551 100644 --- a/tools/tests/test_output_refresh.py +++ b/tools/tests/test_output_refresh.py @@ -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}') diff --git a/tools/tests/test_render_on_commit.py b/tools/tests/test_render_on_commit.py index 698944f844..c0b8c436d5 100644 --- a/tools/tests/test_render_on_commit.py +++ b/tools/tests/test_render_on_commit.py @@ -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)