diff --git a/.github/scripts/install-android-packages.sh b/.github/scripts/install-android-packages.sh index 0a3db9fd..7233bc22 100644 --- a/.github/scripts/install-android-packages.sh +++ b/.github/scripts/install-android-packages.sh @@ -11,7 +11,8 @@ fi missing=() for package in "$@"; do - directory="${ANDROID_HOME}/${package//;/\/}" + relative=${package//;/\/} + directory="${ANDROID_HOME}/${relative}" if [[ -f "$directory/package.xml" || -f "$directory/source.properties" ]]; then echo "Using installed SDK package: $package" else diff --git a/.github/scripts/provision-https-ca.sh b/.github/scripts/provision-https-ca.sh index 9ea04efe..7d948c4d 100755 --- a/.github/scripts/provision-https-ca.sh +++ b/.github/scripts/provision-https-ca.sh @@ -83,7 +83,12 @@ pem=$pem_dir/emudhra-ca.pem if [[ $ca_source == secret ]]; then # Base64 only encodes bytes; GitHub Secrets provides the confidentiality, so the # value must never be echoed or written into the checkout. - if ! printf '%s' "${encoded//[[:space:]]/}" | base64 --decode > "$pem" 2>/dev/null; then + # BSD base64 can ignore invalid characters and still exit successfully. + # Check the alphabet and padding before using the platform decoder. + encoded=${encoded//[[:space:]]/} + base64_pattern='^([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$' + if [[ ! $encoded =~ $base64_pattern ]] || + ! printf '%s' "$encoded" | base64 --decode > "$pem" 2>/dev/null; then rm -f -- "$pem" fail 'WHEELPLAY_HTTPS_CA_PEM_BASE64 is not valid Base64. Re-encode the combined PEM file and update the secret.' fi diff --git a/.github/workflows/debug-build.yml b/.github/workflows/debug-build.yml index c9b59769..b575857a 100644 --- a/.github/workflows/debug-build.yml +++ b/.github/workflows/debug-build.yml @@ -98,7 +98,7 @@ jobs: ANDROID_KEY_ALIAS: ${{ github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')) && secrets.ANDROID_KEY_ALIAS || '' }} ANDROID_KEY_PASSWORD: ${{ github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')) && secrets.ANDROID_KEY_PASSWORD || '' }} run: | - tasks=( :projection-plugin-api:assembleRelease :projection-plugin-sample:lintDebug :projection-plugin-sample:assembleDebug :common:assembleDebugAndroidTest :mobile:lintDebug :mobile:assembleDebug :mobile:assembleDebugAndroidTest ) + tasks=( :projection-plugin-api:assembleRelease :projection-plugin-carlink:lintDebug :projection-plugin-sample:lintDebug :projection-plugin-sample:assembleDebug :common:assembleDebugAndroidTest :mobile:lintDebug :mobile:assembleDebug :mobile:assembleDebugAndroidTest ) if [[ "$USE_RELEASE_SIGNING" == true ]]; then bash .github/scripts/build-signed-android.sh "${tasks[@]}" else @@ -107,7 +107,10 @@ jobs: # Native compilation and time-sensitive socket tests must not compete for runner CPU. - name: Run unit tests - run: ./gradlew --no-daemon --build-cache :projection-plugin-api:testDebugUnitTest :shared:testDebugUnitTest :common:testDebugUnitTest + run: ./gradlew --no-daemon --build-cache :projection-plugin-api:testDebugUnitTest :projection-plugin-carlink:testDebugUnitTest :shared:testDebugUnitTest :common:testDebugUnitTest + + - name: Verify offline CarLink dependency tooling + run: python3 -m unittest discover -s test -p 'carlink_sdk_test.py' - name: Upload plugin SDK and independent sample APK uses: actions/upload-artifact@v4 @@ -126,6 +129,8 @@ jobs: path: | projection-plugin-api/build/reports/tests/ projection-plugin-api/build/test-results/ + projection-plugin-carlink/build/reports/tests/ + projection-plugin-carlink/build/test-results/ shared/build/reports/tests/ shared/build/test-results/ common/build/reports/tests/ @@ -167,6 +172,68 @@ jobs: if: always() run: rm -rf -- "$RUNNER_TEMP"/wheelplay-https-ca.* + carlink-apk: + name: CarLink plugin APK + runs-on: ubuntu-24.04 + timeout-minutes: 20 + permissions: + contents: read + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK 25 + uses: actions/setup-java@v4 + with: + java-version: '25' + distribution: temurin + + - name: Set up Gradle cache + uses: gradle/actions/setup-gradle@v5 + with: + cache-read-only: ${{ github.event_name == 'pull_request' }} + + - name: Locate preinstalled Android SDK + run: | + echo "$ANDROID_HOME/cmdline-tools/latest/bin" >> "$GITHUB_PATH" + echo "$ANDROID_HOME/platform-tools" >> "$GITHUB_PATH" + + - name: Install missing Android packages + run: | + bash .github/scripts/install-android-packages.sh \ + "platforms;android-$ANDROID_API_LEVEL" \ + "build-tools;$ANDROID_BUILD_TOOLS" + + - name: Provision pinned CarLink runtime + run: | + sdk_apk="$RUNNER_TEMP/carlink-reference.apk" + sdk_url="$(python3 -c 'import json; print(json.load(open("projection-plugin-carlink/sdk-lock.json"))["apkUrl"])')" + curl --fail --location --retry 3 --proto '=https' --proto-redir '=https' "$sdk_url" --output "$sdk_apk" + python3 scripts/carlink_sdk.py prepare --apk "$sdk_apk" --sdk .local/carlink-sdk + python3 scripts/carlink_sdk.py verify --sdk .local/carlink-sdk + + - name: Build and verify CarLink Debug APK + env: + USE_RELEASE_SIGNING: ${{ github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')) }} + ANDROID_KEYSTORE_BASE64: ${{ github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')) && secrets.ANDROID_KEYSTORE_BASE64 || '' }} + ANDROID_KEYSTORE_PASSWORD: ${{ github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')) && secrets.ANDROID_KEYSTORE_PASSWORD || '' }} + ANDROID_KEY_ALIAS: ${{ github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')) && secrets.ANDROID_KEY_ALIAS || '' }} + ANDROID_KEY_PASSWORD: ${{ github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')) && secrets.ANDROID_KEY_PASSWORD || '' }} + run: | + if [[ "$USE_RELEASE_SIGNING" == true ]]; then + bash .github/scripts/build-signed-android.sh :projection-plugin-carlink:assembleDebug + else + ./gradlew --no-daemon --build-cache :projection-plugin-carlink:assembleDebug + fi + + - name: Upload CarLink Debug APK + uses: actions/upload-artifact@v4 + with: + name: wheelplay-carlink-debug-apk + path: | + projection-plugin-carlink/build/outputs/apk/debug/projection-plugin-carlink-debug.apk + projection-plugin-carlink/build/outputs/apk/debug/carlink-build.json + if-no-files-found: error + browser-runtime: name: Browser HTTP on Android ${{ matrix.api-level }} needs: build diff --git a/.gitignore b/.gitignore index 52117f54..645a7e21 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,9 @@ **/local.properties # Build outputs and dependency caches +__pycache__/ +*.pyc +*.pyo node_modules/ .gradle/ .kotlin/ @@ -33,8 +36,12 @@ mobile/debug/ # IDE-local state (shared project configuration remains trackable) .idea/ +.vscode/ *.iml +# Local diagnostic attachments +.codex-attachments/ + # Logs, crash dumps, temporary files, and editor backups *.log *.hprof diff --git a/README.md b/README.md index ff6eb2e6..96124b43 100644 --- a/README.md +++ b/README.md @@ -12,11 +12,12 @@ Run CarPlay on an Android device and use it from your car's browser. WheelPlay h | --- | --- | | **CarPlay** | USB and wireless iPhone connections, browser display and touch control. Requires valid CarPlay authentication resources. | | **Android Auto — experimental** | USB AOA, explicit Head Unit Server TCP connections, and a guided same-phone connection. Device compatibility still needs validation. | +| **CarLife — experimental** | Same-phone and Wi-Fi reception; [USB AOA](docs/CARLIFE_USB.md) adapter with 3.0 / 4.1, audio, microphone and touch. USB video/touch validated with a computer host; Android-host USB validation is pending. | | **VNC — experimental** | Remote desktop over RFB 3.3/3.7/3.8, JPEG/WebP display, touch, mouse and physical keyboard input, and view-only mode. Actual server/device compatibility still needs validation. | | **Android virtual desktop — experimental** | Shizuku UserService, local app selection, fixed-size JPEG/WebP output, multi-touch and Back. Requires Android 10+/Shizuku 13+; no physical-device compatibility validated yet. See the [guide](docs/ANDROID_DESKTOP.md). | | **Diagnostic sources** | H.264, Surface, and framebuffer test sources for checking the display pipeline without a phone connection. | | **Plugin APKs** | Install and enable independent Surface video/touch sources. Includes a standalone SDK and sample APK; see the [plugin guide](docs/PROJECTION_PLUGINS.md). | -| **ICCOA CarLink** | Planned as a separate plugin APK. No proprietary SDK or CarLink plugin is included. | +| **ICCOA CarLink** | [Independent APK plugin](docs/CARLINK.md) with device-validated Wi-Fi Direct, manual hotspot, USB, and Surface / WebRTC output. Replug the USB cable for error 10007. CI provides a plugin Debug APK; the receiver requires arm64 / 4 KB pages. | One projection source and one browser control session can be active at a time. For Android Auto, audio plays on the Android host and microphone input uses the host; browser audio/microphone routing and automatic wireless discovery are not implemented. See the [Android Auto guide](docs/ANDROID_AUTO.md) for setup and limitations. diff --git a/README.zh-CN.md b/README.zh-CN.md index 89b77be3..ff68acc6 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -16,7 +16,7 @@ | **Android 虚拟桌面(实验性)** | Shizuku UserService、本机应用选择、固定尺寸 JPEG/WebP、多指触控与返回。需要 Android 10+/Shizuku 13+,尚未完成真机兼容性验证,见[使用与验收指南](docs/ANDROID_DESKTOP.md)。 | | **诊断输入源** | 提供 H.264、Surface 和帧缓冲测试源,无需连接手机即可检查画面链路。 | | **插件 APK** | 安装并启用独立的 Surface 画面/触控输入源;提供独立 SDK 和示例 APK,见[插件指南](docs/PROJECTION_PLUGINS.md)。 | -| **ICCOA CarLink** | 计划通过独立插件 APK 提供;本版本不包含专有 SDK 或 CarLink 插件。 | +| **ICCOA CarLink** | [独立 APK 插件](docs/CARLINK_USER_GUIDE.md),支持 Wi-Fi Direct、手动热点和 USB,以及 Surface / WebRTC 输出,已通过实机验证。USB 报 10007 时拔插数据线重连。CI 提供插件 Debug APK;接收设备需 arm64 / 4 KB 内存页。 | 同一时间只运行一个投影输入源,并允许一个浏览器控制会话。Android Auto 的音频播放和麦克风输入均使用 Android 宿主,尚不支持浏览器音频/麦克风转发或自动无线发现。连接方式与限制见 [Android Auto 指南](docs/ANDROID_AUTO.md)。 diff --git a/common/CARLIFE_NOTICE.md b/common/CARLIFE_NOTICE.md new file mode 100644 index 00000000..2f78a530 --- /dev/null +++ b/common/CARLIFE_NOTICE.md @@ -0,0 +1,21 @@ +# CarLife protocol references + +The built-in WheelPlay CarLife receiver lives in `common`. The framing, protobuf +field numbers and handshake sequence were implemented with reference to: + +- [CarPToCarL](https://github.com/jjuugk/CarPToCarL/tree/3cbc8e85544bcffcc2aa45f1f3c5e1c70f9ca715), + commit `3cbc8e85544bcffcc2aa45f1f3c5e1c70f9ca715`: `CarLifeHuClient.kt` and + `CarLifeProtocol.kt`. MIT, copyright (c) 2026 lizhihua. +- [mcarplay](https://github.com/wangxso/mcarplay/tree/8e25e0f69ab7a3bec14649542adea6eb22f74f9a), + commit `8e25e0f69ab7a3bec14649542adea6eb22f74f9a`: CarLife channel, launcher and + session architecture. MIT, copyright (c) 2026 lizhihua. + +License texts are included in `src/main/assets/CarPToCarL-LICENSE.txt` and +`src/main/assets/mcarplay-LICENSE.txt`, and packaged in the APK. + +No vendor APK, decompiled vendor implementation, signing material or +authentication keys are distributed. The vivo-specific field/behavior checks +and their limitations are recorded in `docs/CARLIFE_LOOPBACK_VIVO.md` in the +repository root. Current integration and protocol verification are recorded in +`docs/CARLIFE_WIFI.md` and `docs/CARLIFE_XIAOMI.md`. Support for a protocol version +does not establish compatibility with every vendor or system build. diff --git a/common/build.gradle.kts b/common/build.gradle.kts index f7721ca6..546636da 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -36,6 +36,7 @@ dependencies { implementation(libs.androidx.remote.core) implementation(libs.androidx.remote.player.core) implementation(libs.androidx.remote.player.view) + implementation(project(":ui-theme")) implementation("dev.rikka.shizuku:api:13.1.5") implementation("dev.rikka.shizuku:provider:13.1.5") implementation(project(":projection-plugin-api")) diff --git a/common/src/androidTest/assets/plugin-audio-tone.aac b/common/src/androidTest/assets/plugin-audio-tone.aac new file mode 100644 index 00000000..66edec19 Binary files /dev/null and b/common/src/androidTest/assets/plugin-audio-tone.aac differ diff --git a/common/src/androidTest/java/com/shilapi/xcertplay/projection/plugin/PluginAudioIntegrationTest.kt b/common/src/androidTest/java/com/shilapi/xcertplay/projection/plugin/PluginAudioIntegrationTest.kt new file mode 100644 index 00000000..75c1acc2 --- /dev/null +++ b/common/src/androidTest/java/com/shilapi/xcertplay/projection/plugin/PluginAudioIntegrationTest.kt @@ -0,0 +1,169 @@ +package com.shilapi.xcertplay.projection.plugin + +import android.os.ParcelFileDescriptor +import androidx.test.platform.app.InstrumentationRegistry +import com.shilapi.xcertplay.airplay.AudioFormat +import com.shilapi.xcertplay.airplay.MicrophoneConfig +import com.shilapi.xcertplay.media.PcmInput +import com.shilapi.xcertplay.media.RemoteAudioRoute +import moe.feng.wheelplay.AirPlayPersistence +import moe.feng.wheelplay.CarPlayMicrophoneSource +import moe.feng.wheelplay.plugin.IProjectionPlugin +import moe.feng.wheelplay.plugin.PluginAudioWire +import moe.feng.wheelplay.plugin.PluginAudioWriter +import org.junit.Assert.* +import org.junit.Test +import java.io.DataInputStream +import java.lang.reflect.Proxy +import java.util.concurrent.CountDownLatch +import java.util.concurrent.LinkedBlockingQueue +import java.util.concurrent.TimeUnit +import java.util.concurrent.atomic.AtomicBoolean + +class PluginAudioIntegrationTest { + private val context get() = InstrumentationRegistry.getInstrumentation().targetContext + private open class Route : RemoteAudioRoute { + val packets = LinkedBlockingQueue() + val stopped = LinkedBlockingQueue() + val captured = AtomicBoolean() + val inputClosed = AtomicBoolean() + override val playbackAvailable = true + override fun output(type: Int, format: AudioFormat, pcm: ByteArray, offset: Int, length: Int): Boolean { + packets.add(pcm.copyOfRange(offset, offset + length)); return true + } + override fun audioStopped(type: Int) { stopped.add(type) } + override fun microphone(type: Int, config: MicrophoneConfig): PcmInput = object : PcmInput { + override fun read(buffer: ByteArray): Int { + if (inputClosed.get()) return -1 + if (captured.compareAndSet(false, true)) { buffer.fill(7); return buffer.size } + Thread.sleep(10); return 0 + } + override fun close() { inputClosed.set(true) } + } + override fun microphoneStopped(type: Int) {} + override fun onMicrophoneRouteChanged(listener: () -> Unit) {} + override fun close() {} + } + private fun attach(audio: RemotePluginAudio, errors: LinkedBlockingQueue): Pair { + lateinit var writer: PluginAudioWriter + lateinit var capture: ParcelFileDescriptor + // Local proxy duplicates received FDs just as Binder does across processes. + val peer = Proxy.newProxyInstance(IProjectionPlugin::class.java.classLoader, + arrayOf(IProjectionPlugin::class.java)) { _, method, args -> + check(method.name == "attachAudio") + writer = PluginAudioWriter(ParcelFileDescriptor.dup((args[1] as ParcelFileDescriptor).fileDescriptor), errors::add) + capture = ParcelFileDescriptor.dup((args[2] as ParcelFileDescriptor).fileDescriptor) + null + } as IProjectionPlugin + audio.sendTo(peer, "test") + return writer to capture + } + + @Test fun closingBlockedAudioReaderDoesNotRequireThreadInterruption() { + val errors = LinkedBlockingQueue() + val routeClosed = CountDownLatch(1) + val route = object : Route() { override fun close() { routeClosed.countDown() } } + val audio = RemotePluginAudio(context, false, { true }, { false }, errors::add, { route }) + val (writer, capture) = attach(audio, errors) + try { + // Keep the peer's write end open: closing the host read FD must unblock read(). + audio.close(); audio.awaitStopped() + assertEquals(0L, routeClosed.count) + assertTrue(errors.toString(), errors.isEmpty()) + } finally { audio.close(); writer.close(); writer.awaitStopped(); capture.close() } + } + + @Test fun stopWaitsForPlaybackCleanupWithoutTreatingItsWakeupAsFailure() { + val errors = LinkedBlockingQueue() + val entered = CountDownLatch(1) + val interrupted = CountDownLatch(1) + val release = CountDownLatch(1) + val routeClosed = CountDownLatch(1) + val route = object : Route() { + override fun output(type: Int, format: AudioFormat, pcm: ByteArray, offset: Int, length: Int): Boolean { + entered.countDown() + // Hold the worker through its shutdown interrupt, simulating pending resource cleanup. + val deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(5) + while (release.count != 0L && System.nanoTime() < deadline) { + try { release.await(20, TimeUnit.MILLISECONDS) } + catch (_: InterruptedException) { interrupted.countDown() } + } + return true + } + override fun close() { routeClosed.countDown() } + } + val audio = RemotePluginAudio(context, false, { true }, { false }, errors::add, { route }) + val (writer, capture) = attach(audio, errors) + try { + writer.offer(PluginAudioWire.Start(1, 16, PluginAudioWire.Format(PluginAudioWire.PCM16, 16000, 1))) + writer.offer(PluginAudioWire.Data(1, ByteArray(640))) + assertTrue(entered.await(3, TimeUnit.SECONDS)) + audio.close() + assertTrue(interrupted.await(1, TimeUnit.SECONDS)) + assertFalse("Route must remain open while the playback worker is still releasing resources", + routeClosed.await(200, TimeUnit.MILLISECONDS)) + release.countDown() + audio.awaitStopped() + assertEquals(0L, routeClosed.count) + assertTrue(errors.toString(), errors.isEmpty()) + } finally { + release.countDown(); audio.close() + writer.close(); writer.awaitStopped(); capture.close() + } + } + + @Test fun pcmPlaybackAndSyntheticBrowserMicrophoneReleaseTheirWorkers() { + val route = Route() + val errors = LinkedBlockingQueue() + val format = PluginAudioWire.Format(PluginAudioWire.PCM16, 16000, 1) + val playback = PluginAudioPlayback(context, PluginAudioWire.Start(1, 16, format), route, { true }, errors::add) + val oldSource = AirPlayPersistence.loadMicrophoneSource(context) + var microphone: PluginMicrophone? = null + try { + val pcm = ByteArray(640) { (it % 127).toByte() } + playback.offer(pcm) + assertArrayEquals(pcm, route.packets.poll(3, TimeUnit.SECONDS)) + AirPlayPersistence.saveMicrophoneSource(context, CarPlayMicrophoneSource.BROWSER) + val captured = LinkedBlockingQueue() + microphone = PluginMicrophone(context, PluginAudioWire.Microphone(2, format, false), route, { true }, captured::add) + val packet = captured.poll(3, TimeUnit.SECONDS) + assertNotNull(packet); assertEquals(2L, packet!!.id) + assertArrayEquals(ByteArray(640) { 7 }, packet.bytes) + } finally { + microphone?.close(); microphone?.awaitStopped() + playback.close(); playback.awaitStopped() + AirPlayPersistence.saveMicrophoneSource(context, oldSource) + } + assertTrue(route.inputClosed.get()) + assertEquals(16, route.stopped.poll(3, TimeUnit.SECONDS)) + assertTrue(errors.toString(), errors.isEmpty()) + } + @Test fun aacAdtsIsDecodedByDeviceCodecIntoBrowserPcm() { + val route = Route() + val errors = LinkedBlockingQueue() + val format = PluginAudioWire.Format(PluginAudioWire.AAC_ADTS, 48000, 2) + val playback = PluginAudioPlayback(context, PluginAudioWire.Start(1, 16, format), route, { true }, errors::add) + try { + // Synthetic 440 Hz, 100 ms stereo AAC-LC fixture; contains no recorded audio. + val fixture = InstrumentationRegistry.getInstrumentation().context.assets.open("plugin-audio-tone.aac").use { it.readBytes() } + playback.offer(fixture) + val pcm = route.packets.poll(5, TimeUnit.SECONDS) + assertNotNull(errors.toString(), pcm) + assertTrue(pcm!!.size > 0 && pcm.size % 4 == 0) + } finally { playback.close(); playback.awaitStopped() } + assertTrue(errors.toString(), errors.isEmpty()) + } + @Test fun pipeWriterRoundTripsAndStopsWhileReaderIsIdle() { + val pipe = ParcelFileDescriptor.createReliablePipe() + val errors = LinkedBlockingQueue() + val writer = PluginAudioWriter(pipe[1], errors::add) + val input = DataInputStream(ParcelFileDescriptor.AutoCloseInputStream(pipe[0])) + try { + val expected = PluginAudioWire.Start(1, 16, PluginAudioWire.Format(1, 48000, 2)) + writer.offer(expected) + assertEquals(expected, PluginAudioWire.Reader(input).read()) + writer.close(); writer.awaitStopped() + assertTrue(errors.toString(), errors.isEmpty()) + } finally { writer.close(); input.close() } + } +} diff --git a/common/src/androidTest/java/com/shilapi/xcertplay/web/WebRuntimeTest.kt b/common/src/androidTest/java/com/shilapi/xcertplay/web/WebRuntimeTest.kt index 0fe7b7f9..9bf01828 100644 --- a/common/src/androidTest/java/com/shilapi/xcertplay/web/WebRuntimeTest.kt +++ b/common/src/androidTest/java/com/shilapi/xcertplay/web/WebRuntimeTest.kt @@ -20,9 +20,9 @@ class WebRuntimeTest { val frames = LinkedBlockingQueue>() val preferred = java.util.concurrent.atomic.AtomicReference(ImageFormat.JPEG) val quality = java.util.concurrent.atomic.AtomicInteger(75) - val output = OffscreenVideoOutput(320, 180, { true }, { ImageEncodingOptions(preferred.get(), quality.get()) }) { bytes, format, value -> + val output = OffscreenVideoOutput(320, 180, { true }, { ImageEncodingOptions(preferred.get(), quality.get()) }, publish = { bytes, format, value -> frames.offer(Triple(bytes, format, value)) - } + }) try { val canvas = output.surface.lockCanvas(null); canvas.drawColor(Color.RED) output.surface.unlockCanvasAndPost(canvas) @@ -46,7 +46,7 @@ class WebRuntimeTest { @Test fun offscreenThrottlePublishesFinalFrameWithoutAnotherArrival() { val frames = LinkedBlockingQueue() - val output = OffscreenVideoOutput(320, 180, { true }) { bytes, _, _ -> frames.offer(bytes) } + val output = OffscreenVideoOutput(320, 180, { true }, publish = { bytes, _, _ -> frames.offer(bytes) }) try { fun paint(color: Int) { val canvas = output.surface.lockCanvas(null) @@ -70,7 +70,7 @@ class WebRuntimeTest { @Test fun offscreenSurfaceProducesUprightJpegWithoutActivity() { val ready = CountDownLatch(1) var jpeg: ByteArray? = null - val output = OffscreenVideoOutput(320, 180, { true }) { bytes, _, _ -> jpeg = bytes; ready.countDown() } + val output = OffscreenVideoOutput(320, 180, { true }, publish = { bytes, _, _ -> jpeg = bytes; ready.countDown() }) try { val canvas = output.surface.lockCanvas(null) val paint = Paint() diff --git a/common/src/main/AndroidManifest.xml b/common/src/main/AndroidManifest.xml index f1a34196..99ddb6c9 100644 --- a/common/src/main/AndroidManifest.xml +++ b/common/src/main/AndroidManifest.xml @@ -2,6 +2,19 @@ + + + + + + + + + + + + + @@ -15,6 +28,12 @@ + + + + + + @@ -25,6 +44,7 @@ + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/common/src/main/assets/mcarplay-LICENSE.txt b/common/src/main/assets/mcarplay-LICENSE.txt new file mode 100644 index 00000000..91eee84c --- /dev/null +++ b/common/src/main/assets/mcarplay-LICENSE.txt @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2026 lizhihua + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/common/src/main/assets/web/app.js b/common/src/main/assets/web/app.js index e5e91c0a..8ce0e637 100644 --- a/common/src/main/assets/web/app.js +++ b/common/src/main/assets/web/app.js @@ -1,3 +1,4 @@ +import { sourcePanel, resizeNotice } from './source-control.js'; import { t } from './text.js'; import { createDesktopInput } from './desktop-input.js'; // A surface inversely scaled inside the visual viewport cancels browser zoom. @@ -378,7 +379,7 @@ export function createControlOutbox(socket, { if (kind === 'move' && tail && tail.kind === 'move' && tail.type === data.type && tail.eventKind === data.kind) tail.json = json; else if (touches.length < 64) touches.push({ kind, json, type: data.type, eventKind: data.kind }); else { fail(); return false; } - } else if (['rtc-start', 'rtc-answer', 'rtc-ready', 'rtc-fallback', 'phone-connect', 'image-format', 'location-start', 'location-stop', 'location-clear', 'media-command'].includes(data.type)) { + } else if (['rtc-start', 'rtc-answer', 'rtc-ready', 'rtc-fallback', 'phone-connect', 'source-action', 'image-format', 'location-start', 'location-stop', 'location-clear', 'media-command'].includes(data.type)) { if (signals.length >= 8 || json.length > 32768) { fail(); return false; } if (data.type.startsWith('location-')) locationFix = null; signals.push(json); @@ -995,12 +996,23 @@ if (typeof document !== 'undefined') { let canvas = canvas2d; const display = $('display'); const settingsDialog = $('settings-dialog'); + const resizeDialog = $('resize-dialog'); + let dismissedResize = null; const touchSurface = $('touch-surface'); // Read-only diagnostic snapshots; counters never include pairing credentials or video payloads. const rendererStats = { selectedMode: 'native', activeMode: 'waiting', renderBackend: null, renderedFps: null, renderedFrames: null, fallbackReason: null }; const performanceStats = { source: null, transport: null, receiver: null, image: null, presentation: rendererStats }; const imageDebugStats = createImageDebugStats(); let debugRevision = null; + const autoFullscreenOption = $('settings-auto-fullscreen'); + autoFullscreenOption.checked = false; + try { autoFullscreenOption.checked = window.localStorage.getItem('wheelplay.autoFullscreen') === 'true'; } catch (_) {} + const launchFullscreenOption = $('auto-fullscreen'); + launchFullscreenOption.checked = autoFullscreenOption.checked; + for (const option of [autoFullscreenOption, launchFullscreenOption]) option.addEventListener('change', () => { + autoFullscreenOption.checked = launchFullscreenOption.checked = option.checked; + try { window.localStorage.setItem('wheelplay.autoFullscreen', String(option.checked)); } catch (_) {} + }); const debugOption = $('settings-debug'); try { debugOption.checked = window.localStorage.getItem('wheelplay.debugOverlay') === 'true'; } catch (_) {} debugOption.addEventListener('change', () => { @@ -1010,6 +1022,8 @@ if (typeof document !== 'undefined') { const webpSupport = probeWebp(); Object.defineProperty(window, 'wheelplayStats', { configurable: true, get: () => JSON.parse(JSON.stringify(performanceStats)) }); let rtc = null, rtcRequested = false, rtcFps = null; + let sourceControl = null, sourceRequest = null, sourceReply = '', sourceSequence = 0; + let sourceRequestTimer = null; let socket = null, stopped = true, paired = false, retry = null, attempts = 0; let width = 1280, height = 720, live = false, lastStatus = 0, rtcMedia = {}; let heartbeat = null, movePending = false, moveGeneration = 0, outbox = null; @@ -1373,10 +1387,20 @@ if (typeof document !== 'undefined') { if (value.revision !== desktopRevision) { desktop.release(false); desktopRevision = value.revision; } - live = value.interactive && !settingsDialog.open; + renderResizeNotice(); + live = value.interactive && !settingsDialog.open && !resizeDialog.open; for (const surface of [...screens, video, canvas, heldFrame].filter(Boolean)) surface.classList.toggle('stale', !value.visible); touchSurface.classList.toggle('stale', !live); $('waiting').hidden = value.visible; + const panel = sourcePanel(sourceControl, value, !!rendererStats.fallbackReason); + $('stage').textContent = t(panel.title, panel.name || ''); + $('source-action').hidden = !panel.action; + $('source-action').disabled = sourceRequest !== null; + $('source-action').textContent = t(panel.label || 'web_source_connect', panel.name || ''); + $('source-message').textContent = sourceReply || (!sourceControl?.activeId && sourceControl?.notice) || t(panel.hint, panel.name || ''); + $('media-retry').hidden = !panel.retry; + $('source-stop').hidden = !value.visible || sourceControl?.action !== 'stop'; + $('source-stop').disabled = sourceRequest !== null; $('desktop-back').disabled = !live; if (!live && (pointers.size || desktop.active)) release(); const rtcVisible = rtc && value.visible && value.frame?.transport === 'rtc'; @@ -1386,7 +1410,7 @@ if (typeof document !== 'undefined') { const transport = rtcVisible ? `${rtc.codec === 'H265' ? 'HEVC' : 'H.264'} / WebRTC / ${rendererLabel}${rtcFps === null ? '' : ` · ${rtcFps} fps`}` : `${value.frame?.mime === 'image/webp' ? 'WebP' : 'JPEG'}${fallbackLabel}`; $('status').textContent = value.state === 'recovering' ? t('web_video_recovering', transport) : value.visible ? value.interactive ? t('web_transport_touch_connected', transport, rtc?.recovering ? t('web_waiting_for_recovery') : '') : - t('web_video_input_unavailable', transport) : t('web_connected_waiting_for_iphone_video'); + t('web_video_input_unavailable', transport) : t('web_source_waiting'); $('media-message').hidden = !value.visible || value.interactive; $('media-message').textContent = value.visible && !value.interactive ? $('status').textContent : ''; renderDebug(); @@ -1453,7 +1477,7 @@ if (typeof document !== 'undefined') { try { Promise.resolve(document.exitFullscreen()).catch(() => {}); } catch (_) {} } function prepareLaunchPresentation() { - const presentation = { immersive: true, ownsFullscreen: false, cancelled: false }; + const presentation = { immersive: autoFullscreenOption.checked || Boolean(document.fullscreenElement), ownsFullscreen: false, cancelled: false }; launchPresentation = presentation; if (!presentation.immersive || document.fullscreenElement || !document.documentElement?.requestFullscreen) return; presentation.ownsFullscreen = true; @@ -1477,6 +1501,7 @@ if (typeof document !== 'undefined') { authGeneration++; restoreLaunchPresentation(); stopped = true; paired = false; release(); + sourceControl = null; sourceRequest = null; dismissedResize = null; clearTimeout(sourceRequestTimer); if (outbox) { outbox.close(); outbox = null; } clearTimeout(retry); clearInterval(heartbeat); if (socket) { const old = socket; socket = null; old.close(); } @@ -1550,8 +1575,9 @@ if (typeof document !== 'undefined') { }, }); $('message').textContent = ''; - $('phone-connect').disabled = false; - $('phone-connect-message').textContent = t("web_keep_wheelplay_in_the_foreground_on_android_tap_connect"); + sourceControl = null; sourceRequest = null; sourceReply = ''; clearTimeout(sourceRequestTimer); + $('media-retry').disabled = false; + presentation.refresh(); $('pairing').hidden = true; $('display').hidden = false; $('topbar').hidden = true; lastViewportSignature = ''; @@ -1585,15 +1611,22 @@ if (typeof document !== 'undefined') { } rtc.receive(data); return; } - if (data.type === 'phone-connect-result') { - $('phone-connect').disabled = false; - $('phone-connect-message').textContent = data.message; - return; + if (data.type === 'source-action-result') { + if (data.requestId !== sourceRequest) return; + sourceRequest = null; clearTimeout(sourceRequestTimer); + const messages = { requested: 'web_source_request_sent', configure: 'web_source_android_help', + stopped: 'web_source_stopped', pending: 'web_source_pending', stale: 'web_source_changed', failed: 'web_source_failed' }; + sourceReply = t(messages[data.result] || 'web_source_failed'); + presentation.refresh(); send({ type: 'ping' }); return; } if (data.type === 'busy') { const message = data.message; disconnect(); $('message').textContent = message; return; } if (data.type === 'status') { + if (sourceControl?.revision !== data.sourceControl?.revision) { + sourceReply = ''; sourceRequest = null; clearTimeout(sourceRequestTimer); + } + sourceControl = data.sourceControl?.version === 1 ? data.sourceControl : null; performanceStats.source = data.performance?.source ?? null; performanceStats.transport = data.performance?.transport ?? null; performanceStats.image = data.performance?.image ?? null; @@ -1611,7 +1644,8 @@ if (typeof document !== 'undefined') { jpeg.cancelPending(); if (rtcMedia.revision !== presentation.current.revision) { rtc.close(); rtcRequested = false; } } - $('stage').textContent = data.stage || t("web_waiting_for_iphone_video"); + $('source-detail').textContent = data.sourceError ? data.stage || '' : ''; + $('source-detail').hidden = !data.sourceError; rtc.progress(data.rtcFrames || 0); if (data.rtcAvailable && !rtcRequested && !rtc.active && typeof RTCPeerConnection !== 'undefined' && (mode !== 'track-canvas' || processorSupported())) { @@ -1648,6 +1682,7 @@ if (typeof document !== 'undefined') { clearTimeout(connectTimer); if (socket !== ws) return; if (settingsDialog.open) settingsDialog.close(); + clearTimeout(sourceRequestTimer); sourceRequest = null; sourceControl = null; sourceReply = ''; if (outbox) { outbox.close(); outbox = null; } cancelMove(); socket = null; pointers.clear(); desktop.release(false); pointerInput = false; keyboardInput = false; backButton = false; $('desktop-back').hidden = true; @@ -1720,13 +1755,46 @@ if (typeof document !== 'undefined') { } })(); }); - $('phone-connect').addEventListener('click', () => { - if (!paired || !send({ type: 'phone-connect' })) { - $('phone-connect-message').textContent = t("web_browser_connection_interrupted_pair_again_and_retry"); - return; + function requestSourceAction(action = sourceControl?.action) { + if (!action || sourceRequest || !socket || socket.readyState !== WebSocket.OPEN) return; + const requestId = String(++sourceSequence); + if (!send({ type: 'source-action', requestId, action, + sourceId: sourceControl.activeId || sourceControl.selectedId, revision: sourceControl.revision })) return; + sourceRequest = requestId; sourceReply = t('web_source_pending'); presentation.refresh(); + sourceRequestTimer = setTimeout(() => { + if (sourceRequest !== requestId) return; + sourceRequest = null; sourceReply = t('web_source_failed'); presentation.refresh(); + }, 10000); + } + $('source-action').addEventListener('click', () => requestSourceAction()); + $('source-stop').addEventListener('click', () => requestSourceAction()); + function renderResizeNotice(force = false) { + const notice = resizeNotice(sourceControl); + $('resize-review').hidden = !notice; + if (!notice) { if (resizeDialog.open) resizeDialog.close(); return; } + $('resize-description').textContent = t('web_resize_description', notice.width, notice.height, notice.name); + $('resize-foreground').hidden = notice.canReconnect; + $('resize-reconnect').disabled = !notice.canReconnect || sourceRequest !== null; + if ((force || dismissedResize !== notice.key) && !settingsDialog.open && !resizeDialog.open) { + release(); desktop.release(); resizeDialog.showModal(); } - $('phone-connect').disabled = true; - $('phone-connect-message').textContent = t("web_requesting_iphone_connection"); + } + function dismissResize() { + dismissedResize = resizeNotice(sourceControl)?.key || null; + resizeDialog.close(); + } + $('resize-later').addEventListener('click', dismissResize); + resizeDialog.addEventListener('cancel', event => { event.preventDefault(); dismissResize(); }); + resizeDialog.addEventListener('close', () => presentation.refresh()); + $('resize-review').addEventListener('click', () => { settingsDialog.close(); renderResizeNotice(true); presentation.refresh(); }); + $('resize-reconnect').addEventListener('click', () => { + if (!resizeNotice(sourceControl)?.canReconnect || sourceRequest !== null) return; + requestSourceAction('reconnect'); dismissResize(); + }); + $('media-retry').addEventListener('click', () => { + // Reopen only the browser transport. The Android source and its SDK keep running. + $('media-retry').disabled = true; + socket?.close(); }); async function toggleFullscreen() { try { diff --git a/common/src/main/assets/web/browser-audio.js b/common/src/main/assets/web/browser-audio.js index f249bd27..c836695a 100644 --- a/common/src/main/assets/web/browser-audio.js +++ b/common/src/main/assets/web/browser-audio.js @@ -34,7 +34,9 @@ export function createMicResampler(inputRate, outputRate, channels, emit) { export function createBrowserAudio({ send, sendBinary, onState = () => {}, - createContext = () => new (window.AudioContext || window.webkitAudioContext)({ latencyHint: 'interactive' }), + // Keep 48 kHz PCM packets at their native rate. Per-buffer 48→44.1 kHz + // conversion can introduce seams; device-rate conversion belongs after mixing. + createContext = () => new (window.AudioContext || window.webkitAudioContext)({ latencyHint: 'interactive', sampleRate: 48000 }), getMicrophone = () => navigator.mediaDevices.getUserMedia({ audio: { channelCount: 1, echoCancellation: true, noiseSuppression: true, autoGainControl: true }, video: false }), createWorklet = context => new AudioWorkletNode(context, 'wheelplay-microphone', { numberOfInputs: 1, numberOfOutputs: 1, outputChannelCount: [1] }), secure = () => window.isSecureContext && location.protocol === 'https:' && !!navigator.mediaDevices?.getUserMedia, diff --git a/common/src/main/assets/web/index.html b/common/src/main/assets/web/index.html index 062c9e15..6a8f6928 100644 --- a/common/src/main/assets/web/index.html +++ b/common/src/main/assets/web/index.html @@ -45,6 +45,7 @@

{{ui_settings}}

+

@@ -57,11 +58,18 @@

{{ui_settings}}