Merge org main 7bc35297 into the non-Adreno test branch

Two commits since a5b035b2, no conflicts: DirectAudio low-latency fallback (#1862) and the test and
local build watermark (#1863), which CI builds without a PR number (this test APK) do not draw.
This commit is contained in:
The412Banner committed 2026-10-30 20:42:26 +00:00
commit f3ba9351e5
12 files changed
+282 -10

No files matched your search

@@ -17,6 +17,7 @@ class App : Application() {
override fun onCreate() {
super.onCreate()
com.droiddeck.launcher.ui.Themes.loadGradient(this)
com.droiddeck.launcher.ui.BuildWatermark.install(this)
// Helper processes must not initialize the main USB provider or guest graphics context.
val process = if (android.os.Build.VERSION.SDK_INT >= 28) Application.getProcessName()
else (getSystemService(ACTIVITY_SERVICE) as android.app.ActivityManager)
@@ -0,0 +1,42 @@
package com.droiddeck.launcher.audio
import android.media.AudioAttributes
import android.media.AudioFormat
import android.media.AudioTrack
import android.util.Log
object DirectAudioTiming {
private const val TAG = "DirectAudioTiming"
const val PERIOD_ENV = "AUDIO_DIRECT_PERIOD_MS"
const val BUFFER_ENV = "AUDIO_DIRECT_MS"
const val SLOW_OUTPUT_PERIOD_MS = 20
const val SLOW_OUTPUT_BUFFER_MS = 60
fun environment(lowLatencyOutput: Boolean): List<String> =
if (lowLatencyOutput) emptyList()
else listOf("$PERIOD_ENV=$SLOW_OUTPUT_PERIOD_MS", "$BUFFER_ENV=$SLOW_OUTPUT_BUFFER_MS")
fun lowLatencyOutput(): Boolean = try {
val track = AudioTrack.Builder()
.setAudioAttributes(AudioAttributes.Builder()
.setUsage(AudioAttributes.USAGE_GAME)
.setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
.build())
.setAudioFormat(AudioFormat.Builder()
.setEncoding(AudioFormat.ENCODING_PCM_FLOAT)
.setSampleRate(48000)
.setChannelMask(AudioFormat.CHANNEL_OUT_STEREO)
.build())
.setPerformanceMode(AudioTrack.PERFORMANCE_MODE_LOW_LATENCY)
.setTransferMode(AudioTrack.MODE_STREAM)
.build()
try {
track.performanceMode == AudioTrack.PERFORMANCE_MODE_LOW_LATENCY
} finally {
track.release()
}
} catch (e: Exception) {
Log.w(TAG, "audio: could not check for low-latency output; DirectAudio keeps its defaults", e)
true
}
}
@@ -34,6 +34,8 @@ object GameEnvironmentOptions {
Option("MESA_EXTENSION_MAX_YEAR", "", 0, Type.TEXT),
Option("MESA_GL_VERSION_OVERRIDE", "", 0, Type.TEXT),
Option("PULSE_LATENCY_MSEC", "", 0, Type.NUMBER),
Option("AUDIO_DIRECT_MS", "", 0, Type.NUMBER),
Option("AUDIO_DIRECT_PERIOD_MS", "", 0, Type.NUMBER),
Option("DROIDDECK_GAME_CORES", "", R.string.game_env_cores, Type.TEXT),
Option("DROIDDECK_ANTICHEAT_OFFLINE", "1", R.string.game_env_anticheat_offline, Type.TOGGLE, listOf("0", "1")),
Option("WINE_LARGE_ADDRESS_AWARE", "0", 0, Type.TOGGLE, listOf("0", "1")),
@@ -896,7 +896,7 @@ class SessionService : Service() {
if (!SessionPrefs.zramClient(this)) guest.add("BL_ZRAM_CLIENT=0")
}
SessionPrefs.vramCapMb(this).takeIf { it > 0 }?.let { guest.add("BL_VRAM_MB=$it") }
guest.add("BANNER_AUDIO_DIRECT_DECAY=0")
guest.add("AUDIO_DIRECT_DECAY=0")
val extra = extraEnv() + agentEnvironment
if (extra.none { it.startsWith("TU_DEBUG=") }) guest.add("$GAME_TU_DEBUG=" + (tuOverride ?: if (tuDriver) "sysmem" else ""))
extra.forEach { guest.add(it) }
@@ -945,7 +945,7 @@ class SessionService : Service() {
val wantsMic = SessionPrefs.micEnabled(this) &&
checkSelfPermission(android.Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED
guest.add("BL_MIC_ENABLED=" + if (wantsMic) "1" else "0")
guest.add("BANNER_AUDIO_DIRECT_MIC=" + if (wantsMic) "1" else "0")
guest.add("AUDIO_DIRECT_MIC=" + if (wantsMic) "1" else "0")
val audioDir = File(filesDir, "directaudio").apply { mkdirs() }
val relaySocket = File(audioDir, "relay.sock")
val micFifo = if (wantsMic) File(audioDir, "mic.fifo") else null
@@ -973,7 +973,11 @@ class SessionService : Service() {
}
if (wantsDirectAudio) {
guest.add("BL_DIRECTAUDIO=/" + SessionFiles.DIRECTAUDIO_DIR)
guest.add("BANNER_AUDIO_DIRECT_RELAY=" + relaySocket.absolutePath)
guest.add("AUDIO_DIRECT_RELAY=" + relaySocket.absolutePath)
val lowLatency = com.droiddeck.launcher.audio.DirectAudioTiming.lowLatencyOutput()
val timing = com.droiddeck.launcher.audio.DirectAudioTiming.environment(lowLatency)
guest.addAll(timing)
Log.i(TAG, "audio: Android output " + (if (lowLatency) "is low-latency; DirectAudio keeps its defaults" else "is not low-latency; DirectAudio uses " + timing.joinToString(" ")))
}
Log.i(TAG, "audio: client DirectAudio (in-process sink)" + (if (wantsDirectAudio) " + DirectAudio for games" else "")
+ (if (wantsMic) " + microphone" else "") +
@@ -0,0 +1,113 @@
package com.droiddeck.launcher.ui
import android.app.Activity
import android.app.Application
import android.content.Context
import android.graphics.Canvas
import android.graphics.Paint
import android.graphics.Typeface
import android.os.Bundle
import android.text.TextPaint
import android.text.TextUtils
import android.util.TypedValue
import android.view.Gravity
import android.view.View
import android.view.ViewGroup
import android.widget.FrameLayout
import com.droiddeck.launcher.BuildConfig
import com.droiddeck.launcher.QuestXrActivity
/** A faint bottom-right tag on every screen of a test or local build; stable and preview builds draw none. */
object BuildWatermark {
private const val TITLE_LIMIT = 80
fun lines(
pr: Int = BuildConfig.PR_NUMBER,
ci: Boolean = BuildConfig.CI_BUILD,
commit: String = BuildConfig.SOURCE_COMMIT,
title: String = BuildConfig.PR_TITLE,
branch: String = BuildConfig.BUILD_BRANCH,
): List<String>? {
if (ci && pr <= 0) return null
val hash = commit.take(7).ifEmpty { "unknown" }
val head = if (pr > 0) "PR-$pr | $hash" else "LOCAL | $hash"
val detail = (if (pr > 0) title else branch).trim()
return if (detail.isEmpty()) listOf(head) else listOf(head, truncate(detail))
}
private fun truncate(text: String) =
if (text.length <= TITLE_LIMIT) text else text.take(TITLE_LIMIT - 1).trimEnd() + "…"
fun install(app: Application) {
val lines = lines() ?: return
app.registerActivityLifecycleCallbacks(object : Application.ActivityLifecycleCallbacks {
override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
if (activity is QuestXrActivity) return
val decor = activity.window.decorView as? ViewGroup ?: return
if (decor.findViewWithTag<View>(TAG) != null) return
val margin = (8 * activity.resources.displayMetrics.density).toInt()
decor.addView(
MarkView(activity, lines).apply { tag = TAG },
FrameLayout.LayoutParams(
ViewGroup.LayoutParams.WRAP_CONTENT,
ViewGroup.LayoutParams.WRAP_CONTENT,
Gravity.BOTTOM or Gravity.END,
).apply { setMargins(margin, margin, margin, margin) },
)
}
override fun onActivityStarted(activity: Activity) = Unit
override fun onActivityResumed(activity: Activity) = Unit
override fun onActivityPaused(activity: Activity) = Unit
override fun onActivityStopped(activity: Activity) = Unit
override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) = Unit
override fun onActivityDestroyed(activity: Activity) = Unit
})
}
private const val TAG = "build-watermark"
private class MarkView(context: Context, private val lines: List<String>) : View(context) {
private var shown = lines
private val paint = TextPaint(Paint.ANTI_ALIAS_FLAG).apply {
color = 0xE6FFFFFF.toInt()
typeface = Typeface.MONOSPACE
textSize = TypedValue.applyDimension(
TypedValue.COMPLEX_UNIT_SP, 9f, context.resources.displayMetrics,
)
setShadowLayer(1.5f * context.resources.displayMetrics.density, 0f, 0f, 0xFF000000.toInt())
textAlign = Paint.Align.RIGHT
}
private val backdrop = Paint(Paint.ANTI_ALIAS_FLAG).apply { color = 0x66303030 }
private val lineHeight get() = paint.fontSpacing
init {
isClickable = false
isFocusable = false
importantForAccessibility = IMPORTANT_FOR_ACCESSIBILITY_NO
setLayerType(LAYER_TYPE_SOFTWARE, null)
}
override fun onMeasure(widthSpec: Int, heightSpec: Int) {
val pad = paddingForShadow() * 2
val limit = if (MeasureSpec.getMode(widthSpec) == MeasureSpec.UNSPECIFIED) Float.MAX_VALUE
else (MeasureSpec.getSize(widthSpec) - pad).coerceAtLeast(0).toFloat()
shown = lines.map { TextUtils.ellipsize(it, paint, limit, TextUtils.TruncateAt.END).toString() }
val width = shown.maxOf { paint.measureText(it) }.toInt() + pad
setMeasuredDimension(width, (lineHeight * shown.size).toInt() + pad)
}
override fun onDraw(canvas: Canvas) {
val pad = paddingForShadow()
val radius = 3f * resources.displayMetrics.density
canvas.drawRoundRect(0f, 0f, width.toFloat(), height.toFloat(), radius, radius, backdrop)
shown.forEachIndexed { i, line ->
canvas.drawText(line, width - pad.toFloat(), pad - paint.ascent() + lineHeight * i, paint)
}
}
override fun onTouchEvent(event: android.view.MotionEvent) = false
private fun paddingForShadow() = (3 * resources.displayMetrics.density).toInt()
}
}
@@ -0,0 +1,17 @@
package com.droiddeck.launcher.audio
import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue
import org.junit.Test
class DirectAudioTimingTest {
@Test
fun lowLatencyOutputKeepsTheDriverDefaults() {
assertTrue(DirectAudioTiming.environment(lowLatencyOutput = true).isEmpty())
}
@Test
fun outputWithoutLowLatencyGetsALongerPeriodAndBuffer() {
assertEquals(listOf("AUDIO_DIRECT_PERIOD_MS=20", "AUDIO_DIRECT_MS=60"), DirectAudioTiming.environment(lowLatencyOutput = false))
}
}
@@ -0,0 +1,35 @@
package com.droiddeck.launcher.ui
import org.junit.Assert.assertEquals
import org.junit.Assert.assertNull
import org.junit.Test
class BuildWatermarkTest {
@Test
fun stableAndPreviewBuildsHaveNoWatermark() {
assertNull(BuildWatermark.lines(pr = 0, ci = true, commit = "abcdef0123", title = "", branch = ""))
}
@Test
fun prBuildShowsNumberHashAndTitle() {
assertEquals(
listOf("PR-1234 | abcdef0", "Fix: foo the bar"),
BuildWatermark.lines(pr = 1234, ci = true, commit = "abcdef0123", title = "Fix: foo the bar", branch = "x"),
)
}
@Test
fun longTitlesTruncateAtEightyCharacters() {
val lines = BuildWatermark.lines(pr = 7, ci = true, commit = "abcdef0", title = "a".repeat(120), branch = "")!!
assertEquals(80, lines[1].length)
assertEquals('…', lines[1].last())
}
@Test
fun localBuildShowsBranch() {
assertEquals(
listOf("LOCAL | abcdef0", "feat/thing"),
BuildWatermark.lines(pr = 0, ci = false, commit = "abcdef0123", title = "", branch = "feat/thing"),
)
}
}