Compare commits
199 Commits
pause_on_e
...
window.14
Author | SHA1 | Date | |
---|---|---|---|
14348f42b2 | |||
b5ed834012 | |||
65b9f04f39 | |||
cca2c9ffb7 | |||
22d78e8a82 | |||
bcb8503b26 | |||
9aa6cc71be | |||
54e08b4eae | |||
bd8b945bb3 | |||
a73bf932d6 | |||
7011dd1ef0 | |||
ee6620d123 | |||
aa34d63171 | |||
bf625790fa | |||
db55edb196 | |||
1c3801a0b1 | |||
be3d357a6d | |||
79968a0ae6 | |||
7f23ff3f2c | |||
cc7719079a | |||
0c94b75eef | |||
af57309074 | |||
a720c946a6 | |||
8d87b91f69 | |||
125b1103e1 | |||
36189b90ea | |||
4dca08cfe3 | |||
fd0f432e87 | |||
cdf09805c0 | |||
bf069bd37b | |||
b9d244b4c9 | |||
dd479ed176 | |||
5f12132c47 | |||
1c5ad0e813 | |||
6a103c809f | |||
151a6225d4 | |||
54dede3630 | |||
f557188dc8 | |||
87da68ee0d | |||
021c5d371a | |||
840680f546 | |||
4d5b67cc80 | |||
604e59ac7b | |||
4d2c2514fc | |||
107f7a83ab | |||
2e7f6a6fc4 | |||
d95276467b | |||
91485e2863 | |||
f2d6203156 | |||
2d32557fde | |||
ae303b8d07 | |||
29ce03e337 | |||
48adae1728 | |||
ea98d49bae | |||
35add3daee | |||
c0a1aee8ce | |||
a976417572 | |||
ffa238b9d3 | |||
f6459dd742 | |||
295102a6d9 | |||
d894e270a7 | |||
746eaea556 | |||
78a7e4f293 | |||
9858eff856 | |||
9e22f3bf1c | |||
25f1e703b7 | |||
a7cf4daf3b | |||
c12fdf900f | |||
4502126e3b | |||
dfa3f97a87 | |||
edac4b8a9a | |||
44abed5c68 | |||
cfa4f7e2f2 | |||
d47ecef1b5 | |||
9efa162949 | |||
be3f949aa5 | |||
f7b4a18b43 | |||
05b5deacad | |||
d25cbc55f2 | |||
3333e67452 | |||
7c53a29d72 | |||
5187f7254e | |||
2ad93d1fc0 | |||
d067a11478 | |||
cd4056d0f3 | |||
6a58891e13 | |||
ec41896c85 | |||
4cd61b5a90 | |||
d2ed4510a7 | |||
604dfd7c6b | |||
af69689ec1 | |||
cbce42336d | |||
5a6b8310ca | |||
c9a4d2b38f | |||
1beec99f82 | |||
5ce8672ebc | |||
3001f8a2d5 | |||
c6ff78f414 | |||
40f2560d98 | |||
26aa28c998 | |||
ef79fcbbd2 | |||
9497f39fb4 | |||
bf056b1fee | |||
bd9292931e | |||
140a49b8be | |||
4135c411af | |||
5e061636f6 | |||
5f3fb843f5 | |||
ce8126f322 | |||
d037b02cc2 | |||
89761213c3 | |||
8db4e78b34 | |||
5d4b8a7e6d | |||
eed06b141a | |||
825d7f72c0 | |||
2370298b61 | |||
67f356f881 | |||
c573bd2a33 | |||
acb2988837 | |||
85a94dd4b5 | |||
94031dfe97 | |||
b43a9e8e7a | |||
a9d6cb5837 | |||
2f92686930 | |||
bb88b60227 | |||
25e33566f5 | |||
9df92ebe37 | |||
0801cf0627 | |||
4658c0e5d2 | |||
45a073a333 | |||
7e3b935932 | |||
abcb100597 | |||
e8801cc3c0 | |||
86808e8114 | |||
15a3bad4ab | |||
200488111e | |||
1713422c13 | |||
4b4f045e19 | |||
a402eac7f2 | |||
3bb6b0cb9f | |||
258eaaae2a | |||
4857c5dd59 | |||
f23be823fd | |||
783719c72e | |||
80defdd8aa | |||
e637feba51 | |||
5e59ed3135 | |||
4eb33054cd | |||
420d3a40dd | |||
9d5f53caa7 | |||
3c45625324 | |||
11d738321f | |||
ccaa832f48 | |||
4e4ddc499f | |||
8d76b3e06d | |||
85a0b935c9 | |||
8c3e2bae7b | |||
446ea818a4 | |||
c3c7bf7af3 | |||
5000368c2f | |||
855ae4adb1 | |||
a8db3ec9e2 | |||
ff579990c2 | |||
b8c5853aa6 | |||
c64d150202 | |||
8350a61926 | |||
5580803406 | |||
9bfc749803 | |||
6af4bd601f | |||
4722bff423 | |||
928f8b8eb3 | |||
9fc5835485 | |||
dd36d6135f | |||
faebb7d70a | |||
7f8d079c8c | |||
64930e71b9 | |||
d544e577c0 | |||
bfeecc0131 | |||
f032262cd7 | |||
cd63896d63 | |||
f085765e04 | |||
a2fb1b40f6 | |||
41ccb5883e | |||
23e116064d | |||
3432029a3d | |||
7a2b756f1e | |||
b7ad652a75 | |||
76a99a7fcd | |||
68b55ef2fe | |||
bc8913e12b | |||
3c2013de10 | |||
8cef8bac94 | |||
0bbe8a7007 | |||
9fdb882509 | |||
8e7b041f35 | |||
9ade389069 | |||
90ba885547 | |||
7adf98e9d4 | |||
90ca46ee41 |
1
.gitignore
vendored
1
.gitignore
vendored
@ -7,3 +7,4 @@ build/
|
|||||||
.gradle/
|
.gradle/
|
||||||
/x/
|
/x/
|
||||||
local.properties
|
local.properties
|
||||||
|
/scrcpy-server
|
||||||
|
11
FAQ.md
11
FAQ.md
@ -133,9 +133,9 @@ Try with another USB cable or plug it into another USB port. See [#281] and
|
|||||||
[#283]: https://github.com/Genymobile/scrcpy/issues/283
|
[#283]: https://github.com/Genymobile/scrcpy/issues/283
|
||||||
|
|
||||||
|
|
||||||
## HID/OTG issues on Windows
|
## OTG issues on Windows
|
||||||
|
|
||||||
On Windows, if `scrcpy --otg` (or `--hid-keyboard`/`--hid-mouse`) results in:
|
On Windows, if `scrcpy --otg` (or `--keyboard=aoa`/`--mouse=aoa`) results in:
|
||||||
|
|
||||||
> ERROR: Could not find any USB device
|
> ERROR: Could not find any USB device
|
||||||
|
|
||||||
@ -170,12 +170,13 @@ The default text injection method is [limited to ASCII characters][text-input].
|
|||||||
A trick allows to also inject some [accented characters][accented-characters],
|
A trick allows to also inject some [accented characters][accented-characters],
|
||||||
but that's all. See [#37].
|
but that's all. See [#37].
|
||||||
|
|
||||||
It is also possible to simulate a [physical keyboard][hid] (HID).
|
To avoid the problem, [change the keyboard mode to simulate a physical
|
||||||
|
keyboard][hid].
|
||||||
|
|
||||||
[text-input]: https://github.com/Genymobile/scrcpy/issues?q=is%3Aopen+is%3Aissue+label%3Aunicode
|
[text-input]: https://github.com/Genymobile/scrcpy/issues?q=is%3Aopen+is%3Aissue+label%3Aunicode
|
||||||
[accented-characters]: https://blog.rom1v.com/2018/03/introducing-scrcpy/#handle-accented-characters
|
[accented-characters]: https://blog.rom1v.com/2018/03/introducing-scrcpy/#handle-accented-characters
|
||||||
[#37]: https://github.com/Genymobile/scrcpy/issues/37
|
[#37]: https://github.com/Genymobile/scrcpy/issues/37
|
||||||
[hid]: doc/hid-otg.md
|
[hid]: doc/keyboard.md#physical-keyboard-simulation
|
||||||
|
|
||||||
|
|
||||||
## Client issues
|
## Client issues
|
||||||
@ -222,7 +223,7 @@ java.lang.IllegalStateException
|
|||||||
at android.media.MediaCodec.native_dequeueOutputBuffer(Native Method)
|
at android.media.MediaCodec.native_dequeueOutputBuffer(Native Method)
|
||||||
```
|
```
|
||||||
|
|
||||||
then try with another [encoder](doc/video.md#codec).
|
then try with another [encoder](doc/video.md#encoder).
|
||||||
|
|
||||||
|
|
||||||
## Translations
|
## Translations
|
||||||
|
2
LICENSE
2
LICENSE
@ -188,7 +188,7 @@
|
|||||||
identification within third-party archives.
|
identification within third-party archives.
|
||||||
|
|
||||||
Copyright (C) 2018 Genymobile
|
Copyright (C) 2018 Genymobile
|
||||||
Copyright (C) 2018-2023 Romain Vimont
|
Copyright (C) 2018-2024 Romain Vimont
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
63
README.md
63
README.md
@ -1,4 +1,8 @@
|
|||||||
# scrcpy (v2.1.1)
|
**This GitHub repo (<https://github.com/Genymobile/scrcpy>) is the only official
|
||||||
|
source for the project. Do not download releases from random websites, even if
|
||||||
|
their name contains `scrcpy`.**
|
||||||
|
|
||||||
|
# scrcpy (v2.4)
|
||||||
|
|
||||||
<img src="app/data/icon.svg" width="128" height="128" alt="scrcpy" align="right" />
|
<img src="app/data/icon.svg" width="128" height="128" alt="scrcpy" align="right" />
|
||||||
|
|
||||||
@ -25,16 +29,20 @@ It focuses on:
|
|||||||
[lowlatency]: https://github.com/Genymobile/scrcpy/pull/646
|
[lowlatency]: https://github.com/Genymobile/scrcpy/pull/646
|
||||||
|
|
||||||
Its features include:
|
Its features include:
|
||||||
- [audio forwarding](doc/audio.md) (Android >= 11)
|
- [audio forwarding](doc/audio.md) (Android 11+)
|
||||||
- [recording](doc/recording.md)
|
- [recording](doc/recording.md)
|
||||||
- mirroring with [Android device screen off](doc/device.md#turn-screen-off)
|
- mirroring with [Android device screen off](doc/device.md#turn-screen-off)
|
||||||
- [copy-paste](doc/control.md#copy-paste) in both directions
|
- [copy-paste](doc/control.md#copy-paste) in both directions
|
||||||
- [configurable quality](doc/video.md)
|
- [configurable quality](doc/video.md)
|
||||||
- Android device screen [as a webcam (V4L2)](doc/v4l2.md) (Linux-only)
|
- [camera mirroring](doc/camera.md) (Android 12+)
|
||||||
- [physical keyboard/mouse simulation (HID)](doc/hid-otg.md)
|
- [mirroring as a webcam (V4L2)](doc/v4l2.md) (Linux-only)
|
||||||
- [OTG mode](doc/hid-otg.md#otg)
|
- physical [keyboard][hid-keyboard] and [mouse][hid-mouse] simulation (HID)
|
||||||
|
- [OTG mode](doc/otg.md)
|
||||||
- and more…
|
- and more…
|
||||||
|
|
||||||
|
[hid-keyboard]: doc/keyboard.md#physical-keyboard-simulation
|
||||||
|
[hid-mouse]: doc/mouse.md#physical-mouse-simulation
|
||||||
|
|
||||||
## Prerequisites
|
## Prerequisites
|
||||||
|
|
||||||
The Android device requires at least API 21 (Android 5.0).
|
The Android device requires at least API 21 (Android 5.0).
|
||||||
@ -52,8 +60,7 @@ this option is set.
|
|||||||
|
|
||||||
[control]: https://github.com/Genymobile/scrcpy/issues/70#issuecomment-373286323
|
[control]: https://github.com/Genymobile/scrcpy/issues/70#issuecomment-373286323
|
||||||
|
|
||||||
Note that USB debugging is not required to run scrcpy in [OTG
|
Note that USB debugging is not required to run scrcpy in [OTG mode](doc/otg.md).
|
||||||
mode](doc/hid-otg.md#otg).
|
|
||||||
|
|
||||||
|
|
||||||
## Get the app
|
## Get the app
|
||||||
@ -63,6 +70,41 @@ mode](doc/hid-otg.md#otg).
|
|||||||
- [macOS](doc/macos.md)
|
- [macOS](doc/macos.md)
|
||||||
|
|
||||||
|
|
||||||
|
## Usage examples
|
||||||
|
|
||||||
|
There are a lot of options, [documented](#user-documentation) in separate pages.
|
||||||
|
Here are just some common examples.
|
||||||
|
|
||||||
|
- Capture the screen in H.265 (better quality), limit the size to 1920, limit
|
||||||
|
the frame rate to 60fps, disable audio, and control the device by simulating
|
||||||
|
a physical keyboard:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
scrcpy --video-codec=h265 --max-size=1920 --max-fps=60 --no-audio --keyboard=uhid
|
||||||
|
scrcpy --video-codec=h265 -m1920 --max-fps=60 --no-audio -K # short version
|
||||||
|
```
|
||||||
|
|
||||||
|
- Record the device camera in H.265 at 1920x1080 (and microphone) to an MP4
|
||||||
|
file:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
scrcpy --video-source=camera --video-codec=h265 --camera-size=1920x1080 --record=file.mp4
|
||||||
|
```
|
||||||
|
|
||||||
|
- Capture the device front camera and expose it as a webcam on the computer (on
|
||||||
|
Linux):
|
||||||
|
|
||||||
|
```bash
|
||||||
|
scrcpy --video-source=camera --camera-size=1920x1080 --camera-facing=front --v4l2-sink=/dev/video2 --no-playback
|
||||||
|
```
|
||||||
|
|
||||||
|
- Control the device without mirroring by simulating a physical keyboard and
|
||||||
|
mouse (USB debugging not required):
|
||||||
|
|
||||||
|
```bash
|
||||||
|
scrcpy --otg
|
||||||
|
```
|
||||||
|
|
||||||
## User documentation
|
## User documentation
|
||||||
|
|
||||||
The application provides a lot of features and configuration options. They are
|
The application provides a lot of features and configuration options. They are
|
||||||
@ -72,11 +114,14 @@ documented in the following pages:
|
|||||||
- [Video](doc/video.md)
|
- [Video](doc/video.md)
|
||||||
- [Audio](doc/audio.md)
|
- [Audio](doc/audio.md)
|
||||||
- [Control](doc/control.md)
|
- [Control](doc/control.md)
|
||||||
|
- [Keyboard](doc/keyboard.md)
|
||||||
|
- [Mouse](doc/mouse.md)
|
||||||
- [Device](doc/device.md)
|
- [Device](doc/device.md)
|
||||||
- [Window](doc/window.md)
|
- [Window](doc/window.md)
|
||||||
- [Recording](doc/recording.md)
|
- [Recording](doc/recording.md)
|
||||||
- [Tunnels](doc/tunnels.md)
|
- [Tunnels](doc/tunnels.md)
|
||||||
- [HID/OTG](doc/hid-otg.md)
|
- [OTG](doc/otg.md)
|
||||||
|
- [Camera](doc/camera.md)
|
||||||
- [Video4Linux](doc/v4l2.md)
|
- [Video4Linux](doc/v4l2.md)
|
||||||
- [Shortcuts](doc/shortcuts.md)
|
- [Shortcuts](doc/shortcuts.md)
|
||||||
|
|
||||||
@ -128,7 +173,7 @@ work][donate]:
|
|||||||
## Licence
|
## Licence
|
||||||
|
|
||||||
Copyright (C) 2018 Genymobile
|
Copyright (C) 2018 Genymobile
|
||||||
Copyright (C) 2018-2023 Romain Vimont
|
Copyright (C) 2018-2024 Romain Vimont
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
@ -10,26 +10,37 @@ _scrcpy() {
|
|||||||
--audio-source=
|
--audio-source=
|
||||||
--audio-output-buffer=
|
--audio-output-buffer=
|
||||||
-b --video-bit-rate=
|
-b --video-bit-rate=
|
||||||
|
--camera-ar=
|
||||||
|
--camera-id=
|
||||||
|
--camera-facing=
|
||||||
|
--camera-fps=
|
||||||
|
--camera-high-speed
|
||||||
|
--camera-size=
|
||||||
--crop=
|
--crop=
|
||||||
-d --select-usb
|
-d --select-usb
|
||||||
--disable-screensaver
|
--disable-screensaver
|
||||||
--display=
|
|
||||||
--display-buffer=
|
--display-buffer=
|
||||||
|
--display-id=
|
||||||
|
--display-orientation=
|
||||||
-e --select-tcpip
|
-e --select-tcpip
|
||||||
-f --fullscreen
|
-f --fullscreen
|
||||||
--force-adb-forward
|
--force-adb-forward
|
||||||
--forward-all-clicks
|
--forward-all-clicks
|
||||||
-h --help
|
-h --help
|
||||||
|
-K
|
||||||
|
--keyboard=
|
||||||
--kill-adb-on-close
|
--kill-adb-on-close
|
||||||
-K --hid-keyboard
|
|
||||||
--legacy-paste
|
--legacy-paste
|
||||||
|
--list-camera-sizes
|
||||||
|
--list-cameras
|
||||||
--list-displays
|
--list-displays
|
||||||
--list-encoders
|
--list-encoders
|
||||||
--lock-video-orientation
|
--lock-video-orientation
|
||||||
--lock-video-orientation=
|
--lock-video-orientation=
|
||||||
-m --max-size=
|
-m --max-size=
|
||||||
-M --hid-mouse
|
-M
|
||||||
--max-fps=
|
--max-fps=
|
||||||
|
--mouse=
|
||||||
-n --no-control
|
-n --no-control
|
||||||
-N --no-playback
|
-N --no-playback
|
||||||
--no-audio
|
--no-audio
|
||||||
@ -42,6 +53,7 @@ _scrcpy() {
|
|||||||
--no-power-on
|
--no-power-on
|
||||||
--no-video
|
--no-video
|
||||||
--no-video-playback
|
--no-video-playback
|
||||||
|
--orientation=
|
||||||
--otg
|
--otg
|
||||||
-p --port=
|
-p --port=
|
||||||
--pause-on-exit
|
--pause-on-exit
|
||||||
@ -53,6 +65,7 @@ _scrcpy() {
|
|||||||
-r --record=
|
-r --record=
|
||||||
--raw-key-events
|
--raw-key-events
|
||||||
--record-format=
|
--record-format=
|
||||||
|
--record-orientation=
|
||||||
--render-driver=
|
--render-driver=
|
||||||
--require-audio
|
--require-audio
|
||||||
--rotation=
|
--rotation=
|
||||||
@ -72,6 +85,7 @@ _scrcpy() {
|
|||||||
--video-codec=
|
--video-codec=
|
||||||
--video-codec-options=
|
--video-codec-options=
|
||||||
--video-encoder=
|
--video-encoder=
|
||||||
|
--video-source=
|
||||||
-w --stay-awake
|
-w --stay-awake
|
||||||
--window-borderless
|
--window-borderless
|
||||||
--window-title=
|
--window-title=
|
||||||
@ -88,15 +102,39 @@ _scrcpy() {
|
|||||||
return
|
return
|
||||||
;;
|
;;
|
||||||
--audio-codec)
|
--audio-codec)
|
||||||
COMPREPLY=($(compgen -W 'opus aac raw' -- "$cur"))
|
COMPREPLY=($(compgen -W 'opus aac flac raw' -- "$cur"))
|
||||||
|
return
|
||||||
|
;;
|
||||||
|
--video-source)
|
||||||
|
COMPREPLY=($(compgen -W 'display camera' -- "$cur"))
|
||||||
return
|
return
|
||||||
;;
|
;;
|
||||||
--audio-source)
|
--audio-source)
|
||||||
COMPREPLY=($(compgen -W 'output mic' -- "$cur"))
|
COMPREPLY=($(compgen -W 'output mic' -- "$cur"))
|
||||||
return
|
return
|
||||||
;;
|
;;
|
||||||
|
--camera-facing)
|
||||||
|
COMPREPLY=($(compgen -W 'front back external' -- "$cur"))
|
||||||
|
return
|
||||||
|
;;
|
||||||
|
--keyboard)
|
||||||
|
COMPREPLY=($(compgen -W 'disabled sdk uhid aoa' -- "$cur"))
|
||||||
|
return
|
||||||
|
;;
|
||||||
|
--mouse)
|
||||||
|
COMPREPLY=($(compgen -W 'disabled sdk uhid aoa' -- "$cur"))
|
||||||
|
return
|
||||||
|
;;
|
||||||
|
--orientation|--display-orientation)
|
||||||
|
COMPREPLY=($(compgen -W '0 90 180 270 flip0 flip90 flip180 flip270' -- "$cur"))
|
||||||
|
return
|
||||||
|
;;
|
||||||
|
--record-orientation)
|
||||||
|
COMPREPLY=($(compgen -W '0 90 180 270' -- "$cur"))
|
||||||
|
return
|
||||||
|
;;
|
||||||
--lock-video-orientation)
|
--lock-video-orientation)
|
||||||
COMPREPLY=($(compgen -W 'unlocked initial 0 1 2 3' -- "$cur"))
|
COMPREPLY=($(compgen -W 'unlocked initial 0 90 180 270' -- "$cur"))
|
||||||
return
|
return
|
||||||
;;
|
;;
|
||||||
--pause-on-exit)
|
--pause-on-exit)
|
||||||
@ -108,17 +146,13 @@ _scrcpy() {
|
|||||||
return
|
return
|
||||||
;;
|
;;
|
||||||
--record-format)
|
--record-format)
|
||||||
COMPREPLY=($(compgen -W 'mkv mp4' -- "$cur"))
|
COMPREPLY=($(compgen -W 'mp4 mkv m4a mka opus aac flac wav' -- "$cur"))
|
||||||
return
|
return
|
||||||
;;
|
;;
|
||||||
--render-driver)
|
--render-driver)
|
||||||
COMPREPLY=($(compgen -W 'direct3d opengl opengles2 opengles metal software' -- "$cur"))
|
COMPREPLY=($(compgen -W 'direct3d opengl opengles2 opengles metal software' -- "$cur"))
|
||||||
return
|
return
|
||||||
;;
|
;;
|
||||||
--rotation)
|
|
||||||
COMPREPLY=($(compgen -W '0 1 2 3' -- "$cur"))
|
|
||||||
return
|
|
||||||
;;
|
|
||||||
--shortcut-mod)
|
--shortcut-mod)
|
||||||
# Only auto-complete a single key
|
# Only auto-complete a single key
|
||||||
COMPREPLY=($(compgen -W 'lctrl rctrl lalt ralt lsuper rsuper' -- "$cur"))
|
COMPREPLY=($(compgen -W 'lctrl rctrl lalt ralt lsuper rsuper' -- "$cur"))
|
||||||
@ -139,8 +173,12 @@ _scrcpy() {
|
|||||||
|--audio-codec-options \
|
|--audio-codec-options \
|
||||||
|--audio-encoder \
|
|--audio-encoder \
|
||||||
|--audio-output-buffer \
|
|--audio-output-buffer \
|
||||||
|
|--camera-ar \
|
||||||
|
|--camera-id \
|
||||||
|
|--camera-fps \
|
||||||
|
|--camera-size \
|
||||||
|--crop \
|
|--crop \
|
||||||
|--display \
|
|--display-id \
|
||||||
|--display-buffer \
|
|--display-buffer \
|
||||||
|--max-fps \
|
|--max-fps \
|
||||||
|-m|--max-size \
|
|-m|--max-size \
|
||||||
|
@ -5,7 +5,7 @@ Comment=Display and control your Android device
|
|||||||
# For some users, the PATH or ADB environment variables are set from the shell
|
# For some users, the PATH or ADB environment variables are set from the shell
|
||||||
# startup file, like .bashrc or .zshrc… Run an interactive shell to get
|
# startup file, like .bashrc or .zshrc… Run an interactive shell to get
|
||||||
# environment correctly initialized.
|
# environment correctly initialized.
|
||||||
Exec=/bin/sh -c "\"\\$SHELL\" -i -c scrcpy --pause-on-exit=if-error"
|
Exec=/bin/sh -c "\\$SHELL -i -c 'scrcpy --pause-on-exit=if-error'"
|
||||||
Icon=scrcpy
|
Icon=scrcpy
|
||||||
Terminal=true
|
Terminal=true
|
||||||
Type=Application
|
Type=Application
|
||||||
|
@ -5,7 +5,7 @@ Comment=Display and control your Android device
|
|||||||
# For some users, the PATH or ADB environment variables are set from the shell
|
# For some users, the PATH or ADB environment variables are set from the shell
|
||||||
# startup file, like .bashrc or .zshrc… Run an interactive shell to get
|
# startup file, like .bashrc or .zshrc… Run an interactive shell to get
|
||||||
# environment correctly initialized.
|
# environment correctly initialized.
|
||||||
Exec=/bin/sh -c "\"\\$SHELL\" -i -c scrcpy"
|
Exec=/bin/sh -c "\\$SHELL -i -c scrcpy"
|
||||||
Icon=scrcpy
|
Icon=scrcpy
|
||||||
Terminal=false
|
Terminal=false
|
||||||
Type=Application
|
Type=Application
|
||||||
|
@ -11,31 +11,42 @@ arguments=(
|
|||||||
'--always-on-top[Make scrcpy window always on top \(above other windows\)]'
|
'--always-on-top[Make scrcpy window always on top \(above other windows\)]'
|
||||||
'--audio-bit-rate=[Encode the audio at the given bit-rate]'
|
'--audio-bit-rate=[Encode the audio at the given bit-rate]'
|
||||||
'--audio-buffer=[Configure the audio buffering delay (in milliseconds)]'
|
'--audio-buffer=[Configure the audio buffering delay (in milliseconds)]'
|
||||||
'--audio-codec=[Select the audio codec]:codec:(opus aac raw)'
|
'--audio-codec=[Select the audio codec]:codec:(opus aac flac raw)'
|
||||||
'--audio-codec-options=[Set a list of comma-separated key\:type=value options for the device audio encoder]'
|
'--audio-codec-options=[Set a list of comma-separated key\:type=value options for the device audio encoder]'
|
||||||
'--audio-encoder=[Use a specific MediaCodec audio encoder]'
|
'--audio-encoder=[Use a specific MediaCodec audio encoder]'
|
||||||
'--audio-source=[Select the audio source]:source:(output mic)'
|
'--audio-source=[Select the audio source]:source:(output mic)'
|
||||||
'--audio-output-buffer=[Configure the size of the SDL audio output buffer (in milliseconds)]'
|
'--audio-output-buffer=[Configure the size of the SDL audio output buffer (in milliseconds)]'
|
||||||
{-b,--video-bit-rate=}'[Encode the video at the given bit-rate]'
|
{-b,--video-bit-rate=}'[Encode the video at the given bit-rate]'
|
||||||
|
'--camera-ar=[Select the camera size by its aspect ratio]'
|
||||||
|
'--camera-high-speed=[Enable high-speed camera capture mode]'
|
||||||
|
'--camera-id=[Specify the camera id to mirror]'
|
||||||
|
'--camera-facing=[Select the device camera by its facing direction]:facing:(front back external)'
|
||||||
|
'--camera-fps=[Specify the camera capture frame rate]'
|
||||||
|
'--camera-size=[Specify an explicit camera capture size]'
|
||||||
'--crop=[\[width\:height\:x\:y\] Crop the device screen on the server]'
|
'--crop=[\[width\:height\:x\:y\] Crop the device screen on the server]'
|
||||||
{-d,--select-usb}'[Use USB device]'
|
{-d,--select-usb}'[Use USB device]'
|
||||||
'--disable-screensaver[Disable screensaver while scrcpy is running]'
|
'--disable-screensaver[Disable screensaver while scrcpy is running]'
|
||||||
'--display=[Specify the display id to mirror]'
|
|
||||||
'--display-buffer=[Add a buffering delay \(in milliseconds\) before displaying]'
|
'--display-buffer=[Add a buffering delay \(in milliseconds\) before displaying]'
|
||||||
|
'--display-id=[Specify the display id to mirror]'
|
||||||
|
'--display-orientation=[Set the initial display orientation]:orientation values:(0 90 180 270 flip0 flip90 flip180 flip270)'
|
||||||
{-e,--select-tcpip}'[Use TCP/IP device]'
|
{-e,--select-tcpip}'[Use TCP/IP device]'
|
||||||
{-f,--fullscreen}'[Start in fullscreen]'
|
{-f,--fullscreen}'[Start in fullscreen]'
|
||||||
'--force-adb-forward[Do not attempt to use \"adb reverse\" to connect to the device]'
|
'--force-adb-forward[Do not attempt to use \"adb reverse\" to connect to the device]'
|
||||||
'--forward-all-clicks[Forward clicks to device]'
|
'--forward-all-clicks[Forward clicks to device]'
|
||||||
{-h,--help}'[Print the help]'
|
{-h,--help}'[Print the help]'
|
||||||
|
'-K[Use UHID keyboard (same as --keyboard=uhid)]'
|
||||||
|
'--keyboard[Set the keyboard input mode]:mode:(disabled sdk uhid aoa)'
|
||||||
'--kill-adb-on-close[Kill adb when scrcpy terminates]'
|
'--kill-adb-on-close[Kill adb when scrcpy terminates]'
|
||||||
{-K,--hid-keyboard}'[Simulate a physical keyboard by using HID over AOAv2]'
|
|
||||||
'--legacy-paste[Inject computer clipboard text as a sequence of key events on Ctrl+v]'
|
'--legacy-paste[Inject computer clipboard text as a sequence of key events on Ctrl+v]'
|
||||||
|
'--list-camera-sizes[List the valid camera capture sizes]'
|
||||||
|
'--list-cameras[List cameras available on the device]'
|
||||||
'--list-displays[List displays available on the device]'
|
'--list-displays[List displays available on the device]'
|
||||||
'--list-encoders[List video and audio encoders available on the device]'
|
'--list-encoders[List video and audio encoders available on the device]'
|
||||||
'--lock-video-orientation=[Lock video orientation]:orientation:(unlocked initial 0 1 2 3)'
|
'--lock-video-orientation=[Lock video orientation]:orientation:(unlocked initial 0 90 180 270)'
|
||||||
{-m,--max-size=}'[Limit both the width and height of the video to value]'
|
{-m,--max-size=}'[Limit both the width and height of the video to value]'
|
||||||
{-M,--hid-mouse}'[Simulate a physical mouse by using HID over AOAv2]'
|
'-M[Use UHID mouse (same as --mouse=uhid)]'
|
||||||
'--max-fps=[Limit the frame rate of screen capture]'
|
'--max-fps=[Limit the frame rate of screen capture]'
|
||||||
|
'--mouse[Set the mouse input mode]:mode:(disabled sdk uhid aoa)'
|
||||||
{-n,--no-control}'[Disable device control \(mirror the device in read only\)]'
|
{-n,--no-control}'[Disable device control \(mirror the device in read only\)]'
|
||||||
{-N,--no-playback}'[Disable video and audio playback]'
|
{-N,--no-playback}'[Disable video and audio playback]'
|
||||||
'--no-audio[Disable audio forwarding]'
|
'--no-audio[Disable audio forwarding]'
|
||||||
@ -48,6 +59,7 @@ arguments=(
|
|||||||
'--no-power-on[Do not power on the device on start]'
|
'--no-power-on[Do not power on the device on start]'
|
||||||
'--no-video[Disable video forwarding]'
|
'--no-video[Disable video forwarding]'
|
||||||
'--no-video-playback[Disable video playback]'
|
'--no-video-playback[Disable video playback]'
|
||||||
|
'--orientation=[Set the video orientation]:orientation values:(0 90 180 270 flip0 flip90 flip180 flip270)'
|
||||||
'--otg[Run in OTG mode \(simulating physical keyboard and mouse\)]'
|
'--otg[Run in OTG mode \(simulating physical keyboard and mouse\)]'
|
||||||
{-p,--port=}'[\[port\[\:port\]\] Set the TCP port \(range\) used by the client to listen]'
|
{-p,--port=}'[\[port\[\:port\]\] Set the TCP port \(range\) used by the client to listen]'
|
||||||
'--pause-on-exit=[Make scrcpy pause before exiting]:mode:(true false if-error)'
|
'--pause-on-exit=[Make scrcpy pause before exiting]:mode:(true false if-error)'
|
||||||
@ -57,10 +69,10 @@ arguments=(
|
|||||||
'--push-target=[Set the target directory for pushing files to the device by drag and drop]'
|
'--push-target=[Set the target directory for pushing files to the device by drag and drop]'
|
||||||
{-r,--record=}'[Record screen to file]:record file:_files'
|
{-r,--record=}'[Record screen to file]:record file:_files'
|
||||||
'--raw-key-events[Inject key events for all input keys, and ignore text events]'
|
'--raw-key-events[Inject key events for all input keys, and ignore text events]'
|
||||||
'--record-format=[Force recording format]:format:(mp4 mkv)'
|
'--record-format=[Force recording format]:format:(mp4 mkv m4a mka opus aac flac wav)'
|
||||||
|
'--record-orientation=[Set the record orientation]:orientation values:(0 90 180 270)'
|
||||||
'--render-driver=[Request SDL to use the given render driver]:driver name:(direct3d opengl opengles2 opengles metal software)'
|
'--render-driver=[Request SDL to use the given render driver]:driver name:(direct3d opengl opengles2 opengles metal software)'
|
||||||
'--require-audio=[Make scrcpy fail if audio is enabled but does not work]'
|
'--require-audio=[Make scrcpy fail if audio is enabled but does not work]'
|
||||||
'--rotation=[Set the initial display rotation]:rotation values:(0 1 2 3)'
|
|
||||||
{-s,--serial=}'[The device serial number \(mandatory for multiple devices only\)]:serial:($("${ADB-adb}" devices | awk '\''$2 == "device" {print $1}'\''))'
|
{-s,--serial=}'[The device serial number \(mandatory for multiple devices only\)]:serial:($("${ADB-adb}" devices | awk '\''$2 == "device" {print $1}'\''))'
|
||||||
{-S,--turn-screen-off}'[Turn the device screen off immediately]'
|
{-S,--turn-screen-off}'[Turn the device screen off immediately]'
|
||||||
'--shortcut-mod=[\[key1,key2+key3,...\] Specify the modifiers to use for scrcpy shortcuts]:shortcut mod:(lctrl rctrl lalt ralt lsuper rsuper)'
|
'--shortcut-mod=[\[key1,key2+key3,...\] Specify the modifiers to use for scrcpy shortcuts]:shortcut mod:(lctrl rctrl lalt ralt lsuper rsuper)'
|
||||||
@ -76,6 +88,7 @@ arguments=(
|
|||||||
'--video-codec=[Select the video codec]:codec:(h264 h265 av1)'
|
'--video-codec=[Select the video codec]:codec:(h264 h265 av1)'
|
||||||
'--video-codec-options=[Set a list of comma-separated key\:type=value options for the device video encoder]'
|
'--video-codec-options=[Set a list of comma-separated key\:type=value options for the device video encoder]'
|
||||||
'--video-encoder=[Use a specific MediaCodec video encoder]'
|
'--video-encoder=[Use a specific MediaCodec video encoder]'
|
||||||
|
'--video-source=[Select the video source]:source:(display camera)'
|
||||||
{-w,--stay-awake}'[Keep the device on while scrcpy is running, when the device is plugged in]'
|
{-w,--stay-awake}'[Keep the device on while scrcpy is running, when the device is plugged in]'
|
||||||
'--window-borderless[Disable window decorations \(display borderless window\)]'
|
'--window-borderless[Disable window decorations \(display borderless window\)]'
|
||||||
'--window-title=[Set a custom window title]'
|
'--window-title=[Set a custom window title]'
|
||||||
|
1
app/deps/.gitignore
vendored
Normal file
1
app/deps/.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
/work
|
27
app/deps/README
Normal file
27
app/deps/README
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
This directory (app/deps/) contains:
|
||||||
|
|
||||||
|
*.sh : shell scripts to download and build dependencies
|
||||||
|
|
||||||
|
patches/ : patches to fix dependencies (used by scripts)
|
||||||
|
|
||||||
|
work/sources/ : downloaded tarballs and extracted folders
|
||||||
|
ffmpeg-6.1.1.tar.xz
|
||||||
|
ffmpeg-6.1.1/
|
||||||
|
libusb-1.0.27.tar.gz
|
||||||
|
libusb-1.0.27/
|
||||||
|
...
|
||||||
|
work/build/ : build dirs for each dependency/version/architecture
|
||||||
|
ffmpeg-6.1.1/win32/
|
||||||
|
ffmpeg-6.1.1/win64/
|
||||||
|
libusb-1.0.27/win32/
|
||||||
|
libusb-1.0.27/win64/
|
||||||
|
...
|
||||||
|
work/install/ : install dirs for each architexture
|
||||||
|
win32/bin/
|
||||||
|
win32/include/
|
||||||
|
win32/lib/
|
||||||
|
win32/share/
|
||||||
|
win64/bin/
|
||||||
|
win64/include/
|
||||||
|
win64/lib/
|
||||||
|
win64/share/
|
32
app/deps/adb.sh
Executable file
32
app/deps/adb.sh
Executable file
@ -0,0 +1,32 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -ex
|
||||||
|
DEPS_DIR=$(dirname ${BASH_SOURCE[0]})
|
||||||
|
cd "$DEPS_DIR"
|
||||||
|
. common
|
||||||
|
|
||||||
|
VERSION=34.0.5
|
||||||
|
FILENAME=platform-tools_r$VERSION-windows.zip
|
||||||
|
PROJECT_DIR=platform-tools-$VERSION
|
||||||
|
SHA256SUM=3f8320152704377de150418a3c4c9d07d16d80a6c0d0d8f7289c22c499e33571
|
||||||
|
|
||||||
|
cd "$SOURCES_DIR"
|
||||||
|
|
||||||
|
if [[ -d "$PROJECT_DIR" ]]
|
||||||
|
then
|
||||||
|
echo "$PWD/$PROJECT_DIR" found
|
||||||
|
else
|
||||||
|
get_file "https://dl.google.com/android/repository/$FILENAME" "$FILENAME" "$SHA256SUM"
|
||||||
|
mkdir -p "$PROJECT_DIR"
|
||||||
|
cd "$PROJECT_DIR"
|
||||||
|
ZIP_PREFIX=platform-tools
|
||||||
|
unzip "../$FILENAME" \
|
||||||
|
"$ZIP_PREFIX"/AdbWinApi.dll \
|
||||||
|
"$ZIP_PREFIX"/AdbWinUsbApi.dll \
|
||||||
|
"$ZIP_PREFIX"/adb.exe
|
||||||
|
mv "$ZIP_PREFIX"/* .
|
||||||
|
rmdir "$ZIP_PREFIX"
|
||||||
|
fi
|
||||||
|
|
||||||
|
mkdir -p "$INSTALL_DIR/$HOST/bin"
|
||||||
|
cd "$INSTALL_DIR/$HOST/bin"
|
||||||
|
cp -r "$SOURCES_DIR/$PROJECT_DIR"/. "$INSTALL_DIR/$HOST/bin/"
|
55
app/deps/common
Normal file
55
app/deps/common
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# This file is intended to be sourced by other scripts, not executed
|
||||||
|
|
||||||
|
if [[ $# != 1 ]]
|
||||||
|
then
|
||||||
|
# <host>: win32 or win64
|
||||||
|
echo "Syntax: $0 <host>" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
HOST="$1"
|
||||||
|
|
||||||
|
if [[ "$HOST" = win32 ]]
|
||||||
|
then
|
||||||
|
HOST_TRIPLET=i686-w64-mingw32
|
||||||
|
elif [[ "$HOST" = win64 ]]
|
||||||
|
then
|
||||||
|
HOST_TRIPLET=x86_64-w64-mingw32
|
||||||
|
else
|
||||||
|
echo "Unsupported host: $HOST" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
DEPS_DIR=$(dirname ${BASH_SOURCE[0]})
|
||||||
|
cd "$DEPS_DIR"
|
||||||
|
|
||||||
|
PATCHES_DIR="$PWD/patches"
|
||||||
|
|
||||||
|
WORK_DIR="$PWD/work"
|
||||||
|
SOURCES_DIR="$WORK_DIR/sources"
|
||||||
|
BUILD_DIR="$WORK_DIR/build"
|
||||||
|
INSTALL_DIR="$WORK_DIR/install"
|
||||||
|
|
||||||
|
mkdir -p "$INSTALL_DIR" "$SOURCES_DIR" "$WORK_DIR"
|
||||||
|
|
||||||
|
checksum() {
|
||||||
|
local file="$1"
|
||||||
|
local sum="$2"
|
||||||
|
echo "$file: verifying checksum..."
|
||||||
|
echo "$sum $file" | sha256sum -c
|
||||||
|
}
|
||||||
|
|
||||||
|
get_file() {
|
||||||
|
local url="$1"
|
||||||
|
local file="$2"
|
||||||
|
local sum="$3"
|
||||||
|
if [[ -f "$file" ]]
|
||||||
|
then
|
||||||
|
echo "$file: found"
|
||||||
|
else
|
||||||
|
echo "$file: not found, downloading..."
|
||||||
|
wget "$url" -O "$file"
|
||||||
|
fi
|
||||||
|
checksum "$file" "$sum"
|
||||||
|
}
|
91
app/deps/ffmpeg.sh
Executable file
91
app/deps/ffmpeg.sh
Executable file
@ -0,0 +1,91 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -ex
|
||||||
|
DEPS_DIR=$(dirname ${BASH_SOURCE[0]})
|
||||||
|
cd "$DEPS_DIR"
|
||||||
|
. common
|
||||||
|
|
||||||
|
VERSION=6.1.1
|
||||||
|
FILENAME=ffmpeg-$VERSION.tar.xz
|
||||||
|
PROJECT_DIR=ffmpeg-$VERSION
|
||||||
|
SHA256SUM=8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968
|
||||||
|
|
||||||
|
cd "$SOURCES_DIR"
|
||||||
|
|
||||||
|
if [[ -d "$PROJECT_DIR" ]]
|
||||||
|
then
|
||||||
|
echo "$PWD/$PROJECT_DIR" found
|
||||||
|
else
|
||||||
|
get_file "https://ffmpeg.org/releases/$FILENAME" "$FILENAME" "$SHA256SUM"
|
||||||
|
tar xf "$FILENAME" # First level directory is "$PROJECT_DIR"
|
||||||
|
patch -d "$PROJECT_DIR" -p1 < "$PATCHES_DIR"/ffmpeg-6.1-fix-build.patch
|
||||||
|
fi
|
||||||
|
|
||||||
|
mkdir -p "$BUILD_DIR/$PROJECT_DIR"
|
||||||
|
cd "$BUILD_DIR/$PROJECT_DIR"
|
||||||
|
|
||||||
|
if [[ "$HOST" = win32 ]]
|
||||||
|
then
|
||||||
|
ARCH=x86
|
||||||
|
elif [[ "$HOST" = win64 ]]
|
||||||
|
then
|
||||||
|
ARCH=x86_64
|
||||||
|
else
|
||||||
|
echo "Unsupported host: $HOST" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# -static-libgcc to avoid missing libgcc_s_dw2-1.dll
|
||||||
|
# -static to avoid dynamic dependency to zlib
|
||||||
|
export CFLAGS='-static-libgcc -static'
|
||||||
|
export CXXFLAGS="$CFLAGS"
|
||||||
|
export LDFLAGS='-static-libgcc -static'
|
||||||
|
|
||||||
|
if [[ -d "$HOST" ]]
|
||||||
|
then
|
||||||
|
echo "'$PWD/$HOST' already exists, not reconfigured"
|
||||||
|
cd "$HOST"
|
||||||
|
else
|
||||||
|
mkdir "$HOST"
|
||||||
|
cd "$HOST"
|
||||||
|
|
||||||
|
"$SOURCES_DIR/$PROJECT_DIR"/configure \
|
||||||
|
--prefix="$INSTALL_DIR/$HOST" \
|
||||||
|
--enable-cross-compile \
|
||||||
|
--target-os=mingw32 \
|
||||||
|
--arch="$ARCH" \
|
||||||
|
--cross-prefix="${HOST_TRIPLET}-" \
|
||||||
|
--cc="${HOST_TRIPLET}-gcc" \
|
||||||
|
--extra-cflags="-O2 -fPIC" \
|
||||||
|
--enable-shared \
|
||||||
|
--disable-static \
|
||||||
|
--disable-programs \
|
||||||
|
--disable-doc \
|
||||||
|
--disable-swscale \
|
||||||
|
--disable-postproc \
|
||||||
|
--disable-avfilter \
|
||||||
|
--disable-avdevice \
|
||||||
|
--disable-network \
|
||||||
|
--disable-everything \
|
||||||
|
--enable-swresample \
|
||||||
|
--enable-decoder=h264 \
|
||||||
|
--enable-decoder=hevc \
|
||||||
|
--enable-decoder=av1 \
|
||||||
|
--enable-decoder=pcm_s16le \
|
||||||
|
--enable-decoder=opus \
|
||||||
|
--enable-decoder=aac \
|
||||||
|
--enable-decoder=flac \
|
||||||
|
--enable-decoder=png \
|
||||||
|
--enable-protocol=file \
|
||||||
|
--enable-demuxer=image2 \
|
||||||
|
--enable-parser=png \
|
||||||
|
--enable-zlib \
|
||||||
|
--enable-muxer=matroska \
|
||||||
|
--enable-muxer=mp4 \
|
||||||
|
--enable-muxer=opus \
|
||||||
|
--enable-muxer=flac \
|
||||||
|
--enable-muxer=wav \
|
||||||
|
--disable-vulkan
|
||||||
|
fi
|
||||||
|
|
||||||
|
make -j
|
||||||
|
make install
|
45
app/deps/libusb.sh
Executable file
45
app/deps/libusb.sh
Executable file
@ -0,0 +1,45 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -ex
|
||||||
|
DEPS_DIR=$(dirname ${BASH_SOURCE[0]})
|
||||||
|
cd "$DEPS_DIR"
|
||||||
|
. common
|
||||||
|
|
||||||
|
VERSION=1.0.27
|
||||||
|
FILENAME=libusb-$VERSION.tar.gz
|
||||||
|
PROJECT_DIR=libusb-$VERSION
|
||||||
|
SHA256SUM=e8f18a7a36ecbb11fb820bd71540350d8f61bcd9db0d2e8c18a6fb80b214a3de
|
||||||
|
|
||||||
|
cd "$SOURCES_DIR"
|
||||||
|
|
||||||
|
if [[ -d "$PROJECT_DIR" ]]
|
||||||
|
then
|
||||||
|
echo "$PWD/$PROJECT_DIR" found
|
||||||
|
else
|
||||||
|
get_file "https://github.com/libusb/libusb/archive/refs/tags/v$VERSION.tar.gz" "$FILENAME" "$SHA256SUM"
|
||||||
|
tar xf "$FILENAME" # First level directory is "$PROJECT_DIR"
|
||||||
|
fi
|
||||||
|
|
||||||
|
mkdir -p "$BUILD_DIR/$PROJECT_DIR"
|
||||||
|
cd "$BUILD_DIR/$PROJECT_DIR"
|
||||||
|
|
||||||
|
export CFLAGS='-O2'
|
||||||
|
export CXXFLAGS="$CFLAGS"
|
||||||
|
|
||||||
|
if [[ -d "$HOST" ]]
|
||||||
|
then
|
||||||
|
echo "'$PWD/$HOST' already exists, not reconfigured"
|
||||||
|
cd "$HOST"
|
||||||
|
else
|
||||||
|
mkdir "$HOST"
|
||||||
|
cd "$HOST"
|
||||||
|
|
||||||
|
"$SOURCES_DIR/$PROJECT_DIR"/bootstrap.sh
|
||||||
|
"$SOURCES_DIR/$PROJECT_DIR"/configure \
|
||||||
|
--prefix="$INSTALL_DIR/$HOST" \
|
||||||
|
--host="$HOST_TRIPLET" \
|
||||||
|
--enable-shared \
|
||||||
|
--disable-static
|
||||||
|
fi
|
||||||
|
|
||||||
|
make -j
|
||||||
|
make install-strip
|
27
app/deps/patches/ffmpeg-6.1-fix-build.patch
Normal file
27
app/deps/patches/ffmpeg-6.1-fix-build.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
From 03c80197afb324da38c9b70254231e3fdcfa68fc Mon Sep 17 00:00:00 2001
|
||||||
|
From: Romain Vimont <rom@rom1v.com>
|
||||||
|
Date: Sun, 12 Nov 2023 17:58:50 +0100
|
||||||
|
Subject: [PATCH] Fix FFmpeg 6.1 build
|
||||||
|
|
||||||
|
Build failed on tag n6.1 With --enable-decoder=av1 but without
|
||||||
|
--enable-muxer=av1.
|
||||||
|
---
|
||||||
|
libavcodec/Makefile | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
|
||||||
|
index 580a8d6b54..aff19b670c 100644
|
||||||
|
--- a/libavcodec/Makefile
|
||||||
|
+++ b/libavcodec/Makefile
|
||||||
|
@@ -249,7 +249,7 @@ OBJS-$(CONFIG_ATRAC3PAL_DECODER) += atrac3plusdec.o atrac3plus.o \
|
||||||
|
OBJS-$(CONFIG_ATRAC9_DECODER) += atrac9dec.o
|
||||||
|
OBJS-$(CONFIG_AURA_DECODER) += cyuv.o
|
||||||
|
OBJS-$(CONFIG_AURA2_DECODER) += aura.o
|
||||||
|
-OBJS-$(CONFIG_AV1_DECODER) += av1dec.o
|
||||||
|
+OBJS-$(CONFIG_AV1_DECODER) += av1dec.o av1_parse.o
|
||||||
|
OBJS-$(CONFIG_AV1_CUVID_DECODER) += cuviddec.o
|
||||||
|
OBJS-$(CONFIG_AV1_MEDIACODEC_DECODER) += mediacodecdec.o
|
||||||
|
OBJS-$(CONFIG_AV1_MEDIACODEC_ENCODER) += mediacodecenc.o
|
||||||
|
--
|
||||||
|
2.42.0
|
||||||
|
|
47
app/deps/sdl.sh
Executable file
47
app/deps/sdl.sh
Executable file
@ -0,0 +1,47 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -ex
|
||||||
|
DEPS_DIR=$(dirname ${BASH_SOURCE[0]})
|
||||||
|
cd "$DEPS_DIR"
|
||||||
|
. common
|
||||||
|
|
||||||
|
VERSION=2.28.5
|
||||||
|
FILENAME=SDL-$VERSION.tar.gz
|
||||||
|
PROJECT_DIR=SDL-release-$VERSION
|
||||||
|
SHA256SUM=9f0556e4a24ef5b267010038ad9e9948b62f236d5bcc4b22179f95ef62d84023
|
||||||
|
|
||||||
|
cd "$SOURCES_DIR"
|
||||||
|
|
||||||
|
if [[ -d "$PROJECT_DIR" ]]
|
||||||
|
then
|
||||||
|
echo "$PWD/$PROJECT_DIR" found
|
||||||
|
else
|
||||||
|
get_file "https://github.com/libsdl-org/SDL/archive/refs/tags/release-$VERSION.tar.gz" "$FILENAME" "$SHA256SUM"
|
||||||
|
tar xf "$FILENAME" # First level directory is "$PROJECT_DIR"
|
||||||
|
fi
|
||||||
|
|
||||||
|
mkdir -p "$BUILD_DIR/$PROJECT_DIR"
|
||||||
|
cd "$BUILD_DIR/$PROJECT_DIR"
|
||||||
|
|
||||||
|
export CFLAGS='-O2'
|
||||||
|
export CXXFLAGS="$CFLAGS"
|
||||||
|
|
||||||
|
if [[ -d "$HOST" ]]
|
||||||
|
then
|
||||||
|
echo "'$PWD/$HOST' already exists, not reconfigured"
|
||||||
|
cd "$HOST"
|
||||||
|
else
|
||||||
|
mkdir "$HOST"
|
||||||
|
cd "$HOST"
|
||||||
|
|
||||||
|
"$SOURCES_DIR/$PROJECT_DIR"/configure \
|
||||||
|
--prefix="$INSTALL_DIR/$HOST" \
|
||||||
|
--host="$HOST_TRIPLET" \
|
||||||
|
--enable-shared \
|
||||||
|
--disable-static
|
||||||
|
fi
|
||||||
|
|
||||||
|
make -j
|
||||||
|
# There is no "make install-strip"
|
||||||
|
make install
|
||||||
|
# Strip manually
|
||||||
|
${HOST_TRIPLET}-strip "$INSTALL_DIR/$HOST/bin/SDL2.dll"
|
105
app/meson.build
105
app/meson.build
@ -20,8 +20,8 @@ src = [
|
|||||||
'src/fps_counter.c',
|
'src/fps_counter.c',
|
||||||
'src/frame_buffer.c',
|
'src/frame_buffer.c',
|
||||||
'src/input_manager.c',
|
'src/input_manager.c',
|
||||||
'src/keyboard_inject.c',
|
'src/keyboard_sdk.c',
|
||||||
'src/mouse_inject.c',
|
'src/mouse_sdk.c',
|
||||||
'src/opengl.c',
|
'src/opengl.c',
|
||||||
'src/options.c',
|
'src/options.c',
|
||||||
'src/packet_merger.c',
|
'src/packet_merger.c',
|
||||||
@ -31,11 +31,16 @@ src = [
|
|||||||
'src/screen.c',
|
'src/screen.c',
|
||||||
'src/server.c',
|
'src/server.c',
|
||||||
'src/version.c',
|
'src/version.c',
|
||||||
|
'src/hid/hid_keyboard.c',
|
||||||
|
'src/hid/hid_mouse.c',
|
||||||
'src/trait/frame_source.c',
|
'src/trait/frame_source.c',
|
||||||
'src/trait/packet_source.c',
|
'src/trait/packet_source.c',
|
||||||
|
'src/uhid/keyboard_uhid.c',
|
||||||
|
'src/uhid/mouse_uhid.c',
|
||||||
|
'src/uhid/uhid_output.c',
|
||||||
'src/util/acksync.c',
|
'src/util/acksync.c',
|
||||||
|
'src/util/audiobuf.c',
|
||||||
'src/util/average.c',
|
'src/util/average.c',
|
||||||
'src/util/bytebuf.c',
|
|
||||||
'src/util/file.c',
|
'src/util/file.c',
|
||||||
'src/util/intmap.c',
|
'src/util/intmap.c',
|
||||||
'src/util/intr.c',
|
'src/util/intr.c',
|
||||||
@ -88,8 +93,8 @@ usb_support = get_option('usb')
|
|||||||
if usb_support
|
if usb_support
|
||||||
src += [
|
src += [
|
||||||
'src/usb/aoa_hid.c',
|
'src/usb/aoa_hid.c',
|
||||||
'src/usb/hid_keyboard.c',
|
'src/usb/keyboard_aoa.c',
|
||||||
'src/usb/hid_mouse.c',
|
'src/usb/mouse_aoa.c',
|
||||||
'src/usb/scrcpy_otg.c',
|
'src/usb/scrcpy_otg.c',
|
||||||
'src/usb/screen_otg.c',
|
'src/usb/screen_otg.c',
|
||||||
'src/usb/usb.c',
|
'src/usb/usb.c',
|
||||||
@ -98,77 +103,24 @@ endif
|
|||||||
|
|
||||||
cc = meson.get_compiler('c')
|
cc = meson.get_compiler('c')
|
||||||
|
|
||||||
crossbuild_windows = meson.is_cross_build() and host_machine.system() == 'windows'
|
dependencies = [
|
||||||
|
dependency('libavformat', version: '>= 57.33'),
|
||||||
|
dependency('libavcodec', version: '>= 57.37'),
|
||||||
|
dependency('libavutil'),
|
||||||
|
dependency('libswresample'),
|
||||||
|
dependency('sdl2', version: '>= 2.0.5'),
|
||||||
|
]
|
||||||
|
|
||||||
if not crossbuild_windows
|
if v4l2_support
|
||||||
|
dependencies += dependency('libavdevice')
|
||||||
# native build
|
endif
|
||||||
dependencies = [
|
|
||||||
dependency('libavformat', version: '>= 57.33'),
|
|
||||||
dependency('libavcodec', version: '>= 57.37'),
|
|
||||||
dependency('libavutil'),
|
|
||||||
dependency('libswresample'),
|
|
||||||
dependency('sdl2', version: '>= 2.0.5'),
|
|
||||||
]
|
|
||||||
|
|
||||||
if v4l2_support
|
|
||||||
dependencies += dependency('libavdevice')
|
|
||||||
endif
|
|
||||||
|
|
||||||
if usb_support
|
|
||||||
dependencies += dependency('libusb-1.0')
|
|
||||||
endif
|
|
||||||
|
|
||||||
else
|
|
||||||
# cross-compile mingw32 build (from Linux to Windows)
|
|
||||||
prebuilt_sdl2 = meson.get_cross_property('prebuilt_sdl2')
|
|
||||||
sdl2_bin_dir = meson.current_source_dir() + '/prebuilt-deps/data/' + prebuilt_sdl2 + '/bin'
|
|
||||||
sdl2_lib_dir = meson.current_source_dir() + '/prebuilt-deps/data/' + prebuilt_sdl2 + '/lib'
|
|
||||||
sdl2_include_dir = 'prebuilt-deps/data/' + prebuilt_sdl2 + '/include'
|
|
||||||
|
|
||||||
sdl2 = declare_dependency(
|
|
||||||
dependencies: [
|
|
||||||
cc.find_library('SDL2', dirs: sdl2_bin_dir),
|
|
||||||
cc.find_library('SDL2main', dirs: sdl2_lib_dir),
|
|
||||||
],
|
|
||||||
include_directories: include_directories(sdl2_include_dir)
|
|
||||||
)
|
|
||||||
|
|
||||||
prebuilt_ffmpeg = meson.get_cross_property('prebuilt_ffmpeg')
|
|
||||||
ffmpeg_bin_dir = meson.current_source_dir() + '/prebuilt-deps/data/' + prebuilt_ffmpeg + '/bin'
|
|
||||||
ffmpeg_include_dir = 'prebuilt-deps/data/' + prebuilt_ffmpeg + '/include'
|
|
||||||
|
|
||||||
ffmpeg = declare_dependency(
|
|
||||||
dependencies: [
|
|
||||||
cc.find_library('avcodec-60', dirs: ffmpeg_bin_dir),
|
|
||||||
cc.find_library('avformat-60', dirs: ffmpeg_bin_dir),
|
|
||||||
cc.find_library('avutil-58', dirs: ffmpeg_bin_dir),
|
|
||||||
cc.find_library('swresample-4', dirs: ffmpeg_bin_dir),
|
|
||||||
],
|
|
||||||
include_directories: include_directories(ffmpeg_include_dir)
|
|
||||||
)
|
|
||||||
|
|
||||||
prebuilt_libusb = meson.get_cross_property('prebuilt_libusb')
|
|
||||||
libusb_bin_dir = meson.current_source_dir() + '/prebuilt-deps/data/' + prebuilt_libusb + '/bin'
|
|
||||||
libusb_include_dir = 'prebuilt-deps/data/' + prebuilt_libusb + '/include'
|
|
||||||
|
|
||||||
libusb = declare_dependency(
|
|
||||||
dependencies: [
|
|
||||||
cc.find_library('msys-usb-1.0', dirs: libusb_bin_dir),
|
|
||||||
],
|
|
||||||
include_directories: include_directories(libusb_include_dir)
|
|
||||||
)
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
ffmpeg,
|
|
||||||
sdl2,
|
|
||||||
libusb,
|
|
||||||
cc.find_library('mingw32')
|
|
||||||
]
|
|
||||||
|
|
||||||
|
if usb_support
|
||||||
|
dependencies += dependency('libusb-1.0')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if host_machine.system() == 'windows'
|
if host_machine.system() == 'windows'
|
||||||
|
dependencies += cc.find_library('mingw32')
|
||||||
dependencies += cc.find_library('ws2_32')
|
dependencies += cc.find_library('ws2_32')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@ -265,9 +217,10 @@ if get_option('buildtype') == 'debug'
|
|||||||
['test_binary', [
|
['test_binary', [
|
||||||
'tests/test_binary.c',
|
'tests/test_binary.c',
|
||||||
]],
|
]],
|
||||||
['test_bytebuf', [
|
['test_audiobuf', [
|
||||||
'tests/test_bytebuf.c',
|
'tests/test_audiobuf.c',
|
||||||
'src/util/bytebuf.c',
|
'src/util/audiobuf.c',
|
||||||
|
'src/util/memory.c',
|
||||||
]],
|
]],
|
||||||
['test_cli', [
|
['test_cli', [
|
||||||
'tests/test_cli.c',
|
'tests/test_cli.c',
|
||||||
@ -289,6 +242,10 @@ if get_option('buildtype') == 'debug'
|
|||||||
'tests/test_device_msg_deserialize.c',
|
'tests/test_device_msg_deserialize.c',
|
||||||
'src/device_msg.c',
|
'src/device_msg.c',
|
||||||
]],
|
]],
|
||||||
|
['test_orientation', [
|
||||||
|
'tests/test_orientation.c',
|
||||||
|
'src/options.c',
|
||||||
|
]],
|
||||||
['test_strbuf', [
|
['test_strbuf', [
|
||||||
'tests/test_strbuf.c',
|
'tests/test_strbuf.c',
|
||||||
'src/util/strbuf.c',
|
'src/util/strbuf.c',
|
||||||
|
1
app/prebuilt-deps/.gitignore
vendored
1
app/prebuilt-deps/.gitignore
vendored
@ -1 +0,0 @@
|
|||||||
/data
|
|
@ -1,22 +0,0 @@
|
|||||||
PREBUILT_DATA_DIR=data
|
|
||||||
|
|
||||||
checksum() {
|
|
||||||
local file="$1"
|
|
||||||
local sum="$2"
|
|
||||||
echo "$file: verifying checksum..."
|
|
||||||
echo "$sum $file" | sha256sum -c
|
|
||||||
}
|
|
||||||
|
|
||||||
get_file() {
|
|
||||||
local url="$1"
|
|
||||||
local file="$2"
|
|
||||||
local sum="$3"
|
|
||||||
if [[ -f "$file" ]]
|
|
||||||
then
|
|
||||||
echo "$file: found"
|
|
||||||
else
|
|
||||||
echo "$file: not found, downloading..."
|
|
||||||
wget "$url" -O "$file"
|
|
||||||
fi
|
|
||||||
checksum "$file" "$sum"
|
|
||||||
}
|
|
@ -1,32 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
set -e
|
|
||||||
DIR=$(dirname ${BASH_SOURCE[0]})
|
|
||||||
cd "$DIR"
|
|
||||||
. common
|
|
||||||
mkdir -p "$PREBUILT_DATA_DIR"
|
|
||||||
cd "$PREBUILT_DATA_DIR"
|
|
||||||
|
|
||||||
DEP_DIR=platform-tools-34.0.3
|
|
||||||
|
|
||||||
FILENAME=platform-tools_r34.0.3-windows.zip
|
|
||||||
SHA256SUM=fce992e93eb786fc9f47df93d83a7b912c46742d45c39d712c02e06d05b72e2b
|
|
||||||
|
|
||||||
if [[ -d "$DEP_DIR" ]]
|
|
||||||
then
|
|
||||||
echo "$DEP_DIR" found
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
get_file "https://dl.google.com/android/repository/$FILENAME" \
|
|
||||||
"$FILENAME" "$SHA256SUM"
|
|
||||||
|
|
||||||
mkdir "$DEP_DIR"
|
|
||||||
cd "$DEP_DIR"
|
|
||||||
|
|
||||||
ZIP_PREFIX=platform-tools
|
|
||||||
unzip "../$FILENAME" \
|
|
||||||
"$ZIP_PREFIX"/AdbWinApi.dll \
|
|
||||||
"$ZIP_PREFIX"/AdbWinUsbApi.dll \
|
|
||||||
"$ZIP_PREFIX"/adb.exe
|
|
||||||
mv "$ZIP_PREFIX"/* .
|
|
||||||
rmdir "$ZIP_PREFIX"
|
|
@ -1,30 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
set -e
|
|
||||||
DIR=$(dirname ${BASH_SOURCE[0]})
|
|
||||||
cd "$DIR"
|
|
||||||
. common
|
|
||||||
mkdir -p "$PREBUILT_DATA_DIR"
|
|
||||||
cd "$PREBUILT_DATA_DIR"
|
|
||||||
|
|
||||||
VERSION=6.0-scrcpy-4
|
|
||||||
DEP_DIR="ffmpeg-$VERSION"
|
|
||||||
|
|
||||||
FILENAME="$DEP_DIR".7z
|
|
||||||
SHA256SUM=39274b321491ce83e76cab5d24e7cbe3f402d3ccf382f739b13be5651c146b60
|
|
||||||
|
|
||||||
if [[ -d "$DEP_DIR" ]]
|
|
||||||
then
|
|
||||||
echo "$DEP_DIR" found
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
get_file "https://github.com/rom1v/scrcpy-deps/releases/download/$VERSION/$FILENAME" \
|
|
||||||
"$FILENAME" "$SHA256SUM"
|
|
||||||
|
|
||||||
mkdir "$DEP_DIR"
|
|
||||||
cd "$DEP_DIR"
|
|
||||||
|
|
||||||
ZIP_PREFIX=ffmpeg
|
|
||||||
7z x "../$FILENAME"
|
|
||||||
mv "$ZIP_PREFIX"/* .
|
|
||||||
rmdir "$ZIP_PREFIX"
|
|
@ -1,33 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
set -e
|
|
||||||
DIR=$(dirname ${BASH_SOURCE[0]})
|
|
||||||
cd "$DIR"
|
|
||||||
. common
|
|
||||||
mkdir -p "$PREBUILT_DATA_DIR"
|
|
||||||
cd "$PREBUILT_DATA_DIR"
|
|
||||||
|
|
||||||
DEP_DIR=libusb-1.0.26
|
|
||||||
|
|
||||||
FILENAME=libusb-1.0.26-binaries.7z
|
|
||||||
SHA256SUM=9c242696342dbde9cdc47239391f71833939bf9f7aa2bbb28cdaabe890465ec5
|
|
||||||
|
|
||||||
if [[ -d "$DEP_DIR" ]]
|
|
||||||
then
|
|
||||||
echo "$DEP_DIR" found
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
get_file "https://github.com/libusb/libusb/releases/download/v1.0.26/$FILENAME" "$FILENAME" "$SHA256SUM"
|
|
||||||
|
|
||||||
mkdir "$DEP_DIR"
|
|
||||||
cd "$DEP_DIR"
|
|
||||||
|
|
||||||
7z x "../$FILENAME" \
|
|
||||||
libusb-1.0.26-binaries/libusb-MinGW-Win32/bin/msys-usb-1.0.dll \
|
|
||||||
libusb-1.0.26-binaries/libusb-MinGW-Win32/include/ \
|
|
||||||
libusb-1.0.26-binaries/libusb-MinGW-x64/bin/msys-usb-1.0.dll \
|
|
||||||
libusb-1.0.26-binaries/libusb-MinGW-x64/include/
|
|
||||||
|
|
||||||
mv libusb-1.0.26-binaries/libusb-MinGW-Win32 .
|
|
||||||
mv libusb-1.0.26-binaries/libusb-MinGW-x64 .
|
|
||||||
rm -rf libusb-1.0.26-binaries
|
|
@ -1,32 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
set -e
|
|
||||||
DIR=$(dirname ${BASH_SOURCE[0]})
|
|
||||||
cd "$DIR"
|
|
||||||
. common
|
|
||||||
mkdir -p "$PREBUILT_DATA_DIR"
|
|
||||||
cd "$PREBUILT_DATA_DIR"
|
|
||||||
|
|
||||||
DEP_DIR=SDL2-2.28.0
|
|
||||||
|
|
||||||
FILENAME=SDL2-devel-2.28.0-mingw.tar.gz
|
|
||||||
SHA256SUM=b91ce59eeacd4a9db403f976fd2337d9360b21ada374124417d716065c380e20
|
|
||||||
|
|
||||||
if [[ -d "$DEP_DIR" ]]
|
|
||||||
then
|
|
||||||
echo "$DEP_DIR" found
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
get_file "https://libsdl.org/release/$FILENAME" "$FILENAME" "$SHA256SUM"
|
|
||||||
|
|
||||||
mkdir "$DEP_DIR"
|
|
||||||
cd "$DEP_DIR"
|
|
||||||
|
|
||||||
TAR_PREFIX="$DEP_DIR" # root directory inside the tar has the same name
|
|
||||||
tar xf "../$FILENAME" --strip-components=1 \
|
|
||||||
"$TAR_PREFIX"/i686-w64-mingw32/bin/SDL2.dll \
|
|
||||||
"$TAR_PREFIX"/i686-w64-mingw32/include/ \
|
|
||||||
"$TAR_PREFIX"/i686-w64-mingw32/lib/ \
|
|
||||||
"$TAR_PREFIX"/x86_64-w64-mingw32/bin/SDL2.dll \
|
|
||||||
"$TAR_PREFIX"/x86_64-w64-mingw32/include/ \
|
|
||||||
"$TAR_PREFIX"/x86_64-w64-mingw32/lib/ \
|
|
@ -13,7 +13,7 @@ BEGIN
|
|||||||
VALUE "LegalCopyright", "Romain Vimont, Genymobile"
|
VALUE "LegalCopyright", "Romain Vimont, Genymobile"
|
||||||
VALUE "OriginalFilename", "scrcpy.exe"
|
VALUE "OriginalFilename", "scrcpy.exe"
|
||||||
VALUE "ProductName", "scrcpy"
|
VALUE "ProductName", "scrcpy"
|
||||||
VALUE "ProductVersion", "2.1.1"
|
VALUE "ProductVersion", "2.4"
|
||||||
END
|
END
|
||||||
END
|
END
|
||||||
BLOCK "VarFileInfo"
|
BLOCK "VarFileInfo"
|
||||||
|
229
app/scrcpy.1
229
app/scrcpy.1
@ -26,7 +26,7 @@ Encode the audio at the given bit rate, expressed in bits/s. Unit suffixes are s
|
|||||||
Default is 128K (128000).
|
Default is 128K (128000).
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.BI "\-\-audio\-buffer ms
|
.BI "\-\-audio\-buffer " ms
|
||||||
Configure the audio buffering delay (in milliseconds).
|
Configure the audio buffering delay (in milliseconds).
|
||||||
|
|
||||||
Lower values decrease the latency, but increase the likelyhood of buffer underrun (causing audio glitches).
|
Lower values decrease the latency, but increase the likelyhood of buffer underrun (causing audio glitches).
|
||||||
@ -35,7 +35,7 @@ Default is 50.
|
|||||||
|
|
||||||
.TP
|
.TP
|
||||||
.BI "\-\-audio\-codec " name
|
.BI "\-\-audio\-codec " name
|
||||||
Select an audio codec (opus, aac or raw).
|
Select an audio codec (opus, aac, flac or raw).
|
||||||
|
|
||||||
Default is opus.
|
Default is opus.
|
||||||
|
|
||||||
@ -45,15 +45,15 @@ Set a list of comma-separated key:type=value options for the device audio encode
|
|||||||
|
|
||||||
The possible values for 'type' are 'int' (default), 'long', 'float' and 'string'.
|
The possible values for 'type' are 'int' (default), 'long', 'float' and 'string'.
|
||||||
|
|
||||||
The list of possible codec options is available in the Android documentation
|
The list of possible codec options is available in the Android documentation:
|
||||||
.UR https://d.android.com/reference/android/media/MediaFormat
|
|
||||||
.UE .
|
<https://d.android.com/reference/android/media/MediaFormat>
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.BI "\-\-audio\-encoder " name
|
.BI "\-\-audio\-encoder " name
|
||||||
Use a specific MediaCodec audio encoder (depending on the codec provided by \fB\-\-audio\-codec\fR).
|
Use a specific MediaCodec audio encoder (depending on the codec provided by \fB\-\-audio\-codec\fR).
|
||||||
|
|
||||||
The available encoders can be listed by \-\-list\-encoders.
|
The available encoders can be listed by \fB\-\-list\-encoders\fR.
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.BI "\-\-audio\-source " source
|
.BI "\-\-audio\-source " source
|
||||||
@ -62,7 +62,7 @@ Select the audio source (output or mic).
|
|||||||
Default is output.
|
Default is output.
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.BI "\-\-audio\-output\-buffer ms
|
.BI "\-\-audio\-output\-buffer " ms
|
||||||
Configure the size of the SDL audio output buffer (in milliseconds).
|
Configure the size of the SDL audio output buffer (in milliseconds).
|
||||||
|
|
||||||
If you get "robotic" audio playback, you should test with a higher value (10). Do not change this setting otherwise.
|
If you get "robotic" audio playback, you should test with a higher value (10). Do not change this setting otherwise.
|
||||||
@ -75,6 +75,40 @@ Encode the video at the given bit rate, expressed in bits/s. Unit suffixes are s
|
|||||||
|
|
||||||
Default is 8M (8000000).
|
Default is 8M (8000000).
|
||||||
|
|
||||||
|
.TP
|
||||||
|
.BI "\-\-camera\-ar " ar
|
||||||
|
Select the camera size by its aspect ratio (+/- 10%).
|
||||||
|
|
||||||
|
Possible values are "sensor" (use the camera sensor aspect ratio), "\fInum\fR:\fIden\fR" (e.g. "4:3") and "\fIvalue\fR" (e.g. "1.6").
|
||||||
|
|
||||||
|
.TP
|
||||||
|
.B \-\-camera\-high\-speed
|
||||||
|
Enable high-speed camera capture mode.
|
||||||
|
|
||||||
|
This mode is restricted to specific resolutions and frame rates, listed by \fB\-\-list\-camera\-sizes\fR.
|
||||||
|
|
||||||
|
.TP
|
||||||
|
.BI "\-\-camera\-id " id
|
||||||
|
Specify the device camera id to mirror.
|
||||||
|
|
||||||
|
The available camera ids can be listed by \fB\-\-list\-cameras\fR.
|
||||||
|
|
||||||
|
.TP
|
||||||
|
.BI "\-\-camera\-facing " facing
|
||||||
|
Select the device camera by its facing direction.
|
||||||
|
|
||||||
|
Possible values are "front", "back" and "external".
|
||||||
|
|
||||||
|
.TP
|
||||||
|
.BI "\-\-camera\-fps " fps
|
||||||
|
Specify the camera capture frame rate.
|
||||||
|
|
||||||
|
If not specified, Android's default frame rate (30 fps) is used.
|
||||||
|
|
||||||
|
.TP
|
||||||
|
.BI "\-\-camera\-size " width\fRx\fIheight
|
||||||
|
Specify an explicit camera capture size.
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.BI "\-\-crop " width\fR:\fIheight\fR:\fIx\fR:\fIy
|
.BI "\-\-crop " width\fR:\fIheight\fR:\fIx\fR:\fIy
|
||||||
Crop the device screen on the server.
|
Crop the device screen on the server.
|
||||||
@ -90,22 +124,30 @@ Use USB device (if there is exactly one, like adb -d).
|
|||||||
Also see \fB\-e\fR (\fB\-\-select\-tcpip\fR).
|
Also see \fB\-e\fR (\fB\-\-select\-tcpip\fR).
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.BI "\-\-disable-screensaver"
|
.BI "\-\-disable\-screensaver"
|
||||||
Disable screensaver while scrcpy is running.
|
Disable screensaver while scrcpy is running.
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.BI "\-\-display " id
|
.BI "\-\-display\-buffer " ms
|
||||||
|
Add a buffering delay (in milliseconds) before displaying. This increases latency to compensate for jitter.
|
||||||
|
|
||||||
|
Default is 0 (no buffering).
|
||||||
|
|
||||||
|
.TP
|
||||||
|
.BI "\-\-display\-id " id
|
||||||
Specify the device display id to mirror.
|
Specify the device display id to mirror.
|
||||||
|
|
||||||
The available display ids can be listed by \-\-list\-displays.
|
The available display ids can be listed by \fB\-\-list\-displays\fR.
|
||||||
|
|
||||||
Default is 0.
|
Default is 0.
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.BI "\-\-display\-buffer ms
|
.BI "\-\-display\-orientation " value
|
||||||
Add a buffering delay (in milliseconds) before displaying. This increases latency to compensate for jitter.
|
Set the initial display orientation.
|
||||||
|
|
||||||
Default is 0 (no buffering).
|
Possible values are 0, 90, 180, 270, flip0, flip90, flip180 and flip270. The number represents the clockwise rotation in degrees; the "flip" keyword applies a horizontal flip before the rotation.
|
||||||
|
|
||||||
|
Default is 0.
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.B \-e, \-\-select\-tcpip
|
.B \-e, \-\-select\-tcpip
|
||||||
@ -130,24 +172,31 @@ By default, right-click triggers BACK (or POWER on) and middle-click triggers HO
|
|||||||
Print this help.
|
Print this help.
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.B \-\-kill\-adb\-on\-close
|
.B \-K
|
||||||
Kill adb when scrcpy terminates.
|
Same as \fB\-\-keyboard=uhid\fR.
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.B \-K, \-\-hid\-keyboard
|
.BI "\-\-keyboard " mode
|
||||||
Simulate a physical keyboard by using HID over AOAv2.
|
Select how to send keyboard inputs to the device.
|
||||||
|
|
||||||
This provides a better experience for IME users, and allows to generate non-ASCII characters, contrary to the default injection method.
|
Possible values are "disabled", "sdk", "uhid" and "aoa":
|
||||||
|
|
||||||
It may only work over USB.
|
- "disabled" does not send keyboard inputs to the device.
|
||||||
|
- "sdk" uses the Android system API to deliver keyboard events to applications.
|
||||||
|
- "uhid" simulates a physical HID keyboard using the Linux HID kernel module on the device.
|
||||||
|
- "aoa" simulates a physical HID keyboard using the AOAv2 protocol. It may only work over USB.
|
||||||
|
|
||||||
The keyboard layout must be configured (once and for all) on the device, via Settings -> System -> Languages and input -> Physical keyboard. This settings page can be started directly:
|
For "uhid" and "aoa", the keyboard layout must be configured (once and for all) on the device, via Settings -> System -> Languages and input -> Physical keyboard. This settings page can be started directly using the shortcut MOD+k (except in OTG mode), or by executing:
|
||||||
|
|
||||||
adb shell am start -a android.settings.HARD_KEYBOARD_SETTINGS
|
adb shell am start -a android.settings.HARD_KEYBOARD_SETTINGS
|
||||||
|
|
||||||
However, the option is only available when the HID keyboard is enabled (or a physical keyboard is connected).
|
This option is only available when the HID keyboard is enabled (or a physical keyboard is connected).
|
||||||
|
|
||||||
Also see \fB\-\-hid\-mouse\fR.
|
Also see \fB\-\-mouse\fR.
|
||||||
|
|
||||||
|
.TP
|
||||||
|
.B \-\-kill\-adb\-on\-close
|
||||||
|
Kill adb when scrcpy terminates.
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.B \-\-legacy\-paste
|
.B \-\-legacy\-paste
|
||||||
@ -155,6 +204,14 @@ Inject computer clipboard text as a sequence of key events on Ctrl+v (like MOD+S
|
|||||||
|
|
||||||
This is a workaround for some devices not behaving as expected when setting the device clipboard programmatically.
|
This is a workaround for some devices not behaving as expected when setting the device clipboard programmatically.
|
||||||
|
|
||||||
|
.TP
|
||||||
|
.B \-\-list\-camera\-sizes
|
||||||
|
List the valid camera capture sizes.
|
||||||
|
|
||||||
|
.TP
|
||||||
|
.B \-\-list\-cameras
|
||||||
|
List cameras available on the device.
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.B \-\-list\-encoders
|
.B \-\-list\-encoders
|
||||||
List video and audio encoders available on the device.
|
List video and audio encoders available on the device.
|
||||||
@ -165,7 +222,9 @@ List displays available on the device.
|
|||||||
|
|
||||||
.TP
|
.TP
|
||||||
\fB\-\-lock\-video\-orientation\fR[=\fIvalue\fR]
|
\fB\-\-lock\-video\-orientation\fR[=\fIvalue\fR]
|
||||||
Lock video orientation to \fIvalue\fR. Possible values are "unlocked", "initial" (locked to the initial orientation), 0, 1, 2 and 3. Natural device orientation is 0, and each increment adds a 90 degrees rotation counterclockwise.
|
Lock capture video orientation to \fIvalue\fR.
|
||||||
|
|
||||||
|
Possible values are "unlocked", "initial" (locked to the initial orientation), 0, 90, 180, and 270. The values represent the clockwise rotation from the natural device orientation, in degrees.
|
||||||
|
|
||||||
Default is "unlocked".
|
Default is "unlocked".
|
||||||
|
|
||||||
@ -178,28 +237,38 @@ Limit both the width and height of the video to \fIvalue\fR. The other dimension
|
|||||||
Default is 0 (unlimited).
|
Default is 0 (unlimited).
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.B \-M, \-\-hid\-mouse
|
.B \-M
|
||||||
Simulate a physical mouse by using HID over AOAv2.
|
Same as \fB\-\-mouse=uhid\fR.
|
||||||
|
|
||||||
In this mode, the computer mouse is captured to control the device directly (relative mouse mode).
|
|
||||||
|
|
||||||
LAlt, LSuper or RSuper toggle the capture mode, to give control of the mouse back to the computer.
|
|
||||||
|
|
||||||
It may only work over USB.
|
|
||||||
|
|
||||||
Also see \fB\-\-hid\-keyboard\fR.
|
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.BI "\-\-max\-fps " value
|
.BI "\-\-max\-fps " value
|
||||||
Limit the framerate of screen capture (officially supported since Android 10, but may work on earlier versions).
|
Limit the framerate of screen capture (officially supported since Android 10, but may work on earlier versions).
|
||||||
|
|
||||||
|
.TP
|
||||||
|
.BI "\-\-mouse " mode
|
||||||
|
Select how to send mouse inputs to the device.
|
||||||
|
|
||||||
|
Possible values are "disabled", "sdk", "uhid" and "aoa":
|
||||||
|
|
||||||
|
- "disabled" does not send mouse inputs to the device.
|
||||||
|
- "sdk" uses the Android system API to deliver mouse events to applications.
|
||||||
|
- "uhid" simulates a physical HID mouse using the Linux HID kernel module on the device.
|
||||||
|
- "aoa" simulates a physical mouse using the AOAv2 protocol. It may only work over USB.
|
||||||
|
|
||||||
|
In "uhid" and "aoa" modes, the computer mouse is captured to control the device directly (relative mouse mode).
|
||||||
|
|
||||||
|
LAlt, LSuper or RSuper toggle the capture mode, to give control of the mouse back to the computer.
|
||||||
|
|
||||||
|
Also see \fB\-\-keyboard\fR.
|
||||||
|
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.B \-n, \-\-no\-control
|
.B \-n, \-\-no\-control
|
||||||
Disable device control (mirror the device in read\-only).
|
Disable device control (mirror the device in read\-only).
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.B \-N, \-\-no\-playback
|
.B \-N, \-\-no\-playback
|
||||||
Disable video and audio playback on the computer (equivalent to --no-video-playback --no-audio-playback).
|
Disable video and audio playback on the computer (equivalent to \fB\-\-no\-video\-playback \-\-no\-audio\-playback\fR).
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.B \-\-no\-audio
|
.B \-\-no\-audio
|
||||||
@ -247,6 +316,14 @@ Disable video forwarding.
|
|||||||
.B \-\-no\-video\-playback
|
.B \-\-no\-video\-playback
|
||||||
Disable video playback on the computer.
|
Disable video playback on the computer.
|
||||||
|
|
||||||
|
.TP
|
||||||
|
.B \-\-no\-window
|
||||||
|
Disable scrcpy window. Implies --no-video-playback and --no-control.
|
||||||
|
|
||||||
|
.TP
|
||||||
|
.BI "\-\-orientation " value
|
||||||
|
Same as --display-orientation=value --record-orientation=value.
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.B \-\-otg
|
.B \-\-otg
|
||||||
Run in OTG mode: simulate physical keyboard and mouse, as if the computer keyboard and mouse were plugged directly to the device via an OTG cable.
|
Run in OTG mode: simulate physical keyboard and mouse, as if the computer keyboard and mouse were plugged directly to the device via an OTG cable.
|
||||||
@ -305,7 +382,7 @@ Record screen to
|
|||||||
|
|
||||||
The format is determined by the
|
The format is determined by the
|
||||||
.B \-\-record\-format
|
.B \-\-record\-format
|
||||||
option if set, or by the file extension (.mp4 or .mkv).
|
option if set, or by the file extension.
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.B \-\-raw\-key\-events
|
.B \-\-raw\-key\-events
|
||||||
@ -313,7 +390,15 @@ Inject key events for all input keys, and ignore text events.
|
|||||||
|
|
||||||
.TP
|
.TP
|
||||||
.BI "\-\-record\-format " format
|
.BI "\-\-record\-format " format
|
||||||
Force recording format (either mp4 or mkv).
|
Force recording format (mp4, mkv, m4a, mka, opus, aac, flac or wav).
|
||||||
|
|
||||||
|
.TP
|
||||||
|
.BI "\-\-record\-orientation " value
|
||||||
|
Set the record orientation.
|
||||||
|
|
||||||
|
Possible values are 0, 90, 180 and 270. The number represents the clockwise rotation in degrees.
|
||||||
|
|
||||||
|
Default is 0.
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.BI "\-\-render\-driver " name
|
.BI "\-\-render\-driver " name
|
||||||
@ -321,17 +406,12 @@ Request SDL to use the given render driver (this is just a hint).
|
|||||||
|
|
||||||
Supported names are currently "direct3d", "opengl", "opengles2", "opengles", "metal" and "software".
|
Supported names are currently "direct3d", "opengl", "opengles2", "opengles", "metal" and "software".
|
||||||
|
|
||||||
.UR https://wiki.libsdl.org/SDL_HINT_RENDER_DRIVER
|
<https://wiki.libsdl.org/SDL_HINT_RENDER_DRIVER>
|
||||||
.UE
|
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.B \-\-require\-audio
|
.B \-\-require\-audio
|
||||||
By default, scrcpy mirrors only the video if audio capture fails on the device. This option makes scrcpy fail if audio is enabled but does not work.
|
By default, scrcpy mirrors only the video if audio capture fails on the device. This option makes scrcpy fail if audio is enabled but does not work.
|
||||||
|
|
||||||
.TP
|
|
||||||
.BI "\-\-rotation " value
|
|
||||||
Set the initial display rotation. Possibles values are 0, 1, 2 and 3. Each increment adds a 90 degrees rotation counterclockwise.
|
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.BI "\-s, \-\-serial " number
|
.BI "\-s, \-\-serial " number
|
||||||
The device serial number. Mandatory only if several devices are connected to adb.
|
The device serial number. Mandatory only if several devices are connected to adb.
|
||||||
@ -370,13 +450,13 @@ Set the maximum mirroring time, in seconds.
|
|||||||
|
|
||||||
.TP
|
.TP
|
||||||
.BI "\-\-tunnel\-host " ip
|
.BI "\-\-tunnel\-host " ip
|
||||||
Set the IP address of the adb tunnel to reach the scrcpy server. This option automatically enables --force-adb-forward.
|
Set the IP address of the adb tunnel to reach the scrcpy server. This option automatically enables \fB\-\-force\-adb\-forward\fR.
|
||||||
|
|
||||||
Default is localhost.
|
Default is localhost.
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.BI "\-\-tunnel\-port " port
|
.BI "\-\-tunnel\-port " port
|
||||||
Set the TCP port of the adb tunnel to reach the scrcpy server. This option automatically enables --force-adb-forward.
|
Set the TCP port of the adb tunnel to reach the scrcpy server. This option automatically enables \fB\-\-force\-adb\-forward\fR.
|
||||||
|
|
||||||
Default is 0 (not forced): the local port used for establishing the tunnel will be used.
|
Default is 0 (not forced): the local port used for establishing the tunnel will be used.
|
||||||
|
|
||||||
@ -416,15 +496,23 @@ Set a list of comma-separated key:type=value options for the device video encode
|
|||||||
|
|
||||||
The possible values for 'type' are 'int' (default), 'long', 'float' and 'string'.
|
The possible values for 'type' are 'int' (default), 'long', 'float' and 'string'.
|
||||||
|
|
||||||
The list of possible codec options is available in the Android documentation
|
The list of possible codec options is available in the Android documentation:
|
||||||
.UR https://d.android.com/reference/android/media/MediaFormat
|
|
||||||
.UE .
|
<https://d.android.com/reference/android/media/MediaFormat>
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.BI "\-\-video\-encoder " name
|
.BI "\-\-video\-encoder " name
|
||||||
Use a specific MediaCodec video encoder (depending on the codec provided by \fB\-\-video\-codec\fR).
|
Use a specific MediaCodec video encoder (depending on the codec provided by \fB\-\-video\-codec\fR).
|
||||||
|
|
||||||
The available encoders can be listed by \-\-list\-encoders.
|
The available encoders can be listed by \fB\-\-list\-encoders\fR.
|
||||||
|
|
||||||
|
.TP
|
||||||
|
.BI "\-\-video\-source " source
|
||||||
|
Select the video source (display or camera).
|
||||||
|
|
||||||
|
Camera mirroring requires Android 12+.
|
||||||
|
|
||||||
|
Default is display.
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.B \-w, \-\-stay-awake
|
.B \-w, \-\-stay-awake
|
||||||
@ -485,6 +573,22 @@ Rotate display left
|
|||||||
.B MOD+Right
|
.B MOD+Right
|
||||||
Rotate display right
|
Rotate display right
|
||||||
|
|
||||||
|
.TP
|
||||||
|
.B MOD+Shift+Left, MOD+Shift+Right
|
||||||
|
Flip display horizontally
|
||||||
|
|
||||||
|
.TP
|
||||||
|
.B MOD+Shift+Up, MOD+Shift+Down
|
||||||
|
Flip display vertically
|
||||||
|
|
||||||
|
.TP
|
||||||
|
.B MOD+z
|
||||||
|
Pause or re-pause display
|
||||||
|
|
||||||
|
.TP
|
||||||
|
.B MOD+Shift+z
|
||||||
|
Unpause display
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.B MOD+g
|
.B MOD+g
|
||||||
Resize window to 1:1 (pixel\-perfect)
|
Resize window to 1:1 (pixel\-perfect)
|
||||||
@ -561,13 +665,21 @@ Copy computer clipboard to device, then paste (inject PASTE keycode, Android >=
|
|||||||
.B MOD+Shift+v
|
.B MOD+Shift+v
|
||||||
Inject computer clipboard text as a sequence of key events
|
Inject computer clipboard text as a sequence of key events
|
||||||
|
|
||||||
|
.TP
|
||||||
|
.B MOD+k
|
||||||
|
Open keyboard settings on the device (for HID keyboard only)
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.B MOD+i
|
.B MOD+i
|
||||||
Enable/disable FPS counter (print frames/second in logs)
|
Enable/disable FPS counter (print frames/second in logs)
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.B Ctrl+click-and-move
|
.B Ctrl+click-and-move
|
||||||
Pinch-to-zoom from the center of the screen
|
Pinch-to-zoom and rotate from the center of the screen
|
||||||
|
|
||||||
|
.TP
|
||||||
|
.B Shift+click-and-move
|
||||||
|
Tilt (slide vertically with two fingers)
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.B Drag & drop APK file
|
.B Drag & drop APK file
|
||||||
@ -586,7 +698,7 @@ Path to adb.
|
|||||||
|
|
||||||
.TP
|
.TP
|
||||||
.B ANDROID_SERIAL
|
.B ANDROID_SERIAL
|
||||||
Device serial to use if no selector (-s, -d, -e or --tcpip=<addr>) is specified.
|
Device serial to use if no selector (\fB-s\fR, \fB-d\fR, \fB-e\fR or \fB\-\-tcpip=\fIaddr\fR) is specified.
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.B SCRCPY_ICON_PATH
|
.B SCRCPY_ICON_PATH
|
||||||
@ -609,23 +721,14 @@ for the Debian Project (and may be used by others).
|
|||||||
|
|
||||||
|
|
||||||
.SH "REPORTING BUGS"
|
.SH "REPORTING BUGS"
|
||||||
Report bugs to
|
Report bugs to <https://github.com/Genymobile/scrcpy/issues>.
|
||||||
.UR https://github.com/Genymobile/scrcpy/issues
|
|
||||||
.UE .
|
|
||||||
|
|
||||||
.SH COPYRIGHT
|
.SH COPYRIGHT
|
||||||
Copyright \(co 2018 Genymobile
|
Copyright \(co 2018 Genymobile <https://www.genymobile.com>
|
||||||
.UR https://www.genymobile.com
|
|
||||||
Genymobile
|
|
||||||
.UE
|
|
||||||
|
|
||||||
Copyright \(co 2018\-2023
|
Copyright \(co 2018\-2024 Romain Vimont <rom@rom1v.com>
|
||||||
.MT rom@rom1v.com
|
|
||||||
Romain Vimont
|
|
||||||
.ME
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0.
|
Licensed under the Apache License, Version 2.0.
|
||||||
|
|
||||||
.SH WWW
|
.SH WWW
|
||||||
.UR https://github.com/Genymobile/scrcpy
|
<https://github.com/Genymobile/scrcpy>
|
||||||
.UE
|
|
||||||
|
@ -70,7 +70,7 @@ argv_to_string(const char *const *argv, char *buf, size_t bufsize) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
show_adb_installation_msg() {
|
show_adb_installation_msg(void) {
|
||||||
#ifndef __WINDOWS__
|
#ifndef __WINDOWS__
|
||||||
static const struct {
|
static const struct {
|
||||||
const char *binary;
|
const char *binary;
|
||||||
@ -218,8 +218,16 @@ sc_adb_forward(struct sc_intr *intr, const char *serial, uint16_t local_port,
|
|||||||
const char *device_socket_name, unsigned flags) {
|
const char *device_socket_name, unsigned flags) {
|
||||||
char local[4 + 5 + 1]; // tcp:PORT
|
char local[4 + 5 + 1]; // tcp:PORT
|
||||||
char remote[108 + 14 + 1]; // localabstract:NAME
|
char remote[108 + 14 + 1]; // localabstract:NAME
|
||||||
sprintf(local, "tcp:%" PRIu16, local_port);
|
|
||||||
snprintf(remote, sizeof(remote), "localabstract:%s", device_socket_name);
|
int r = snprintf(local, sizeof(local), "tcp:%" PRIu16, local_port);
|
||||||
|
assert(r >= 0 && (size_t) r < sizeof(local));
|
||||||
|
|
||||||
|
r = snprintf(remote, sizeof(remote), "localabstract:%s",
|
||||||
|
device_socket_name);
|
||||||
|
if (r < 0 || (size_t) r >= sizeof(remote)) {
|
||||||
|
LOGE("Could not write socket name");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
assert(serial);
|
assert(serial);
|
||||||
const char *const argv[] =
|
const char *const argv[] =
|
||||||
@ -233,7 +241,9 @@ bool
|
|||||||
sc_adb_forward_remove(struct sc_intr *intr, const char *serial,
|
sc_adb_forward_remove(struct sc_intr *intr, const char *serial,
|
||||||
uint16_t local_port, unsigned flags) {
|
uint16_t local_port, unsigned flags) {
|
||||||
char local[4 + 5 + 1]; // tcp:PORT
|
char local[4 + 5 + 1]; // tcp:PORT
|
||||||
sprintf(local, "tcp:%" PRIu16, local_port);
|
int r = snprintf(local, sizeof(local), "tcp:%" PRIu16, local_port);
|
||||||
|
assert(r >= 0 && (size_t) r < sizeof(local));
|
||||||
|
(void) r;
|
||||||
|
|
||||||
assert(serial);
|
assert(serial);
|
||||||
const char *const argv[] =
|
const char *const argv[] =
|
||||||
@ -249,8 +259,16 @@ sc_adb_reverse(struct sc_intr *intr, const char *serial,
|
|||||||
unsigned flags) {
|
unsigned flags) {
|
||||||
char local[4 + 5 + 1]; // tcp:PORT
|
char local[4 + 5 + 1]; // tcp:PORT
|
||||||
char remote[108 + 14 + 1]; // localabstract:NAME
|
char remote[108 + 14 + 1]; // localabstract:NAME
|
||||||
sprintf(local, "tcp:%" PRIu16, local_port);
|
int r = snprintf(local, sizeof(local), "tcp:%" PRIu16, local_port);
|
||||||
snprintf(remote, sizeof(remote), "localabstract:%s", device_socket_name);
|
assert(r >= 0 && (size_t) r < sizeof(local));
|
||||||
|
|
||||||
|
r = snprintf(remote, sizeof(remote), "localabstract:%s",
|
||||||
|
device_socket_name);
|
||||||
|
if (r < 0 || (size_t) r >= sizeof(remote)) {
|
||||||
|
LOGE("Could not write socket name");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
assert(serial);
|
assert(serial);
|
||||||
const char *const argv[] =
|
const char *const argv[] =
|
||||||
SC_ADB_COMMAND("-s", serial, "reverse", remote, local);
|
SC_ADB_COMMAND("-s", serial, "reverse", remote, local);
|
||||||
@ -263,7 +281,12 @@ bool
|
|||||||
sc_adb_reverse_remove(struct sc_intr *intr, const char *serial,
|
sc_adb_reverse_remove(struct sc_intr *intr, const char *serial,
|
||||||
const char *device_socket_name, unsigned flags) {
|
const char *device_socket_name, unsigned flags) {
|
||||||
char remote[108 + 14 + 1]; // localabstract:NAME
|
char remote[108 + 14 + 1]; // localabstract:NAME
|
||||||
snprintf(remote, sizeof(remote), "localabstract:%s", device_socket_name);
|
int r = snprintf(remote, sizeof(remote), "localabstract:%s",
|
||||||
|
device_socket_name);
|
||||||
|
if (r < 0 || (size_t) r >= sizeof(remote)) {
|
||||||
|
LOGE("Device socket name too long");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
assert(serial);
|
assert(serial);
|
||||||
const char *const argv[] =
|
const char *const argv[] =
|
||||||
@ -333,7 +356,9 @@ bool
|
|||||||
sc_adb_tcpip(struct sc_intr *intr, const char *serial, uint16_t port,
|
sc_adb_tcpip(struct sc_intr *intr, const char *serial, uint16_t port,
|
||||||
unsigned flags) {
|
unsigned flags) {
|
||||||
char port_string[5 + 1];
|
char port_string[5 + 1];
|
||||||
sprintf(port_string, "%" PRIu16, port);
|
int r = snprintf(port_string, sizeof(port_string), "%" PRIu16, port);
|
||||||
|
assert(r >= 0 && (size_t) r < sizeof(port_string));
|
||||||
|
(void) r;
|
||||||
|
|
||||||
assert(serial);
|
assert(serial);
|
||||||
const char *const argv[] =
|
const char *const argv[] =
|
||||||
@ -433,6 +458,7 @@ sc_adb_list_devices(struct sc_intr *intr, unsigned flags,
|
|||||||
// in the buffer in a single pass
|
// in the buffer in a single pass
|
||||||
LOGW("Result of \"adb devices -l\" does not fit in 64Kb. "
|
LOGW("Result of \"adb devices -l\" does not fit in 64Kb. "
|
||||||
"Please report an issue.");
|
"Please report an issue.");
|
||||||
|
free(buf);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
#include "util/log.h"
|
#include "util/log.h"
|
||||||
#include "util/str.h"
|
#include "util/str.h"
|
||||||
|
|
||||||
bool
|
static bool
|
||||||
sc_adb_parse_device(char *line, struct sc_adb_device *device) {
|
sc_adb_parse_device(char *line, struct sc_adb_device *device) {
|
||||||
// One device line looks like:
|
// One device line looks like:
|
||||||
// "0123456789abcdef device usb:2-1 product:MyProduct model:MyModel "
|
// "0123456789abcdef device usb:2-1 product:MyProduct model:MyModel "
|
||||||
|
@ -66,8 +66,7 @@ static void SDLCALL
|
|||||||
sc_audio_player_sdl_callback(void *userdata, uint8_t *stream, int len_int) {
|
sc_audio_player_sdl_callback(void *userdata, uint8_t *stream, int len_int) {
|
||||||
struct sc_audio_player *ap = userdata;
|
struct sc_audio_player *ap = userdata;
|
||||||
|
|
||||||
// This callback is called with the lock used by SDL_AudioDeviceLock(), so
|
// This callback is called with the lock used by SDL_LockAudioDevice()
|
||||||
// the audiobuf is protected
|
|
||||||
|
|
||||||
assert(len_int > 0);
|
assert(len_int > 0);
|
||||||
size_t len = len_int;
|
size_t len = len_int;
|
||||||
@ -77,12 +76,12 @@ sc_audio_player_sdl_callback(void *userdata, uint8_t *stream, int len_int) {
|
|||||||
LOGD("[Audio] SDL callback requests %" PRIu32 " samples", count);
|
LOGD("[Audio] SDL callback requests %" PRIu32 " samples", count);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
uint32_t buffered_samples = sc_audiobuf_can_read(&ap->buf);
|
bool played = atomic_load_explicit(&ap->played, memory_order_relaxed);
|
||||||
if (!ap->played) {
|
if (!played) {
|
||||||
// Part of the buffering is handled by inserting initial silence. The
|
uint32_t buffered_samples = sc_audiobuf_can_read(&ap->buf);
|
||||||
// remaining (margin) last samples will be handled by compensation.
|
// Wait until the buffer is filled up to at least target_buffering
|
||||||
uint32_t margin = 30 * ap->sample_rate / 1000; // 30ms
|
// before playing
|
||||||
if (buffered_samples + margin < ap->target_buffering) {
|
if (buffered_samples < ap->target_buffering) {
|
||||||
LOGV("[Audio] Inserting initial buffering silence: %" PRIu32
|
LOGV("[Audio] Inserting initial buffering silence: %" PRIu32
|
||||||
" samples", count);
|
" samples", count);
|
||||||
// Delay playback starting to reach the target buffering. Fill the
|
// Delay playback starting to reach the target buffering. Fill the
|
||||||
@ -93,10 +92,7 @@ sc_audio_player_sdl_callback(void *userdata, uint8_t *stream, int len_int) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t read = MIN(buffered_samples, count);
|
uint32_t read = sc_audiobuf_read(&ap->buf, stream, count);
|
||||||
if (read) {
|
|
||||||
sc_audiobuf_read(&ap->buf, stream, read);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (read < count) {
|
if (read < count) {
|
||||||
uint32_t silence = count - read;
|
uint32_t silence = count - read;
|
||||||
@ -109,13 +105,16 @@ sc_audio_player_sdl_callback(void *userdata, uint8_t *stream, int len_int) {
|
|||||||
silence);
|
silence);
|
||||||
memset(stream + TO_BYTES(read), 0, TO_BYTES(silence));
|
memset(stream + TO_BYTES(read), 0, TO_BYTES(silence));
|
||||||
|
|
||||||
if (ap->received) {
|
bool received = atomic_load_explicit(&ap->received,
|
||||||
|
memory_order_relaxed);
|
||||||
|
if (received) {
|
||||||
// Inserting additional samples immediately increases buffering
|
// Inserting additional samples immediately increases buffering
|
||||||
ap->underflow += silence;
|
atomic_fetch_add_explicit(&ap->underflow, silence,
|
||||||
|
memory_order_relaxed);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ap->played = true;
|
atomic_store_explicit(&ap->played, true, memory_order_relaxed);
|
||||||
}
|
}
|
||||||
|
|
||||||
static uint8_t *
|
static uint8_t *
|
||||||
@ -162,155 +161,168 @@ sc_audio_player_frame_sink_push(struct sc_frame_sink *sink,
|
|||||||
|
|
||||||
// swr_convert() returns the number of samples which would have been
|
// swr_convert() returns the number of samples which would have been
|
||||||
// written if the buffer was big enough.
|
// written if the buffer was big enough.
|
||||||
uint32_t samples_written = MIN(ret, dst_nb_samples);
|
uint32_t samples = MIN(ret, dst_nb_samples);
|
||||||
#ifndef SC_AUDIO_PLAYER_NDEBUG
|
#ifndef SC_AUDIO_PLAYER_NDEBUG
|
||||||
LOGD("[Audio] %" PRIu32 " samples written to buffer", samples_written);
|
LOGD("[Audio] %" PRIu32 " samples written to buffer", samples);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Since this function is the only writer, the current available space is
|
uint32_t cap = sc_audiobuf_capacity(&ap->buf);
|
||||||
// at least the previous available space. In practice, it should almost
|
if (samples > cap) {
|
||||||
// always be possible to write without lock.
|
// Very very unlikely: a single resampled frame should never
|
||||||
bool lockless_write = samples_written <= ap->previous_can_write;
|
// exceed the audio buffer size (or something is very wrong).
|
||||||
if (lockless_write) {
|
// Ignore the first bytes in swr_buf to avoid memory corruption anyway.
|
||||||
sc_audiobuf_prepare_write(&ap->buf, swr_buf, samples_written);
|
swr_buf += TO_BYTES(samples - cap);
|
||||||
|
samples = cap;
|
||||||
}
|
}
|
||||||
|
|
||||||
SDL_LockAudioDevice(ap->device);
|
uint32_t skipped_samples = 0;
|
||||||
|
|
||||||
uint32_t buffered_samples = sc_audiobuf_can_read(&ap->buf);
|
uint32_t written = sc_audiobuf_write(&ap->buf, swr_buf, samples);
|
||||||
|
if (written < samples) {
|
||||||
|
uint32_t remaining = samples - written;
|
||||||
|
|
||||||
if (lockless_write) {
|
// All samples that could be written without locking have been written,
|
||||||
sc_audiobuf_commit_write(&ap->buf, samples_written);
|
// now we need to lock to drop/consume old samples
|
||||||
} else {
|
SDL_LockAudioDevice(ap->device);
|
||||||
uint32_t can_write = sc_audiobuf_can_write(&ap->buf);
|
|
||||||
if (samples_written > can_write) {
|
|
||||||
// Entering this branch is very unlikely, the audio buffer is
|
|
||||||
// allocated with a size sufficient to store 1 second more than the
|
|
||||||
// target buffering. If this happens, though, we have to skip old
|
|
||||||
// samples.
|
|
||||||
uint32_t cap = sc_audiobuf_capacity(&ap->buf);
|
|
||||||
if (samples_written > cap) {
|
|
||||||
// Very very unlikely: a single resampled frame should never
|
|
||||||
// exceed the audio buffer size (or something is very wrong).
|
|
||||||
// Ignore the first bytes in swr_buf
|
|
||||||
swr_buf += TO_BYTES(samples_written - cap);
|
|
||||||
// This change in samples_written will impact the
|
|
||||||
// instant_compensation below
|
|
||||||
samples_written = cap;
|
|
||||||
}
|
|
||||||
|
|
||||||
assert(samples_written >= can_write);
|
// Retry with the lock
|
||||||
if (samples_written > can_write) {
|
written += sc_audiobuf_write(&ap->buf,
|
||||||
uint32_t skip_samples = samples_written - can_write;
|
swr_buf + TO_BYTES(written),
|
||||||
assert(buffered_samples >= skip_samples);
|
remaining);
|
||||||
sc_audiobuf_skip(&ap->buf, skip_samples);
|
if (written < samples) {
|
||||||
buffered_samples -= skip_samples;
|
remaining = samples - written;
|
||||||
if (ap->played) {
|
// Still insufficient, drop old samples to make space
|
||||||
// Dropping input samples instantly decreases buffering
|
skipped_samples = sc_audiobuf_read(&ap->buf, NULL, remaining);
|
||||||
ap->avg_buffering.avg -= skip_samples;
|
assert(skipped_samples == remaining);
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// It should remain exactly the expected size to write the new
|
// Now there is enough space
|
||||||
// samples.
|
uint32_t w = sc_audiobuf_write(&ap->buf,
|
||||||
assert(sc_audiobuf_can_write(&ap->buf) == samples_written);
|
swr_buf + TO_BYTES(written),
|
||||||
|
remaining);
|
||||||
|
assert(w == remaining);
|
||||||
|
(void) w;
|
||||||
}
|
}
|
||||||
|
|
||||||
sc_audiobuf_write(&ap->buf, swr_buf, samples_written);
|
SDL_UnlockAudioDevice(ap->device);
|
||||||
}
|
}
|
||||||
|
|
||||||
buffered_samples += samples_written;
|
uint32_t underflow = 0;
|
||||||
assert(buffered_samples == sc_audiobuf_can_read(&ap->buf));
|
uint32_t max_buffered_samples;
|
||||||
|
bool played = atomic_load_explicit(&ap->played, memory_order_relaxed);
|
||||||
// Read with lock held, to be used after unlocking
|
|
||||||
bool played = ap->played;
|
|
||||||
uint32_t underflow = ap->underflow;
|
|
||||||
|
|
||||||
if (played) {
|
if (played) {
|
||||||
uint32_t max_buffered_samples = ap->target_buffering
|
underflow = atomic_exchange_explicit(&ap->underflow, 0,
|
||||||
+ 12 * ap->output_buffer
|
memory_order_relaxed);
|
||||||
+ ap->target_buffering / 10;
|
|
||||||
if (buffered_samples > max_buffered_samples) {
|
|
||||||
uint32_t skip_samples = buffered_samples - max_buffered_samples;
|
|
||||||
sc_audiobuf_skip(&ap->buf, skip_samples);
|
|
||||||
LOGD("[Audio] Buffering threshold exceeded, skipping %" PRIu32
|
|
||||||
" samples", skip_samples);
|
|
||||||
}
|
|
||||||
|
|
||||||
// reset (the current value was copied to a local variable)
|
max_buffered_samples = ap->target_buffering
|
||||||
ap->underflow = 0;
|
+ 12 * ap->output_buffer
|
||||||
|
+ ap->target_buffering / 10;
|
||||||
} else {
|
} else {
|
||||||
// SDL playback not started yet, do not accumulate more than
|
// SDL playback not started yet, do not accumulate more than
|
||||||
// max_initial_buffering samples, this would cause unnecessary delay
|
// max_initial_buffering samples, this would cause unnecessary delay
|
||||||
// (and glitches to compensate) on start.
|
// (and glitches to compensate) on start.
|
||||||
uint32_t max_initial_buffering = ap->target_buffering
|
max_buffered_samples = ap->target_buffering + 2 * ap->output_buffer;
|
||||||
+ 2 * ap->output_buffer;
|
}
|
||||||
if (buffered_samples > max_initial_buffering) {
|
|
||||||
uint32_t skip_samples = buffered_samples - max_initial_buffering;
|
uint32_t can_read = sc_audiobuf_can_read(&ap->buf);
|
||||||
sc_audiobuf_skip(&ap->buf, skip_samples);
|
if (can_read > max_buffered_samples) {
|
||||||
|
uint32_t skip_samples = 0;
|
||||||
|
|
||||||
|
SDL_LockAudioDevice(ap->device);
|
||||||
|
can_read = sc_audiobuf_can_read(&ap->buf);
|
||||||
|
if (can_read > max_buffered_samples) {
|
||||||
|
skip_samples = can_read - max_buffered_samples;
|
||||||
|
uint32_t r = sc_audiobuf_read(&ap->buf, NULL, skip_samples);
|
||||||
|
assert(r == skip_samples);
|
||||||
|
(void) r;
|
||||||
|
skipped_samples += skip_samples;
|
||||||
|
}
|
||||||
|
SDL_UnlockAudioDevice(ap->device);
|
||||||
|
|
||||||
|
if (skip_samples) {
|
||||||
|
if (played) {
|
||||||
|
LOGD("[Audio] Buffering threshold exceeded, skipping %" PRIu32
|
||||||
|
" samples", skip_samples);
|
||||||
#ifndef SC_AUDIO_PLAYER_NDEBUG
|
#ifndef SC_AUDIO_PLAYER_NDEBUG
|
||||||
LOGD("[Audio] Playback not started, skipping %" PRIu32 " samples",
|
} else {
|
||||||
skip_samples);
|
LOGD("[Audio] Playback not started, skipping %" PRIu32
|
||||||
|
" samples", skip_samples);
|
||||||
#endif
|
#endif
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ap->previous_can_write = sc_audiobuf_can_write(&ap->buf);
|
atomic_store_explicit(&ap->received, true, memory_order_relaxed);
|
||||||
ap->received = true;
|
if (!played) {
|
||||||
|
// Nothing more to do
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
SDL_UnlockAudioDevice(ap->device);
|
// Number of samples added (or removed, if negative) for compensation
|
||||||
|
int32_t instant_compensation = (int32_t) written - frame->nb_samples;
|
||||||
|
// Inserting silence instantly increases buffering
|
||||||
|
int32_t inserted_silence = (int32_t) underflow;
|
||||||
|
// Dropping input samples instantly decreases buffering
|
||||||
|
int32_t dropped = (int32_t) skipped_samples;
|
||||||
|
|
||||||
if (played) {
|
// The compensation must apply instantly, it must not be smoothed
|
||||||
// Number of samples added (or removed, if negative) for compensation
|
ap->avg_buffering.avg += instant_compensation + inserted_silence - dropped;
|
||||||
int32_t instant_compensation =
|
if (ap->avg_buffering.avg < 0) {
|
||||||
(int32_t) samples_written - frame->nb_samples;
|
// Since dropping samples instantly reduces buffering, the difference
|
||||||
int32_t inserted_silence = (int32_t) underflow;
|
// is applied immediately to the average value, assuming that the delay
|
||||||
|
// between the producer and the consumer will be caught up.
|
||||||
|
//
|
||||||
|
// However, when this assumption is not valid, the average buffering
|
||||||
|
// may decrease indefinitely. Prevent it to become negative to limit
|
||||||
|
// the consequences.
|
||||||
|
ap->avg_buffering.avg = 0;
|
||||||
|
}
|
||||||
|
|
||||||
// The compensation must apply instantly, it must not be smoothed
|
// However, the buffering level must be smoothed
|
||||||
ap->avg_buffering.avg += instant_compensation + inserted_silence;
|
sc_average_push(&ap->avg_buffering, can_read);
|
||||||
|
|
||||||
|
|
||||||
// However, the buffering level must be smoothed
|
|
||||||
sc_average_push(&ap->avg_buffering, buffered_samples);
|
|
||||||
|
|
||||||
#ifndef SC_AUDIO_PLAYER_NDEBUG
|
#ifndef SC_AUDIO_PLAYER_NDEBUG
|
||||||
LOGD("[Audio] buffered_samples=%" PRIu32 " avg_buffering=%f",
|
LOGD("[Audio] can_read=%" PRIu32 " avg_buffering=%f",
|
||||||
buffered_samples, sc_average_get(&ap->avg_buffering));
|
can_read, sc_average_get(&ap->avg_buffering));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
ap->samples_since_resync += samples_written;
|
ap->samples_since_resync += written;
|
||||||
if (ap->samples_since_resync >= ap->sample_rate) {
|
if (ap->samples_since_resync >= ap->sample_rate) {
|
||||||
// Recompute compensation every second
|
// Recompute compensation every second
|
||||||
ap->samples_since_resync = 0;
|
ap->samples_since_resync = 0;
|
||||||
|
|
||||||
float avg = sc_average_get(&ap->avg_buffering);
|
float avg = sc_average_get(&ap->avg_buffering);
|
||||||
int diff = ap->target_buffering - avg;
|
int diff = ap->target_buffering - avg;
|
||||||
if (abs(diff) < (int) ap->sample_rate / 1000) {
|
|
||||||
// Do not compensate for less than 1ms, the error is just noise
|
|
||||||
diff = 0;
|
|
||||||
} else if (diff < 0 && buffered_samples < ap->target_buffering) {
|
|
||||||
// Do not accelerate if the instant buffering level is below
|
|
||||||
// the average, this would increase underflow
|
|
||||||
diff = 0;
|
|
||||||
}
|
|
||||||
// Compensate the diff over 4 seconds (but will be recomputed after
|
|
||||||
// 1 second)
|
|
||||||
int distance = 4 * ap->sample_rate;
|
|
||||||
// Limit compensation rate to 2%
|
|
||||||
int abs_max_diff = distance / 50;
|
|
||||||
diff = CLAMP(diff, -abs_max_diff, abs_max_diff);
|
|
||||||
LOGV("[Audio] Buffering: target=%" PRIu32 " avg=%f cur=%" PRIu32
|
|
||||||
" compensation=%d", ap->target_buffering, avg,
|
|
||||||
buffered_samples, diff);
|
|
||||||
|
|
||||||
if (diff != ap->compensation) {
|
// Enable compensation when the difference exceeds +/- 4ms.
|
||||||
int ret = swr_set_compensation(swr_ctx, diff, distance);
|
// Disable compensation when the difference is lower than +/- 1ms.
|
||||||
if (ret < 0) {
|
int threshold = ap->compensation != 0
|
||||||
LOGW("Resampling compensation failed: %d", ret);
|
? ap->sample_rate / 1000 /* 1ms */
|
||||||
// not fatal
|
: ap->sample_rate * 4 / 1000; /* 4ms */
|
||||||
} else {
|
|
||||||
ap->compensation = diff;
|
if (abs(diff) < threshold) {
|
||||||
}
|
// Do not compensate for small values, the error is just noise
|
||||||
|
diff = 0;
|
||||||
|
} else if (diff < 0 && can_read < ap->target_buffering) {
|
||||||
|
// Do not accelerate if the instant buffering level is below the
|
||||||
|
// target, this would increase underflow
|
||||||
|
diff = 0;
|
||||||
|
}
|
||||||
|
// Compensate the diff over 4 seconds (but will be recomputed after 1
|
||||||
|
// second)
|
||||||
|
int distance = 4 * ap->sample_rate;
|
||||||
|
// Limit compensation rate to 2%
|
||||||
|
int abs_max_diff = distance / 50;
|
||||||
|
diff = CLAMP(diff, -abs_max_diff, abs_max_diff);
|
||||||
|
LOGV("[Audio] Buffering: target=%" PRIu32 " avg=%f cur=%" PRIu32
|
||||||
|
" compensation=%d", ap->target_buffering, avg, can_read, diff);
|
||||||
|
|
||||||
|
if (diff != ap->compensation) {
|
||||||
|
int ret = swr_set_compensation(swr_ctx, diff, distance);
|
||||||
|
if (ret < 0) {
|
||||||
|
LOGW("Resampling compensation failed: %d", ret);
|
||||||
|
// not fatal
|
||||||
|
} else {
|
||||||
|
ap->compensation = diff;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -397,7 +409,7 @@ sc_audio_player_frame_sink_open(struct sc_frame_sink *sink,
|
|||||||
// producer and the consumer. It's too big on purpose, to guarantee that
|
// producer and the consumer. It's too big on purpose, to guarantee that
|
||||||
// the producer and the consumer will be able to access it in parallel
|
// the producer and the consumer will be able to access it in parallel
|
||||||
// without locking.
|
// without locking.
|
||||||
size_t audiobuf_samples = ap->target_buffering + ap->sample_rate;
|
uint32_t audiobuf_samples = ap->target_buffering + ap->sample_rate;
|
||||||
|
|
||||||
size_t sample_size = ap->nb_channels * ap->out_bytes_per_sample;
|
size_t sample_size = ap->nb_channels * ap->out_bytes_per_sample;
|
||||||
bool ok = sc_audiobuf_init(&ap->buf, sample_size, audiobuf_samples);
|
bool ok = sc_audiobuf_init(&ap->buf, sample_size, audiobuf_samples);
|
||||||
@ -413,16 +425,15 @@ sc_audio_player_frame_sink_open(struct sc_frame_sink *sink,
|
|||||||
}
|
}
|
||||||
ap->swr_buf_alloc_size = initial_swr_buf_size;
|
ap->swr_buf_alloc_size = initial_swr_buf_size;
|
||||||
|
|
||||||
ap->previous_can_write = sc_audiobuf_can_write(&ap->buf);
|
|
||||||
|
|
||||||
// Samples are produced and consumed by blocks, so the buffering must be
|
// Samples are produced and consumed by blocks, so the buffering must be
|
||||||
// smoothed to get a relatively stable value.
|
// smoothed to get a relatively stable value.
|
||||||
sc_average_init(&ap->avg_buffering, 32);
|
sc_average_init(&ap->avg_buffering, 128);
|
||||||
ap->samples_since_resync = 0;
|
ap->samples_since_resync = 0;
|
||||||
|
|
||||||
ap->received = false;
|
ap->received = false;
|
||||||
ap->played = false;
|
atomic_init(&ap->played, false);
|
||||||
ap->underflow = 0;
|
atomic_init(&ap->received, false);
|
||||||
|
atomic_init(&ap->underflow, 0);
|
||||||
ap->compensation = 0;
|
ap->compensation = 0;
|
||||||
|
|
||||||
// The thread calling open() is the thread calling push(), which fills the
|
// The thread calling open() is the thread calling push(), which fills the
|
||||||
|
@ -3,17 +3,18 @@
|
|||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
||||||
|
#include <stdatomic.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include "trait/frame_sink.h"
|
|
||||||
#include <util/audiobuf.h>
|
|
||||||
#include <util/average.h>
|
|
||||||
#include <util/thread.h>
|
|
||||||
#include <util/tick.h>
|
|
||||||
|
|
||||||
#include <libavformat/avformat.h>
|
#include <libavformat/avformat.h>
|
||||||
#include <libswresample/swresample.h>
|
#include <libswresample/swresample.h>
|
||||||
#include <SDL2/SDL.h>
|
#include <SDL2/SDL.h>
|
||||||
|
|
||||||
|
#include "trait/frame_sink.h"
|
||||||
|
#include "util/audiobuf.h"
|
||||||
|
#include "util/average.h"
|
||||||
|
#include "util/thread.h"
|
||||||
|
#include "util/tick.h"
|
||||||
|
|
||||||
struct sc_audio_player {
|
struct sc_audio_player {
|
||||||
struct sc_frame_sink frame_sink;
|
struct sc_frame_sink frame_sink;
|
||||||
|
|
||||||
@ -32,13 +33,9 @@ struct sc_audio_player {
|
|||||||
uint16_t output_buffer;
|
uint16_t output_buffer;
|
||||||
|
|
||||||
// Audio buffer to communicate between the receiver and the SDL audio
|
// Audio buffer to communicate between the receiver and the SDL audio
|
||||||
// callback (protected by SDL_AudioDeviceLock())
|
// callback
|
||||||
struct sc_audiobuf buf;
|
struct sc_audiobuf buf;
|
||||||
|
|
||||||
// The previous empty space in the buffer (only used by the receiver
|
|
||||||
// thread)
|
|
||||||
uint32_t previous_can_write;
|
|
||||||
|
|
||||||
// Resampler (only used from the receiver thread)
|
// Resampler (only used from the receiver thread)
|
||||||
struct SwrContext *swr_ctx;
|
struct SwrContext *swr_ctx;
|
||||||
|
|
||||||
@ -47,7 +44,7 @@ struct sc_audio_player {
|
|||||||
// The number of channels is the same for input and output
|
// The number of channels is the same for input and output
|
||||||
unsigned nb_channels;
|
unsigned nb_channels;
|
||||||
// The number of bytes per sample for a single channel
|
// The number of bytes per sample for a single channel
|
||||||
unsigned out_bytes_per_sample;
|
size_t out_bytes_per_sample;
|
||||||
|
|
||||||
// Target buffer for resampling (only used by the receiver thread)
|
// Target buffer for resampling (only used by the receiver thread)
|
||||||
uint8_t *swr_buf;
|
uint8_t *swr_buf;
|
||||||
@ -61,19 +58,16 @@ struct sc_audio_player {
|
|||||||
uint32_t samples_since_resync;
|
uint32_t samples_since_resync;
|
||||||
|
|
||||||
// Number of silence samples inserted since the last received packet
|
// Number of silence samples inserted since the last received packet
|
||||||
// (protected by SDL_AudioDeviceLock())
|
atomic_uint_least32_t underflow;
|
||||||
uint32_t underflow;
|
|
||||||
|
|
||||||
// Current applied compensation value (only used by the receiver thread)
|
// Current applied compensation value (only used by the receiver thread)
|
||||||
int compensation;
|
int compensation;
|
||||||
|
|
||||||
// Set to true the first time a sample is received (protected by
|
// Set to true the first time a sample is received
|
||||||
// SDL_AudioDeviceLock())
|
atomic_bool received;
|
||||||
bool received;
|
|
||||||
|
|
||||||
// Set to true the first time the SDL callback is called (protected by
|
// Set to true the first time the SDL callback is called
|
||||||
// SDL_AudioDeviceLock())
|
atomic_bool played;
|
||||||
bool played;
|
|
||||||
|
|
||||||
const struct sc_audio_player_callbacks *cbs;
|
const struct sc_audio_player_callbacks *cbs;
|
||||||
void *cbs_userdata;
|
void *cbs_userdata;
|
||||||
|
812
app/src/cli.c
812
app/src/cli.c
File diff suppressed because it is too large
Load Diff
@ -3,7 +3,9 @@
|
|||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
|
#include <libavcodec/version.h>
|
||||||
#include <libavformat/version.h>
|
#include <libavformat/version.h>
|
||||||
|
#include <libavutil/version.h>
|
||||||
#include <SDL2/SDL_version.h>
|
#include <SDL2/SDL_version.h>
|
||||||
|
|
||||||
#ifndef __WIN32
|
#ifndef __WIN32
|
||||||
@ -50,6 +52,15 @@
|
|||||||
# define SCRCPY_LAVU_HAS_CHLAYOUT
|
# define SCRCPY_LAVU_HAS_CHLAYOUT
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// In ffmpeg/doc/APIchanges:
|
||||||
|
// 2023-10-06 - 5432d2aacad - lavc 60.15.100 - avformat.h
|
||||||
|
// Deprecate AVFormatContext.{nb_,}side_data, av_stream_add_side_data(),
|
||||||
|
// av_stream_new_side_data(), and av_stream_get_side_data(). Side data fields
|
||||||
|
// from AVFormatContext.codecpar should be used from now on.
|
||||||
|
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(60, 15, 100)
|
||||||
|
# define SCRCPY_LAVC_HAS_CODECPAR_CODEC_SIDEDATA
|
||||||
|
#endif
|
||||||
|
|
||||||
#if SDL_VERSION_ATLEAST(2, 0, 6)
|
#if SDL_VERSION_ATLEAST(2, 0, 6)
|
||||||
// <https://github.com/libsdl-org/SDL/commit/d7a318de563125e5bb465b1000d6bc9576fbc6fc>
|
// <https://github.com/libsdl-org/SDL/commit/d7a318de563125e5bb465b1000d6bc9576fbc6fc>
|
||||||
# define SCRCPY_SDL_HAS_HINT_TOUCH_MOUSE_EVENTS
|
# define SCRCPY_SDL_HAS_HINT_TOUCH_MOUSE_EVENTS
|
||||||
|
@ -87,7 +87,7 @@ write_position(uint8_t *buf, const struct sc_position *position) {
|
|||||||
|
|
||||||
// write length (4 bytes) + string (non null-terminated)
|
// write length (4 bytes) + string (non null-terminated)
|
||||||
static size_t
|
static size_t
|
||||||
write_string(const char *utf8, size_t max_len, unsigned char *buf) {
|
write_string(const char *utf8, size_t max_len, uint8_t *buf) {
|
||||||
size_t len = sc_str_utf8_truncation_index(utf8, max_len);
|
size_t len = sc_str_utf8_truncation_index(utf8, max_len);
|
||||||
sc_write32be(buf, len);
|
sc_write32be(buf, len);
|
||||||
memcpy(&buf[4], utf8, len);
|
memcpy(&buf[4], utf8, len);
|
||||||
@ -95,7 +95,7 @@ write_string(const char *utf8, size_t max_len, unsigned char *buf) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
size_t
|
size_t
|
||||||
sc_control_msg_serialize(const struct sc_control_msg *msg, unsigned char *buf) {
|
sc_control_msg_serialize(const struct sc_control_msg *msg, uint8_t *buf) {
|
||||||
buf[0] = msg->type;
|
buf[0] = msg->type;
|
||||||
switch (msg->type) {
|
switch (msg->type) {
|
||||||
case SC_CONTROL_MSG_TYPE_INJECT_KEYCODE:
|
case SC_CONTROL_MSG_TYPE_INJECT_KEYCODE:
|
||||||
@ -146,10 +146,22 @@ sc_control_msg_serialize(const struct sc_control_msg *msg, unsigned char *buf) {
|
|||||||
case SC_CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE:
|
case SC_CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE:
|
||||||
buf[1] = msg->set_screen_power_mode.mode;
|
buf[1] = msg->set_screen_power_mode.mode;
|
||||||
return 2;
|
return 2;
|
||||||
|
case SC_CONTROL_MSG_TYPE_UHID_CREATE:
|
||||||
|
sc_write16be(&buf[1], msg->uhid_create.id);
|
||||||
|
sc_write16be(&buf[3], msg->uhid_create.report_desc_size);
|
||||||
|
memcpy(&buf[5], msg->uhid_create.report_desc,
|
||||||
|
msg->uhid_create.report_desc_size);
|
||||||
|
return 5 + msg->uhid_create.report_desc_size;
|
||||||
|
case SC_CONTROL_MSG_TYPE_UHID_INPUT:
|
||||||
|
sc_write16be(&buf[1], msg->uhid_input.id);
|
||||||
|
sc_write16be(&buf[3], msg->uhid_input.size);
|
||||||
|
memcpy(&buf[5], msg->uhid_input.data, msg->uhid_input.size);
|
||||||
|
return 5 + msg->uhid_input.size;
|
||||||
case SC_CONTROL_MSG_TYPE_EXPAND_NOTIFICATION_PANEL:
|
case SC_CONTROL_MSG_TYPE_EXPAND_NOTIFICATION_PANEL:
|
||||||
case SC_CONTROL_MSG_TYPE_EXPAND_SETTINGS_PANEL:
|
case SC_CONTROL_MSG_TYPE_EXPAND_SETTINGS_PANEL:
|
||||||
case SC_CONTROL_MSG_TYPE_COLLAPSE_PANELS:
|
case SC_CONTROL_MSG_TYPE_COLLAPSE_PANELS:
|
||||||
case SC_CONTROL_MSG_TYPE_ROTATE_DEVICE:
|
case SC_CONTROL_MSG_TYPE_ROTATE_DEVICE:
|
||||||
|
case SC_CONTROL_MSG_TYPE_OPEN_HARD_KEYBOARD_SETTINGS:
|
||||||
// no additional data
|
// no additional data
|
||||||
return 1;
|
return 1;
|
||||||
default:
|
default:
|
||||||
@ -242,6 +254,26 @@ sc_control_msg_log(const struct sc_control_msg *msg) {
|
|||||||
case SC_CONTROL_MSG_TYPE_ROTATE_DEVICE:
|
case SC_CONTROL_MSG_TYPE_ROTATE_DEVICE:
|
||||||
LOG_CMSG("rotate device");
|
LOG_CMSG("rotate device");
|
||||||
break;
|
break;
|
||||||
|
case SC_CONTROL_MSG_TYPE_UHID_CREATE:
|
||||||
|
LOG_CMSG("UHID create [%" PRIu16 "] report_desc_size=%" PRIu16,
|
||||||
|
msg->uhid_create.id, msg->uhid_create.report_desc_size);
|
||||||
|
break;
|
||||||
|
case SC_CONTROL_MSG_TYPE_UHID_INPUT: {
|
||||||
|
char *hex = sc_str_to_hex_string(msg->uhid_input.data,
|
||||||
|
msg->uhid_input.size);
|
||||||
|
if (hex) {
|
||||||
|
LOG_CMSG("UHID input [%" PRIu16 "] %s",
|
||||||
|
msg->uhid_input.id, hex);
|
||||||
|
free(hex);
|
||||||
|
} else {
|
||||||
|
LOG_CMSG("UHID input [%" PRIu16 "] size=%" PRIu16,
|
||||||
|
msg->uhid_input.id, msg->uhid_input.size);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case SC_CONTROL_MSG_TYPE_OPEN_HARD_KEYBOARD_SETTINGS:
|
||||||
|
LOG_CMSG("open hard keyboard settings");
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
LOG_CMSG("unknown type: %u", (unsigned) msg->type);
|
LOG_CMSG("unknown type: %u", (unsigned) msg->type);
|
||||||
break;
|
break;
|
||||||
|
@ -10,6 +10,7 @@
|
|||||||
#include "android/input.h"
|
#include "android/input.h"
|
||||||
#include "android/keycodes.h"
|
#include "android/keycodes.h"
|
||||||
#include "coords.h"
|
#include "coords.h"
|
||||||
|
#include "hid/hid_event.h"
|
||||||
|
|
||||||
#define SC_CONTROL_MSG_MAX_SIZE (1 << 18) // 256k
|
#define SC_CONTROL_MSG_MAX_SIZE (1 << 18) // 256k
|
||||||
|
|
||||||
@ -37,6 +38,9 @@ enum sc_control_msg_type {
|
|||||||
SC_CONTROL_MSG_TYPE_SET_CLIPBOARD,
|
SC_CONTROL_MSG_TYPE_SET_CLIPBOARD,
|
||||||
SC_CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE,
|
SC_CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE,
|
||||||
SC_CONTROL_MSG_TYPE_ROTATE_DEVICE,
|
SC_CONTROL_MSG_TYPE_ROTATE_DEVICE,
|
||||||
|
SC_CONTROL_MSG_TYPE_UHID_CREATE,
|
||||||
|
SC_CONTROL_MSG_TYPE_UHID_INPUT,
|
||||||
|
SC_CONTROL_MSG_TYPE_OPEN_HARD_KEYBOARD_SETTINGS,
|
||||||
};
|
};
|
||||||
|
|
||||||
enum sc_screen_power_mode {
|
enum sc_screen_power_mode {
|
||||||
@ -92,13 +96,23 @@ struct sc_control_msg {
|
|||||||
struct {
|
struct {
|
||||||
enum sc_screen_power_mode mode;
|
enum sc_screen_power_mode mode;
|
||||||
} set_screen_power_mode;
|
} set_screen_power_mode;
|
||||||
|
struct {
|
||||||
|
uint16_t id;
|
||||||
|
uint16_t report_desc_size;
|
||||||
|
const uint8_t *report_desc; // pointer to static data
|
||||||
|
} uhid_create;
|
||||||
|
struct {
|
||||||
|
uint16_t id;
|
||||||
|
uint16_t size;
|
||||||
|
uint8_t data[SC_HID_MAX_SIZE];
|
||||||
|
} uhid_input;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
// buf size must be at least CONTROL_MSG_MAX_SIZE
|
// buf size must be at least CONTROL_MSG_MAX_SIZE
|
||||||
// return the number of bytes written
|
// return the number of bytes written
|
||||||
size_t
|
size_t
|
||||||
sc_control_msg_serialize(const struct sc_control_msg *msg, unsigned char *buf);
|
sc_control_msg_serialize(const struct sc_control_msg *msg, uint8_t *buf);
|
||||||
|
|
||||||
void
|
void
|
||||||
sc_control_msg_log(const struct sc_control_msg *msg);
|
sc_control_msg_log(const struct sc_control_msg *msg);
|
||||||
|
@ -6,9 +6,19 @@
|
|||||||
|
|
||||||
#define SC_CONTROL_MSG_QUEUE_MAX 64
|
#define SC_CONTROL_MSG_QUEUE_MAX 64
|
||||||
|
|
||||||
|
static void
|
||||||
|
sc_controller_receiver_on_error(struct sc_receiver *receiver, void *userdata) {
|
||||||
|
(void) receiver;
|
||||||
|
|
||||||
|
struct sc_controller *controller = userdata;
|
||||||
|
// Forward the event to the controller listener
|
||||||
|
controller->cbs->on_error(controller, controller->cbs_userdata);
|
||||||
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
sc_controller_init(struct sc_controller *controller, sc_socket control_socket,
|
sc_controller_init(struct sc_controller *controller, sc_socket control_socket,
|
||||||
struct sc_acksync *acksync) {
|
const struct sc_controller_callbacks *cbs,
|
||||||
|
void *cbs_userdata) {
|
||||||
sc_vecdeque_init(&controller->queue);
|
sc_vecdeque_init(&controller->queue);
|
||||||
|
|
||||||
bool ok = sc_vecdeque_reserve(&controller->queue, SC_CONTROL_MSG_QUEUE_MAX);
|
bool ok = sc_vecdeque_reserve(&controller->queue, SC_CONTROL_MSG_QUEUE_MAX);
|
||||||
@ -16,7 +26,12 @@ sc_controller_init(struct sc_controller *controller, sc_socket control_socket,
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
ok = sc_receiver_init(&controller->receiver, control_socket, acksync);
|
static const struct sc_receiver_callbacks receiver_cbs = {
|
||||||
|
.on_error = sc_controller_receiver_on_error,
|
||||||
|
};
|
||||||
|
|
||||||
|
ok = sc_receiver_init(&controller->receiver, control_socket, &receiver_cbs,
|
||||||
|
controller);
|
||||||
if (!ok) {
|
if (!ok) {
|
||||||
sc_vecdeque_destroy(&controller->queue);
|
sc_vecdeque_destroy(&controller->queue);
|
||||||
return false;
|
return false;
|
||||||
@ -40,9 +55,21 @@ sc_controller_init(struct sc_controller *controller, sc_socket control_socket,
|
|||||||
controller->control_socket = control_socket;
|
controller->control_socket = control_socket;
|
||||||
controller->stopped = false;
|
controller->stopped = false;
|
||||||
|
|
||||||
|
assert(cbs && cbs->on_error);
|
||||||
|
controller->cbs = cbs;
|
||||||
|
controller->cbs_userdata = cbs_userdata;
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
sc_controller_configure(struct sc_controller *controller,
|
||||||
|
struct sc_acksync *acksync,
|
||||||
|
struct sc_uhid_devices *uhid_devices) {
|
||||||
|
controller->receiver.acksync = acksync;
|
||||||
|
controller->receiver.uhid_devices = uhid_devices;
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
sc_controller_destroy(struct sc_controller *controller) {
|
sc_controller_destroy(struct sc_controller *controller) {
|
||||||
sc_cond_destroy(&controller->msg_cond);
|
sc_cond_destroy(&controller->msg_cond);
|
||||||
@ -84,7 +111,7 @@ sc_controller_push_msg(struct sc_controller *controller,
|
|||||||
static bool
|
static bool
|
||||||
process_msg(struct sc_controller *controller,
|
process_msg(struct sc_controller *controller,
|
||||||
const struct sc_control_msg *msg) {
|
const struct sc_control_msg *msg) {
|
||||||
static unsigned char serialized_msg[SC_CONTROL_MSG_MAX_SIZE];
|
static uint8_t serialized_msg[SC_CONTROL_MSG_MAX_SIZE];
|
||||||
size_t length = sc_control_msg_serialize(msg, serialized_msg);
|
size_t length = sc_control_msg_serialize(msg, serialized_msg);
|
||||||
if (!length) {
|
if (!length) {
|
||||||
return false;
|
return false;
|
||||||
@ -118,10 +145,16 @@ run_controller(void *data) {
|
|||||||
sc_control_msg_destroy(&msg);
|
sc_control_msg_destroy(&msg);
|
||||||
if (!ok) {
|
if (!ok) {
|
||||||
LOGD("Could not write msg to socket");
|
LOGD("Could not write msg to socket");
|
||||||
break;
|
goto error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
error:
|
||||||
|
controller->cbs->on_error(controller, controller->cbs_userdata);
|
||||||
|
|
||||||
|
return 1; // ignored
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
|
@ -22,11 +22,24 @@ struct sc_controller {
|
|||||||
bool stopped;
|
bool stopped;
|
||||||
struct sc_control_msg_queue queue;
|
struct sc_control_msg_queue queue;
|
||||||
struct sc_receiver receiver;
|
struct sc_receiver receiver;
|
||||||
|
|
||||||
|
const struct sc_controller_callbacks *cbs;
|
||||||
|
void *cbs_userdata;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct sc_controller_callbacks {
|
||||||
|
void (*on_error)(struct sc_controller *controller, void *userdata);
|
||||||
};
|
};
|
||||||
|
|
||||||
bool
|
bool
|
||||||
sc_controller_init(struct sc_controller *controller, sc_socket control_socket,
|
sc_controller_init(struct sc_controller *controller, sc_socket control_socket,
|
||||||
struct sc_acksync *acksync);
|
const struct sc_controller_callbacks *cbs,
|
||||||
|
void *cbs_userdata);
|
||||||
|
|
||||||
|
void
|
||||||
|
sc_controller_configure(struct sc_controller *controller,
|
||||||
|
struct sc_acksync *acksync,
|
||||||
|
struct sc_uhid_devices *uhid_devices);
|
||||||
|
|
||||||
void
|
void
|
||||||
sc_controller_destroy(struct sc_controller *controller);
|
sc_controller_destroy(struct sc_controller *controller);
|
||||||
|
@ -25,7 +25,8 @@ sc_demuxer_to_avcodec_id(uint32_t codec_id) {
|
|||||||
#define SC_CODEC_ID_H265 UINT32_C(0x68323635) // "h265" in ASCII
|
#define SC_CODEC_ID_H265 UINT32_C(0x68323635) // "h265" in ASCII
|
||||||
#define SC_CODEC_ID_AV1 UINT32_C(0x00617631) // "av1" in ASCII
|
#define SC_CODEC_ID_AV1 UINT32_C(0x00617631) // "av1" in ASCII
|
||||||
#define SC_CODEC_ID_OPUS UINT32_C(0x6f707573) // "opus" in ASCII
|
#define SC_CODEC_ID_OPUS UINT32_C(0x6f707573) // "opus" in ASCII
|
||||||
#define SC_CODEC_ID_AAC UINT32_C(0x00616163) // "aac in ASCII"
|
#define SC_CODEC_ID_AAC UINT32_C(0x00616163) // "aac" in ASCII
|
||||||
|
#define SC_CODEC_ID_FLAC UINT32_C(0x666c6163) // "flac" in ASCII
|
||||||
#define SC_CODEC_ID_RAW UINT32_C(0x00726177) // "raw" in ASCII
|
#define SC_CODEC_ID_RAW UINT32_C(0x00726177) // "raw" in ASCII
|
||||||
switch (codec_id) {
|
switch (codec_id) {
|
||||||
case SC_CODEC_ID_H264:
|
case SC_CODEC_ID_H264:
|
||||||
@ -43,6 +44,8 @@ sc_demuxer_to_avcodec_id(uint32_t codec_id) {
|
|||||||
return AV_CODEC_ID_OPUS;
|
return AV_CODEC_ID_OPUS;
|
||||||
case SC_CODEC_ID_AAC:
|
case SC_CODEC_ID_AAC:
|
||||||
return AV_CODEC_ID_AAC;
|
return AV_CODEC_ID_AAC;
|
||||||
|
case SC_CODEC_ID_FLAC:
|
||||||
|
return AV_CODEC_ID_FLAC;
|
||||||
case SC_CODEC_ID_RAW:
|
case SC_CODEC_ID_RAW:
|
||||||
return AV_CODEC_ID_PCM_S16LE;
|
return AV_CODEC_ID_PCM_S16LE;
|
||||||
default:
|
default:
|
||||||
@ -207,6 +210,11 @@ run_demuxer(void *data) {
|
|||||||
codec_ctx->channels = 2;
|
codec_ctx->channels = 2;
|
||||||
#endif
|
#endif
|
||||||
codec_ctx->sample_rate = 48000;
|
codec_ctx->sample_rate = 48000;
|
||||||
|
|
||||||
|
if (raw_codec_id == SC_CODEC_ID_FLAC) {
|
||||||
|
// The sample_fmt is not set by the FLAC decoder
|
||||||
|
codec_ctx->sample_fmt = AV_SAMPLE_FMT_S16;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (avcodec_open2(codec_ctx, codec, NULL) < 0) {
|
if (avcodec_open2(codec_ctx, codec, NULL) < 0) {
|
||||||
@ -219,8 +227,9 @@ run_demuxer(void *data) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Config packets must be merged with the next non-config packet only for
|
// Config packets must be merged with the next non-config packet only for
|
||||||
// video streams
|
// H.26x
|
||||||
bool must_merge_config_packet = codec->type == AVMEDIA_TYPE_VIDEO;
|
bool must_merge_config_packet = raw_codec_id == SC_CODEC_ID_H264
|
||||||
|
|| raw_codec_id == SC_CODEC_ID_H265;
|
||||||
|
|
||||||
struct sc_packet_merger merger;
|
struct sc_packet_merger merger;
|
||||||
|
|
||||||
|
@ -8,19 +8,22 @@
|
|||||||
#include "util/log.h"
|
#include "util/log.h"
|
||||||
|
|
||||||
ssize_t
|
ssize_t
|
||||||
device_msg_deserialize(const unsigned char *buf, size_t len,
|
sc_device_msg_deserialize(const uint8_t *buf, size_t len,
|
||||||
struct device_msg *msg) {
|
struct sc_device_msg *msg) {
|
||||||
if (len < 5) {
|
if (!len) {
|
||||||
// at least type + empty string length
|
return 0; // no message
|
||||||
return 0; // not available
|
|
||||||
}
|
}
|
||||||
|
|
||||||
msg->type = buf[0];
|
msg->type = buf[0];
|
||||||
switch (msg->type) {
|
switch (msg->type) {
|
||||||
case DEVICE_MSG_TYPE_CLIPBOARD: {
|
case DEVICE_MSG_TYPE_CLIPBOARD: {
|
||||||
|
if (len < 5) {
|
||||||
|
// at least type + empty string length
|
||||||
|
return 0; // no complete message
|
||||||
|
}
|
||||||
size_t clipboard_len = sc_read32be(&buf[1]);
|
size_t clipboard_len = sc_read32be(&buf[1]);
|
||||||
if (clipboard_len > len - 5) {
|
if (clipboard_len > len - 5) {
|
||||||
return 0; // not available
|
return 0; // no complete message
|
||||||
}
|
}
|
||||||
char *text = malloc(clipboard_len + 1);
|
char *text = malloc(clipboard_len + 1);
|
||||||
if (!text) {
|
if (!text) {
|
||||||
@ -36,10 +39,38 @@ device_msg_deserialize(const unsigned char *buf, size_t len,
|
|||||||
return 5 + clipboard_len;
|
return 5 + clipboard_len;
|
||||||
}
|
}
|
||||||
case DEVICE_MSG_TYPE_ACK_CLIPBOARD: {
|
case DEVICE_MSG_TYPE_ACK_CLIPBOARD: {
|
||||||
|
if (len < 9) {
|
||||||
|
return 0; // no complete message
|
||||||
|
}
|
||||||
uint64_t sequence = sc_read64be(&buf[1]);
|
uint64_t sequence = sc_read64be(&buf[1]);
|
||||||
msg->ack_clipboard.sequence = sequence;
|
msg->ack_clipboard.sequence = sequence;
|
||||||
return 9;
|
return 9;
|
||||||
}
|
}
|
||||||
|
case DEVICE_MSG_TYPE_UHID_OUTPUT: {
|
||||||
|
if (len < 5) {
|
||||||
|
// at least id + size
|
||||||
|
return 0; // not available
|
||||||
|
}
|
||||||
|
uint16_t id = sc_read16be(&buf[1]);
|
||||||
|
size_t size = sc_read16be(&buf[3]);
|
||||||
|
if (size < len - 5) {
|
||||||
|
return 0; // not available
|
||||||
|
}
|
||||||
|
uint8_t *data = malloc(size);
|
||||||
|
if (!data) {
|
||||||
|
LOG_OOM();
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
if (size) {
|
||||||
|
memcpy(data, &buf[5], size);
|
||||||
|
}
|
||||||
|
|
||||||
|
msg->uhid_output.id = id;
|
||||||
|
msg->uhid_output.size = size;
|
||||||
|
msg->uhid_output.data = data;
|
||||||
|
|
||||||
|
return 5 + size;
|
||||||
|
}
|
||||||
default:
|
default:
|
||||||
LOGW("Unknown device message type: %d", (int) msg->type);
|
LOGW("Unknown device message type: %d", (int) msg->type);
|
||||||
return -1; // error, we cannot recover
|
return -1; // error, we cannot recover
|
||||||
@ -47,8 +78,16 @@ device_msg_deserialize(const unsigned char *buf, size_t len,
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
device_msg_destroy(struct device_msg *msg) {
|
sc_device_msg_destroy(struct sc_device_msg *msg) {
|
||||||
if (msg->type == DEVICE_MSG_TYPE_CLIPBOARD) {
|
switch (msg->type) {
|
||||||
free(msg->clipboard.text);
|
case DEVICE_MSG_TYPE_CLIPBOARD:
|
||||||
|
free(msg->clipboard.text);
|
||||||
|
break;
|
||||||
|
case DEVICE_MSG_TYPE_UHID_OUTPUT:
|
||||||
|
free(msg->uhid_output.data);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
// nothing to do
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -11,13 +11,14 @@
|
|||||||
// type: 1 byte; length: 4 bytes
|
// type: 1 byte; length: 4 bytes
|
||||||
#define DEVICE_MSG_TEXT_MAX_LENGTH (DEVICE_MSG_MAX_SIZE - 5)
|
#define DEVICE_MSG_TEXT_MAX_LENGTH (DEVICE_MSG_MAX_SIZE - 5)
|
||||||
|
|
||||||
enum device_msg_type {
|
enum sc_device_msg_type {
|
||||||
DEVICE_MSG_TYPE_CLIPBOARD,
|
DEVICE_MSG_TYPE_CLIPBOARD,
|
||||||
DEVICE_MSG_TYPE_ACK_CLIPBOARD,
|
DEVICE_MSG_TYPE_ACK_CLIPBOARD,
|
||||||
|
DEVICE_MSG_TYPE_UHID_OUTPUT,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct device_msg {
|
struct sc_device_msg {
|
||||||
enum device_msg_type type;
|
enum sc_device_msg_type type;
|
||||||
union {
|
union {
|
||||||
struct {
|
struct {
|
||||||
char *text; // owned, to be freed by free()
|
char *text; // owned, to be freed by free()
|
||||||
@ -25,15 +26,20 @@ struct device_msg {
|
|||||||
struct {
|
struct {
|
||||||
uint64_t sequence;
|
uint64_t sequence;
|
||||||
} ack_clipboard;
|
} ack_clipboard;
|
||||||
|
struct {
|
||||||
|
uint16_t id;
|
||||||
|
uint16_t size;
|
||||||
|
uint8_t *data; // owned, to be freed by free()
|
||||||
|
} uhid_output;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
// return the number of bytes consumed (0 for no msg available, -1 on error)
|
// return the number of bytes consumed (0 for no msg available, -1 on error)
|
||||||
ssize_t
|
ssize_t
|
||||||
device_msg_deserialize(const unsigned char *buf, size_t len,
|
sc_device_msg_deserialize(const uint8_t *buf, size_t len,
|
||||||
struct device_msg *msg);
|
struct sc_device_msg *msg);
|
||||||
|
|
||||||
void
|
void
|
||||||
device_msg_destroy(struct device_msg *msg);
|
sc_device_msg_destroy(struct sc_device_msg *msg);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -1,11 +1,34 @@
|
|||||||
#include "display.h"
|
#include "display.h"
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
#include <libavutil/pixfmt.h>
|
||||||
|
|
||||||
#include "util/log.h"
|
#include "util/log.h"
|
||||||
|
|
||||||
|
static bool
|
||||||
|
sc_display_init_novideo_icon(struct sc_display *display,
|
||||||
|
SDL_Surface *icon_novideo) {
|
||||||
|
assert(icon_novideo);
|
||||||
|
|
||||||
|
if (SDL_RenderSetLogicalSize(display->renderer,
|
||||||
|
icon_novideo->w, icon_novideo->h)) {
|
||||||
|
LOGW("Could not set renderer logical size: %s", SDL_GetError());
|
||||||
|
// don't fail
|
||||||
|
}
|
||||||
|
|
||||||
|
display->texture = SDL_CreateTextureFromSurface(display->renderer,
|
||||||
|
icon_novideo);
|
||||||
|
if (!display->texture) {
|
||||||
|
LOGE("Could not create texture: %s", SDL_GetError());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
sc_display_init(struct sc_display *display, SDL_Window *window, bool mipmaps) {
|
sc_display_init(struct sc_display *display, SDL_Window *window,
|
||||||
|
SDL_Surface *icon_novideo, bool mipmaps) {
|
||||||
display->renderer =
|
display->renderer =
|
||||||
SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED);
|
SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED);
|
||||||
if (!display->renderer) {
|
if (!display->renderer) {
|
||||||
@ -59,11 +82,25 @@ sc_display_init(struct sc_display *display, SDL_Window *window, bool mipmaps) {
|
|||||||
LOGI("Trilinear filtering disabled");
|
LOGI("Trilinear filtering disabled");
|
||||||
}
|
}
|
||||||
} else if (mipmaps) {
|
} else if (mipmaps) {
|
||||||
LOGD("Trilinear filtering disabled (not an OpenGL renderer");
|
LOGD("Trilinear filtering disabled (not an OpenGL renderer)");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
display->texture = NULL;
|
||||||
display->pending.flags = 0;
|
display->pending.flags = 0;
|
||||||
display->pending.frame = NULL;
|
display->pending.frame = NULL;
|
||||||
|
display->has_frame = false;
|
||||||
|
|
||||||
|
if (icon_novideo) {
|
||||||
|
// Without video, set a static scrcpy icon as window content
|
||||||
|
bool ok = sc_display_init_novideo_icon(display, icon_novideo);
|
||||||
|
if (!ok) {
|
||||||
|
#ifdef SC_DISPLAY_FORCE_OPENGL_CORE_PROFILE
|
||||||
|
SDL_GL_DeleteContext(display->gl_context);
|
||||||
|
#endif
|
||||||
|
SDL_DestroyRenderer(display->renderer);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -195,9 +232,25 @@ sc_display_set_texture_size(struct sc_display *display, struct sc_size size) {
|
|||||||
return SC_DISPLAY_RESULT_OK;
|
return SC_DISPLAY_RESULT_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static SDL_YUV_CONVERSION_MODE
|
||||||
|
sc_display_to_sdl_color_range(enum AVColorRange color_range) {
|
||||||
|
return color_range == AVCOL_RANGE_JPEG ? SDL_YUV_CONVERSION_JPEG
|
||||||
|
: SDL_YUV_CONVERSION_AUTOMATIC;
|
||||||
|
}
|
||||||
|
|
||||||
static bool
|
static bool
|
||||||
sc_display_update_texture_internal(struct sc_display *display,
|
sc_display_update_texture_internal(struct sc_display *display,
|
||||||
const AVFrame *frame) {
|
const AVFrame *frame) {
|
||||||
|
if (!display->has_frame) {
|
||||||
|
// First frame
|
||||||
|
display->has_frame = true;
|
||||||
|
|
||||||
|
// Configure YUV color range conversion
|
||||||
|
SDL_YUV_CONVERSION_MODE sdl_color_range =
|
||||||
|
sc_display_to_sdl_color_range(frame->color_range);
|
||||||
|
SDL_SetYUVConversionMode(sdl_color_range);
|
||||||
|
}
|
||||||
|
|
||||||
int ret = SDL_UpdateYUVTexture(display->texture, NULL,
|
int ret = SDL_UpdateYUVTexture(display->texture, NULL,
|
||||||
frame->data[0], frame->linesize[0],
|
frame->data[0], frame->linesize[0],
|
||||||
frame->data[1], frame->linesize[1],
|
frame->data[1], frame->linesize[1],
|
||||||
@ -234,7 +287,7 @@ sc_display_update_texture(struct sc_display *display, const AVFrame *frame) {
|
|||||||
|
|
||||||
enum sc_display_result
|
enum sc_display_result
|
||||||
sc_display_render(struct sc_display *display, const SDL_Rect *geometry,
|
sc_display_render(struct sc_display *display, const SDL_Rect *geometry,
|
||||||
unsigned rotation) {
|
enum sc_orientation orientation) {
|
||||||
SDL_RenderClear(display->renderer);
|
SDL_RenderClear(display->renderer);
|
||||||
|
|
||||||
if (display->pending.flags) {
|
if (display->pending.flags) {
|
||||||
@ -247,33 +300,33 @@ sc_display_render(struct sc_display *display, const SDL_Rect *geometry,
|
|||||||
SDL_Renderer *renderer = display->renderer;
|
SDL_Renderer *renderer = display->renderer;
|
||||||
SDL_Texture *texture = display->texture;
|
SDL_Texture *texture = display->texture;
|
||||||
|
|
||||||
if (rotation == 0) {
|
if (orientation == SC_ORIENTATION_0) {
|
||||||
int ret = SDL_RenderCopy(renderer, texture, NULL, geometry);
|
int ret = SDL_RenderCopy(renderer, texture, NULL, geometry);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
LOGE("Could not render texture: %s", SDL_GetError());
|
LOGE("Could not render texture: %s", SDL_GetError());
|
||||||
return SC_DISPLAY_RESULT_ERROR;
|
return SC_DISPLAY_RESULT_ERROR;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// rotation in RenderCopyEx() is clockwise, while screen->rotation is
|
unsigned cw_rotation = sc_orientation_get_rotation(orientation);
|
||||||
// counterclockwise (to be consistent with --lock-video-orientation)
|
|
||||||
int cw_rotation = (4 - rotation) % 4;
|
|
||||||
double angle = 90 * cw_rotation;
|
double angle = 90 * cw_rotation;
|
||||||
|
|
||||||
const SDL_Rect *dstrect = NULL;
|
const SDL_Rect *dstrect = NULL;
|
||||||
SDL_Rect rect;
|
SDL_Rect rect;
|
||||||
if (rotation & 1) {
|
if (sc_orientation_is_swap(orientation)) {
|
||||||
rect.x = geometry->x + (geometry->w - geometry->h) / 2;
|
rect.x = geometry->x + (geometry->w - geometry->h) / 2;
|
||||||
rect.y = geometry->y + (geometry->h - geometry->w) / 2;
|
rect.y = geometry->y + (geometry->h - geometry->w) / 2;
|
||||||
rect.w = geometry->h;
|
rect.w = geometry->h;
|
||||||
rect.h = geometry->w;
|
rect.h = geometry->w;
|
||||||
dstrect = ▭
|
dstrect = ▭
|
||||||
} else {
|
} else {
|
||||||
assert(rotation == 2);
|
|
||||||
dstrect = geometry;
|
dstrect = geometry;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SDL_RendererFlip flip = sc_orientation_is_mirror(orientation)
|
||||||
|
? SDL_FLIP_HORIZONTAL : 0;
|
||||||
|
|
||||||
int ret = SDL_RenderCopyEx(renderer, texture, NULL, dstrect, angle,
|
int ret = SDL_RenderCopyEx(renderer, texture, NULL, dstrect, angle,
|
||||||
NULL, 0);
|
NULL, flip);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
LOGE("Could not render texture: %s", SDL_GetError());
|
LOGE("Could not render texture: %s", SDL_GetError());
|
||||||
return SC_DISPLAY_RESULT_ERROR;
|
return SC_DISPLAY_RESULT_ERROR;
|
||||||
|
@ -9,6 +9,7 @@
|
|||||||
|
|
||||||
#include "coords.h"
|
#include "coords.h"
|
||||||
#include "opengl.h"
|
#include "opengl.h"
|
||||||
|
#include "options.h"
|
||||||
|
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
# define SC_DISPLAY_FORCE_OPENGL_CORE_PROFILE
|
# define SC_DISPLAY_FORCE_OPENGL_CORE_PROFILE
|
||||||
@ -32,6 +33,8 @@ struct sc_display {
|
|||||||
struct sc_size size;
|
struct sc_size size;
|
||||||
AVFrame *frame;
|
AVFrame *frame;
|
||||||
} pending;
|
} pending;
|
||||||
|
|
||||||
|
bool has_frame;
|
||||||
};
|
};
|
||||||
|
|
||||||
enum sc_display_result {
|
enum sc_display_result {
|
||||||
@ -41,7 +44,8 @@ enum sc_display_result {
|
|||||||
};
|
};
|
||||||
|
|
||||||
bool
|
bool
|
||||||
sc_display_init(struct sc_display *display, SDL_Window *window, bool mipmaps);
|
sc_display_init(struct sc_display *display, SDL_Window *window,
|
||||||
|
SDL_Surface *icon_novideo, bool mipmaps);
|
||||||
|
|
||||||
void
|
void
|
||||||
sc_display_destroy(struct sc_display *display);
|
sc_display_destroy(struct sc_display *display);
|
||||||
@ -54,6 +58,6 @@ sc_display_update_texture(struct sc_display *display, const AVFrame *frame);
|
|||||||
|
|
||||||
enum sc_display_result
|
enum sc_display_result
|
||||||
sc_display_render(struct sc_display *display, const SDL_Rect *geometry,
|
sc_display_render(struct sc_display *display, const SDL_Rect *geometry,
|
||||||
unsigned rotation);
|
enum sc_orientation orientation);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -7,3 +7,4 @@
|
|||||||
#define SC_EVENT_RECORDER_ERROR (SDL_USEREVENT + 6)
|
#define SC_EVENT_RECORDER_ERROR (SDL_USEREVENT + 6)
|
||||||
#define SC_EVENT_SCREEN_INIT_SIZE (SDL_USEREVENT + 7)
|
#define SC_EVENT_SCREEN_INIT_SIZE (SDL_USEREVENT + 7)
|
||||||
#define SC_EVENT_TIME_LIMIT_REACHED (SDL_USEREVENT + 8)
|
#define SC_EVENT_TIME_LIMIT_REACHED (SDL_USEREVENT + 8)
|
||||||
|
#define SC_EVENT_CONTROLLER_ERROR (SDL_USEREVENT + 9)
|
||||||
|
15
app/src/hid/hid_event.h
Normal file
15
app/src/hid/hid_event.h
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
#ifndef SC_HID_EVENT_H
|
||||||
|
#define SC_HID_EVENT_H
|
||||||
|
|
||||||
|
#include "common.h"
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
|
||||||
|
#define SC_HID_MAX_SIZE 8
|
||||||
|
|
||||||
|
struct sc_hid_event {
|
||||||
|
uint8_t data[SC_HID_MAX_SIZE];
|
||||||
|
uint8_t size;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
@ -1,39 +1,34 @@
|
|||||||
#include "hid_keyboard.h"
|
#include "hid_keyboard.h"
|
||||||
|
|
||||||
#include <assert.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "input_events.h"
|
|
||||||
#include "util/log.h"
|
#include "util/log.h"
|
||||||
|
|
||||||
/** Downcast key processor to hid_keyboard */
|
#define SC_HID_MOD_NONE 0x00
|
||||||
#define DOWNCAST(KP) container_of(KP, struct sc_hid_keyboard, key_processor)
|
#define SC_HID_MOD_LEFT_CONTROL (1 << 0)
|
||||||
|
#define SC_HID_MOD_LEFT_SHIFT (1 << 1)
|
||||||
|
#define SC_HID_MOD_LEFT_ALT (1 << 2)
|
||||||
|
#define SC_HID_MOD_LEFT_GUI (1 << 3)
|
||||||
|
#define SC_HID_MOD_RIGHT_CONTROL (1 << 4)
|
||||||
|
#define SC_HID_MOD_RIGHT_SHIFT (1 << 5)
|
||||||
|
#define SC_HID_MOD_RIGHT_ALT (1 << 6)
|
||||||
|
#define SC_HID_MOD_RIGHT_GUI (1 << 7)
|
||||||
|
|
||||||
#define HID_KEYBOARD_ACCESSORY_ID 1
|
#define SC_HID_KEYBOARD_INDEX_MODS 0
|
||||||
|
#define SC_HID_KEYBOARD_INDEX_KEYS 2
|
||||||
#define HID_MODIFIER_NONE 0x00
|
|
||||||
#define HID_MODIFIER_LEFT_CONTROL (1 << 0)
|
|
||||||
#define HID_MODIFIER_LEFT_SHIFT (1 << 1)
|
|
||||||
#define HID_MODIFIER_LEFT_ALT (1 << 2)
|
|
||||||
#define HID_MODIFIER_LEFT_GUI (1 << 3)
|
|
||||||
#define HID_MODIFIER_RIGHT_CONTROL (1 << 4)
|
|
||||||
#define HID_MODIFIER_RIGHT_SHIFT (1 << 5)
|
|
||||||
#define HID_MODIFIER_RIGHT_ALT (1 << 6)
|
|
||||||
#define HID_MODIFIER_RIGHT_GUI (1 << 7)
|
|
||||||
|
|
||||||
#define HID_KEYBOARD_INDEX_MODIFIER 0
|
|
||||||
#define HID_KEYBOARD_INDEX_KEYS 2
|
|
||||||
|
|
||||||
// USB HID protocol says 6 keys in an event is the requirement for BIOS
|
// USB HID protocol says 6 keys in an event is the requirement for BIOS
|
||||||
// keyboard support, though OS could support more keys via modifying the report
|
// keyboard support, though OS could support more keys via modifying the report
|
||||||
// desc. 6 should be enough for scrcpy.
|
// desc. 6 should be enough for scrcpy.
|
||||||
#define HID_KEYBOARD_MAX_KEYS 6
|
#define SC_HID_KEYBOARD_MAX_KEYS 6
|
||||||
#define HID_KEYBOARD_EVENT_SIZE (2 + HID_KEYBOARD_MAX_KEYS)
|
#define SC_HID_KEYBOARD_EVENT_SIZE \
|
||||||
|
(SC_HID_KEYBOARD_INDEX_KEYS + SC_HID_KEYBOARD_MAX_KEYS)
|
||||||
|
|
||||||
#define HID_RESERVED 0x00
|
#define SC_HID_RESERVED 0x00
|
||||||
#define HID_ERROR_ROLL_OVER 0x01
|
#define SC_HID_ERROR_ROLL_OVER 0x01
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* For HID over AOAv2, only report descriptor is needed.
|
* For HID, only report descriptor is needed.
|
||||||
*
|
*
|
||||||
* The specification is available here:
|
* The specification is available here:
|
||||||
* <https://www.usb.org/sites/default/files/hid1_11.pdf>
|
* <https://www.usb.org/sites/default/files/hid1_11.pdf>
|
||||||
@ -52,7 +47,7 @@
|
|||||||
*
|
*
|
||||||
* (change vid:pid' to your device's vendor ID and product ID).
|
* (change vid:pid' to your device's vendor ID and product ID).
|
||||||
*/
|
*/
|
||||||
static const unsigned char keyboard_report_desc[] = {
|
const uint8_t SC_HID_KEYBOARD_REPORT_DESC[] = {
|
||||||
// Usage Page (Generic Desktop)
|
// Usage Page (Generic Desktop)
|
||||||
0x05, 0x01,
|
0x05, 0x01,
|
||||||
// Usage (Keyboard)
|
// Usage (Keyboard)
|
||||||
@ -118,7 +113,7 @@ static const unsigned char keyboard_report_desc[] = {
|
|||||||
// Report Size (8)
|
// Report Size (8)
|
||||||
0x75, 0x08,
|
0x75, 0x08,
|
||||||
// Report Count (6)
|
// Report Count (6)
|
||||||
0x95, HID_KEYBOARD_MAX_KEYS,
|
0x95, SC_HID_KEYBOARD_MAX_KEYS,
|
||||||
// Input (Data, Array): Keys
|
// Input (Data, Array): Keys
|
||||||
0x81, 0x00,
|
0x81, 0x00,
|
||||||
|
|
||||||
@ -126,6 +121,9 @@ static const unsigned char keyboard_report_desc[] = {
|
|||||||
0xC0
|
0xC0
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const size_t SC_HID_KEYBOARD_REPORT_DESC_LEN =
|
||||||
|
sizeof(SC_HID_KEYBOARD_REPORT_DESC);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A keyboard HID event is 8 bytes long:
|
* A keyboard HID event is 8 bytes long:
|
||||||
*
|
*
|
||||||
@ -200,51 +198,50 @@ static const unsigned char keyboard_report_desc[] = {
|
|||||||
* +---------------+
|
* +---------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static unsigned char
|
static void
|
||||||
sdl_keymod_to_hid_modifiers(uint16_t mod) {
|
sc_hid_keyboard_event_init(struct sc_hid_event *hid_event) {
|
||||||
unsigned char modifiers = HID_MODIFIER_NONE;
|
hid_event->size = SC_HID_KEYBOARD_EVENT_SIZE;
|
||||||
if (mod & SC_MOD_LCTRL) {
|
|
||||||
modifiers |= HID_MODIFIER_LEFT_CONTROL;
|
uint8_t *data = hid_event->data;
|
||||||
}
|
|
||||||
if (mod & SC_MOD_LSHIFT) {
|
data[SC_HID_KEYBOARD_INDEX_MODS] = SC_HID_MOD_NONE;
|
||||||
modifiers |= HID_MODIFIER_LEFT_SHIFT;
|
data[1] = SC_HID_RESERVED;
|
||||||
}
|
memset(&data[SC_HID_KEYBOARD_INDEX_KEYS], 0, SC_HID_KEYBOARD_MAX_KEYS);
|
||||||
if (mod & SC_MOD_LALT) {
|
|
||||||
modifiers |= HID_MODIFIER_LEFT_ALT;
|
|
||||||
}
|
|
||||||
if (mod & SC_MOD_LGUI) {
|
|
||||||
modifiers |= HID_MODIFIER_LEFT_GUI;
|
|
||||||
}
|
|
||||||
if (mod & SC_MOD_RCTRL) {
|
|
||||||
modifiers |= HID_MODIFIER_RIGHT_CONTROL;
|
|
||||||
}
|
|
||||||
if (mod & SC_MOD_RSHIFT) {
|
|
||||||
modifiers |= HID_MODIFIER_RIGHT_SHIFT;
|
|
||||||
}
|
|
||||||
if (mod & SC_MOD_RALT) {
|
|
||||||
modifiers |= HID_MODIFIER_RIGHT_ALT;
|
|
||||||
}
|
|
||||||
if (mod & SC_MOD_RGUI) {
|
|
||||||
modifiers |= HID_MODIFIER_RIGHT_GUI;
|
|
||||||
}
|
|
||||||
return modifiers;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool
|
static uint16_t
|
||||||
sc_hid_keyboard_event_init(struct sc_hid_event *hid_event) {
|
sc_hid_mod_from_sdl_keymod(uint16_t mod) {
|
||||||
unsigned char *buffer = malloc(HID_KEYBOARD_EVENT_SIZE);
|
uint16_t mods = SC_HID_MOD_NONE;
|
||||||
if (!buffer) {
|
if (mod & SC_MOD_LCTRL) {
|
||||||
LOG_OOM();
|
mods |= SC_HID_MOD_LEFT_CONTROL;
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
if (mod & SC_MOD_LSHIFT) {
|
||||||
|
mods |= SC_HID_MOD_LEFT_SHIFT;
|
||||||
|
}
|
||||||
|
if (mod & SC_MOD_LALT) {
|
||||||
|
mods |= SC_HID_MOD_LEFT_ALT;
|
||||||
|
}
|
||||||
|
if (mod & SC_MOD_LGUI) {
|
||||||
|
mods |= SC_HID_MOD_LEFT_GUI;
|
||||||
|
}
|
||||||
|
if (mod & SC_MOD_RCTRL) {
|
||||||
|
mods |= SC_HID_MOD_RIGHT_CONTROL;
|
||||||
|
}
|
||||||
|
if (mod & SC_MOD_RSHIFT) {
|
||||||
|
mods |= SC_HID_MOD_RIGHT_SHIFT;
|
||||||
|
}
|
||||||
|
if (mod & SC_MOD_RALT) {
|
||||||
|
mods |= SC_HID_MOD_RIGHT_ALT;
|
||||||
|
}
|
||||||
|
if (mod & SC_MOD_RGUI) {
|
||||||
|
mods |= SC_HID_MOD_RIGHT_GUI;
|
||||||
|
}
|
||||||
|
return mods;
|
||||||
|
}
|
||||||
|
|
||||||
buffer[HID_KEYBOARD_INDEX_MODIFIER] = HID_MODIFIER_NONE;
|
void
|
||||||
buffer[1] = HID_RESERVED;
|
sc_hid_keyboard_init(struct sc_hid_keyboard *hid) {
|
||||||
memset(&buffer[HID_KEYBOARD_INDEX_KEYS], 0, HID_KEYBOARD_MAX_KEYS);
|
memset(hid->keys, false, SC_HID_KEYBOARD_KEYS);
|
||||||
|
|
||||||
sc_hid_event_init(hid_event, HID_KEYBOARD_ACCESSORY_ID, buffer,
|
|
||||||
HID_KEYBOARD_EVENT_SIZE);
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline bool
|
static inline bool
|
||||||
@ -252,10 +249,10 @@ scancode_is_modifier(enum sc_scancode scancode) {
|
|||||||
return scancode >= SC_SCANCODE_LCTRL && scancode <= SC_SCANCODE_RGUI;
|
return scancode >= SC_SCANCODE_LCTRL && scancode <= SC_SCANCODE_RGUI;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool
|
bool
|
||||||
convert_hid_keyboard_event(struct sc_hid_keyboard *kb,
|
sc_hid_keyboard_event_from_key(struct sc_hid_keyboard *hid,
|
||||||
struct sc_hid_event *hid_event,
|
struct sc_hid_event *hid_event,
|
||||||
const struct sc_key_event *event) {
|
const struct sc_key_event *event) {
|
||||||
enum sc_scancode scancode = event->scancode;
|
enum sc_scancode scancode = event->scancode;
|
||||||
assert(scancode >= 0);
|
assert(scancode >= 0);
|
||||||
|
|
||||||
@ -267,39 +264,37 @@ convert_hid_keyboard_event(struct sc_hid_keyboard *kb,
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!sc_hid_keyboard_event_init(hid_event)) {
|
sc_hid_keyboard_event_init(hid_event);
|
||||||
LOGW("Could not initialize HID keyboard event");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
unsigned char modifiers = sdl_keymod_to_hid_modifiers(event->mods_state);
|
uint16_t mods = sc_hid_mod_from_sdl_keymod(event->mods_state);
|
||||||
|
|
||||||
if (scancode < SC_HID_KEYBOARD_KEYS) {
|
if (scancode < SC_HID_KEYBOARD_KEYS) {
|
||||||
// Pressed is true and released is false
|
// Pressed is true and released is false
|
||||||
kb->keys[scancode] = (event->action == SC_ACTION_DOWN);
|
hid->keys[scancode] = (event->action == SC_ACTION_DOWN);
|
||||||
LOGV("keys[%02x] = %s", scancode,
|
LOGV("keys[%02x] = %s", scancode,
|
||||||
kb->keys[scancode] ? "true" : "false");
|
hid->keys[scancode] ? "true" : "false");
|
||||||
}
|
}
|
||||||
|
|
||||||
hid_event->buffer[HID_KEYBOARD_INDEX_MODIFIER] = modifiers;
|
hid_event->data[SC_HID_KEYBOARD_INDEX_MODS] = mods;
|
||||||
|
|
||||||
unsigned char *keys_buffer = &hid_event->buffer[HID_KEYBOARD_INDEX_KEYS];
|
uint8_t *keys_data = &hid_event->data[SC_HID_KEYBOARD_INDEX_KEYS];
|
||||||
// Re-calculate pressed keys every time
|
// Re-calculate pressed keys every time
|
||||||
int keys_pressed_count = 0;
|
int keys_pressed_count = 0;
|
||||||
for (int i = 0; i < SC_HID_KEYBOARD_KEYS; ++i) {
|
for (int i = 0; i < SC_HID_KEYBOARD_KEYS; ++i) {
|
||||||
if (kb->keys[i]) {
|
if (hid->keys[i]) {
|
||||||
// USB HID protocol says that if keys exceeds report count, a
|
// USB HID protocol says that if keys exceeds report count, a
|
||||||
// phantom state should be reported
|
// phantom state should be reported
|
||||||
if (keys_pressed_count >= HID_KEYBOARD_MAX_KEYS) {
|
if (keys_pressed_count >= SC_HID_KEYBOARD_MAX_KEYS) {
|
||||||
// Phantom state:
|
// Phantom state:
|
||||||
// - Modifiers
|
// - Modifiers
|
||||||
// - Reserved
|
// - Reserved
|
||||||
// - ErrorRollOver * HID_MAX_KEYS
|
// - ErrorRollOver * HID_MAX_KEYS
|
||||||
memset(keys_buffer, HID_ERROR_ROLL_OVER, HID_KEYBOARD_MAX_KEYS);
|
memset(keys_data, SC_HID_ERROR_ROLL_OVER,
|
||||||
|
SC_HID_KEYBOARD_MAX_KEYS);
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
|
||||||
keys_buffer[keys_pressed_count] = i;
|
keys_data[keys_pressed_count] = i;
|
||||||
++keys_pressed_count;
|
++keys_pressed_count;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -307,124 +302,32 @@ convert_hid_keyboard_event(struct sc_hid_keyboard *kb,
|
|||||||
end:
|
end:
|
||||||
LOGV("hid keyboard: key %-4s scancode=%02x (%u) mod=%02x",
|
LOGV("hid keyboard: key %-4s scancode=%02x (%u) mod=%02x",
|
||||||
event->action == SC_ACTION_DOWN ? "down" : "up", event->scancode,
|
event->action == SC_ACTION_DOWN ? "down" : "up", event->scancode,
|
||||||
event->scancode, modifiers);
|
event->scancode, mods);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool
|
||||||
static bool
|
sc_hid_keyboard_event_from_mods(struct sc_hid_event *event,
|
||||||
push_mod_lock_state(struct sc_hid_keyboard *kb, uint16_t mods_state) {
|
uint16_t mods_state) {
|
||||||
bool capslock = mods_state & SC_MOD_CAPS;
|
bool capslock = mods_state & SC_MOD_CAPS;
|
||||||
bool numlock = mods_state & SC_MOD_NUM;
|
bool numlock = mods_state & SC_MOD_NUM;
|
||||||
if (!capslock && !numlock) {
|
if (!capslock && !numlock) {
|
||||||
// Nothing to do
|
// Nothing to do
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
struct sc_hid_event hid_event;
|
|
||||||
if (!sc_hid_keyboard_event_init(&hid_event)) {
|
|
||||||
LOGW("Could not initialize HID keyboard event");
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sc_hid_keyboard_event_init(event);
|
||||||
|
|
||||||
unsigned i = 0;
|
unsigned i = 0;
|
||||||
if (capslock) {
|
if (capslock) {
|
||||||
hid_event.buffer[HID_KEYBOARD_INDEX_KEYS + i] = SC_SCANCODE_CAPSLOCK;
|
event->data[SC_HID_KEYBOARD_INDEX_KEYS + i] = SC_SCANCODE_CAPSLOCK;
|
||||||
++i;
|
++i;
|
||||||
}
|
}
|
||||||
if (numlock) {
|
if (numlock) {
|
||||||
hid_event.buffer[HID_KEYBOARD_INDEX_KEYS + i] = SC_SCANCODE_NUMLOCK;
|
event->data[SC_HID_KEYBOARD_INDEX_KEYS + i] = SC_SCANCODE_NUMLOCK;
|
||||||
++i;
|
++i;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!sc_aoa_push_hid_event(kb->aoa, &hid_event)) {
|
|
||||||
sc_hid_event_destroy(&hid_event);
|
|
||||||
LOGW("Could not request HID event (mod lock state)");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
LOGD("HID keyboard state synchronized");
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
sc_key_processor_process_key(struct sc_key_processor *kp,
|
|
||||||
const struct sc_key_event *event,
|
|
||||||
uint64_t ack_to_wait) {
|
|
||||||
if (event->repeat) {
|
|
||||||
// In USB HID protocol, key repeat is handled by the host (Android), so
|
|
||||||
// just ignore key repeat here.
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
struct sc_hid_keyboard *kb = DOWNCAST(kp);
|
|
||||||
|
|
||||||
struct sc_hid_event hid_event;
|
|
||||||
// Not all keys are supported, just ignore unsupported keys
|
|
||||||
if (convert_hid_keyboard_event(kb, &hid_event, event)) {
|
|
||||||
if (!kb->mod_lock_synchronized) {
|
|
||||||
// Inject CAPSLOCK and/or NUMLOCK if necessary to synchronize
|
|
||||||
// keyboard state
|
|
||||||
if (push_mod_lock_state(kb, event->mods_state)) {
|
|
||||||
kb->mod_lock_synchronized = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ack_to_wait) {
|
|
||||||
// Ctrl+v is pressed, so clipboard synchronization has been
|
|
||||||
// requested. Wait until clipboard synchronization is acknowledged
|
|
||||||
// by the server, otherwise it could paste the old clipboard
|
|
||||||
// content.
|
|
||||||
hid_event.ack_to_wait = ack_to_wait;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!sc_aoa_push_hid_event(kb->aoa, &hid_event)) {
|
|
||||||
sc_hid_event_destroy(&hid_event);
|
|
||||||
LOGW("Could not request HID event (key)");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
bool
|
|
||||||
sc_hid_keyboard_init(struct sc_hid_keyboard *kb, struct sc_aoa *aoa) {
|
|
||||||
kb->aoa = aoa;
|
|
||||||
|
|
||||||
bool ok = sc_aoa_setup_hid(aoa, HID_KEYBOARD_ACCESSORY_ID,
|
|
||||||
keyboard_report_desc,
|
|
||||||
ARRAY_LEN(keyboard_report_desc));
|
|
||||||
if (!ok) {
|
|
||||||
LOGW("Register HID keyboard failed");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Reset all states
|
|
||||||
memset(kb->keys, false, SC_HID_KEYBOARD_KEYS);
|
|
||||||
|
|
||||||
kb->mod_lock_synchronized = false;
|
|
||||||
|
|
||||||
static const struct sc_key_processor_ops ops = {
|
|
||||||
.process_key = sc_key_processor_process_key,
|
|
||||||
// Never forward text input via HID (all the keys are injected
|
|
||||||
// separately)
|
|
||||||
.process_text = NULL,
|
|
||||||
};
|
|
||||||
|
|
||||||
// Clipboard synchronization is requested over the control socket, while HID
|
|
||||||
// events are sent over AOA, so it must wait for clipboard synchronization
|
|
||||||
// to be acknowledged by the device before injecting Ctrl+v.
|
|
||||||
kb->key_processor.async_paste = true;
|
|
||||||
kb->key_processor.ops = &ops;
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
sc_hid_keyboard_destroy(struct sc_hid_keyboard *kb) {
|
|
||||||
// Unregister HID keyboard so the soft keyboard shows again on Android
|
|
||||||
bool ok = sc_aoa_unregister_hid(kb->aoa, HID_KEYBOARD_ACCESSORY_ID);
|
|
||||||
if (!ok) {
|
|
||||||
LOGW("Could not unregister HID keyboard");
|
|
||||||
}
|
|
||||||
}
|
|
@ -5,8 +5,8 @@
|
|||||||
|
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
|
|
||||||
#include "aoa_hid.h"
|
#include "hid/hid_event.h"
|
||||||
#include "trait/key_processor.h"
|
#include "input_events.h"
|
||||||
|
|
||||||
// See "SDL2/SDL_scancode.h".
|
// See "SDL2/SDL_scancode.h".
|
||||||
// Maybe SDL_Keycode is used by most people, but SDL_Scancode is taken from USB
|
// Maybe SDL_Keycode is used by most people, but SDL_Scancode is taken from USB
|
||||||
@ -14,6 +14,9 @@
|
|||||||
// 0x65 is Application, typically AT-101 Keyboard ends here.
|
// 0x65 is Application, typically AT-101 Keyboard ends here.
|
||||||
#define SC_HID_KEYBOARD_KEYS 0x66
|
#define SC_HID_KEYBOARD_KEYS 0x66
|
||||||
|
|
||||||
|
extern const uint8_t SC_HID_KEYBOARD_REPORT_DESC[];
|
||||||
|
extern const size_t SC_HID_KEYBOARD_REPORT_DESC_LEN;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* HID keyboard events are sequence-based, every time keyboard state changes
|
* HID keyboard events are sequence-based, every time keyboard state changes
|
||||||
* it sends an array of currently pressed keys, the host is responsible for
|
* it sends an array of currently pressed keys, the host is responsible for
|
||||||
@ -27,18 +30,19 @@
|
|||||||
* phantom state.
|
* phantom state.
|
||||||
*/
|
*/
|
||||||
struct sc_hid_keyboard {
|
struct sc_hid_keyboard {
|
||||||
struct sc_key_processor key_processor; // key processor trait
|
|
||||||
|
|
||||||
struct sc_aoa *aoa;
|
|
||||||
bool keys[SC_HID_KEYBOARD_KEYS];
|
bool keys[SC_HID_KEYBOARD_KEYS];
|
||||||
|
|
||||||
bool mod_lock_synchronized;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
bool
|
|
||||||
sc_hid_keyboard_init(struct sc_hid_keyboard *kb, struct sc_aoa *aoa);
|
|
||||||
|
|
||||||
void
|
void
|
||||||
sc_hid_keyboard_destroy(struct sc_hid_keyboard *kb);
|
sc_hid_keyboard_init(struct sc_hid_keyboard *hid);
|
||||||
|
|
||||||
|
bool
|
||||||
|
sc_hid_keyboard_event_from_key(struct sc_hid_keyboard *hid,
|
||||||
|
struct sc_hid_event *hid_event,
|
||||||
|
const struct sc_key_event *event);
|
||||||
|
|
||||||
|
bool
|
||||||
|
sc_hid_keyboard_event_from_mods(struct sc_hid_event *event,
|
||||||
|
uint16_t mods_state);
|
||||||
|
|
||||||
#endif
|
#endif
|
192
app/src/hid/hid_mouse.c
Normal file
192
app/src/hid/hid_mouse.c
Normal file
@ -0,0 +1,192 @@
|
|||||||
|
#include "hid_mouse.h"
|
||||||
|
|
||||||
|
// 1 byte for buttons + padding, 1 byte for X position, 1 byte for Y position,
|
||||||
|
// 1 byte for wheel motion
|
||||||
|
#define HID_MOUSE_EVENT_SIZE 4
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Mouse descriptor from the specification:
|
||||||
|
* <https://www.usb.org/sites/default/files/hid1_11.pdf>
|
||||||
|
*
|
||||||
|
* Appendix E (p71): §E.10 Report Descriptor (Mouse)
|
||||||
|
*
|
||||||
|
* The usage tags (like Wheel) are listed in "HID Usage Tables":
|
||||||
|
* <https://www.usb.org/sites/default/files/documents/hut1_12v2.pdf>
|
||||||
|
* §4 Generic Desktop Page (0x01) (p26)
|
||||||
|
*/
|
||||||
|
const uint8_t SC_HID_MOUSE_REPORT_DESC[] = {
|
||||||
|
// Usage Page (Generic Desktop)
|
||||||
|
0x05, 0x01,
|
||||||
|
// Usage (Mouse)
|
||||||
|
0x09, 0x02,
|
||||||
|
|
||||||
|
// Collection (Application)
|
||||||
|
0xA1, 0x01,
|
||||||
|
|
||||||
|
// Usage (Pointer)
|
||||||
|
0x09, 0x01,
|
||||||
|
|
||||||
|
// Collection (Physical)
|
||||||
|
0xA1, 0x00,
|
||||||
|
|
||||||
|
// Usage Page (Buttons)
|
||||||
|
0x05, 0x09,
|
||||||
|
|
||||||
|
// Usage Minimum (1)
|
||||||
|
0x19, 0x01,
|
||||||
|
// Usage Maximum (5)
|
||||||
|
0x29, 0x05,
|
||||||
|
// Logical Minimum (0)
|
||||||
|
0x15, 0x00,
|
||||||
|
// Logical Maximum (1)
|
||||||
|
0x25, 0x01,
|
||||||
|
// Report Count (5)
|
||||||
|
0x95, 0x05,
|
||||||
|
// Report Size (1)
|
||||||
|
0x75, 0x01,
|
||||||
|
// Input (Data, Variable, Absolute): 5 buttons bits
|
||||||
|
0x81, 0x02,
|
||||||
|
|
||||||
|
// Report Count (1)
|
||||||
|
0x95, 0x01,
|
||||||
|
// Report Size (3)
|
||||||
|
0x75, 0x03,
|
||||||
|
// Input (Constant): 3 bits padding
|
||||||
|
0x81, 0x01,
|
||||||
|
|
||||||
|
// Usage Page (Generic Desktop)
|
||||||
|
0x05, 0x01,
|
||||||
|
// Usage (X)
|
||||||
|
0x09, 0x30,
|
||||||
|
// Usage (Y)
|
||||||
|
0x09, 0x31,
|
||||||
|
// Usage (Wheel)
|
||||||
|
0x09, 0x38,
|
||||||
|
// Local Minimum (-127)
|
||||||
|
0x15, 0x81,
|
||||||
|
// Local Maximum (127)
|
||||||
|
0x25, 0x7F,
|
||||||
|
// Report Size (8)
|
||||||
|
0x75, 0x08,
|
||||||
|
// Report Count (3)
|
||||||
|
0x95, 0x03,
|
||||||
|
// Input (Data, Variable, Relative): 3 position bytes (X, Y, Wheel)
|
||||||
|
0x81, 0x06,
|
||||||
|
|
||||||
|
// End Collection
|
||||||
|
0xC0,
|
||||||
|
|
||||||
|
// End Collection
|
||||||
|
0xC0,
|
||||||
|
};
|
||||||
|
|
||||||
|
const size_t SC_HID_MOUSE_REPORT_DESC_LEN =
|
||||||
|
sizeof(SC_HID_MOUSE_REPORT_DESC);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A mouse HID event is 4 bytes long:
|
||||||
|
*
|
||||||
|
* - byte 0: buttons state
|
||||||
|
* - byte 1: relative x motion (signed byte from -127 to 127)
|
||||||
|
* - byte 2: relative y motion (signed byte from -127 to 127)
|
||||||
|
* - byte 3: wheel motion (-1, 0 or 1)
|
||||||
|
*
|
||||||
|
* 7 6 5 4 3 2 1 0
|
||||||
|
* +---------------+
|
||||||
|
* byte 0: |0 0 0 . . . . .| buttons state
|
||||||
|
* +---------------+
|
||||||
|
* ^ ^ ^ ^ ^
|
||||||
|
* | | | | `- left button
|
||||||
|
* | | | `--- right button
|
||||||
|
* | | `----- middle button
|
||||||
|
* | `------- button 4
|
||||||
|
* `--------- button 5
|
||||||
|
*
|
||||||
|
* +---------------+
|
||||||
|
* byte 1: |. . . . . . . .| relative x motion
|
||||||
|
* +---------------+
|
||||||
|
* byte 2: |. . . . . . . .| relative y motion
|
||||||
|
* +---------------+
|
||||||
|
* byte 3: |. . . . . . . .| wheel motion
|
||||||
|
* +---------------+
|
||||||
|
*
|
||||||
|
* As an example, here is the report for a motion of (x=5, y=-4) with left
|
||||||
|
* button pressed:
|
||||||
|
*
|
||||||
|
* +---------------+
|
||||||
|
* |0 0 0 0 0 0 0 1| left button pressed
|
||||||
|
* +---------------+
|
||||||
|
* |0 0 0 0 0 1 0 1| horizontal motion (x = 5)
|
||||||
|
* +---------------+
|
||||||
|
* |1 1 1 1 1 1 0 0| relative y motion (y = -4)
|
||||||
|
* +---------------+
|
||||||
|
* |0 0 0 0 0 0 0 0| wheel motion
|
||||||
|
* +---------------+
|
||||||
|
*/
|
||||||
|
|
||||||
|
static void
|
||||||
|
sc_hid_mouse_event_init(struct sc_hid_event *hid_event) {
|
||||||
|
hid_event->size = HID_MOUSE_EVENT_SIZE;
|
||||||
|
// Leave hid_event->data uninitialized, it will be fully initialized by
|
||||||
|
// callers
|
||||||
|
}
|
||||||
|
|
||||||
|
static uint8_t
|
||||||
|
sc_hid_buttons_from_buttons_state(uint8_t buttons_state) {
|
||||||
|
uint8_t c = 0;
|
||||||
|
if (buttons_state & SC_MOUSE_BUTTON_LEFT) {
|
||||||
|
c |= 1 << 0;
|
||||||
|
}
|
||||||
|
if (buttons_state & SC_MOUSE_BUTTON_RIGHT) {
|
||||||
|
c |= 1 << 1;
|
||||||
|
}
|
||||||
|
if (buttons_state & SC_MOUSE_BUTTON_MIDDLE) {
|
||||||
|
c |= 1 << 2;
|
||||||
|
}
|
||||||
|
if (buttons_state & SC_MOUSE_BUTTON_X1) {
|
||||||
|
c |= 1 << 3;
|
||||||
|
}
|
||||||
|
if (buttons_state & SC_MOUSE_BUTTON_X2) {
|
||||||
|
c |= 1 << 4;
|
||||||
|
}
|
||||||
|
return c;
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
sc_hid_mouse_event_from_motion(struct sc_hid_event *hid_event,
|
||||||
|
const struct sc_mouse_motion_event *event) {
|
||||||
|
sc_hid_mouse_event_init(hid_event);
|
||||||
|
|
||||||
|
uint8_t *data = hid_event->data;
|
||||||
|
data[0] = sc_hid_buttons_from_buttons_state(event->buttons_state);
|
||||||
|
data[1] = CLAMP(event->xrel, -127, 127);
|
||||||
|
data[2] = CLAMP(event->yrel, -127, 127);
|
||||||
|
data[3] = 0; // wheel coordinates only used for scrolling
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
sc_hid_mouse_event_from_click(struct sc_hid_event *hid_event,
|
||||||
|
const struct sc_mouse_click_event *event) {
|
||||||
|
sc_hid_mouse_event_init(hid_event);
|
||||||
|
|
||||||
|
uint8_t *data = hid_event->data;
|
||||||
|
data[0] = sc_hid_buttons_from_buttons_state(event->buttons_state);
|
||||||
|
data[1] = 0; // no x motion
|
||||||
|
data[2] = 0; // no y motion
|
||||||
|
data[3] = 0; // wheel coordinates only used for scrolling
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
sc_hid_mouse_event_from_scroll(struct sc_hid_event *hid_event,
|
||||||
|
const struct sc_mouse_scroll_event *event) {
|
||||||
|
sc_hid_mouse_event_init(hid_event);
|
||||||
|
|
||||||
|
uint8_t *data = hid_event->data;
|
||||||
|
data[0] = 0; // buttons state irrelevant (and unknown)
|
||||||
|
data[1] = 0; // no x motion
|
||||||
|
data[2] = 0; // no y motion
|
||||||
|
// In practice, vscroll is always -1, 0 or 1, but in theory other values
|
||||||
|
// are possible
|
||||||
|
data[3] = CLAMP(event->vscroll, -127, 127);
|
||||||
|
// Horizontal scrolling ignored
|
||||||
|
}
|
26
app/src/hid/hid_mouse.h
Normal file
26
app/src/hid/hid_mouse.h
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
#ifndef SC_HID_MOUSE_H
|
||||||
|
#define SC_HID_MOUSE_H
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include "common.h"
|
||||||
|
|
||||||
|
#include <stdbool.h>
|
||||||
|
|
||||||
|
#include "hid/hid_event.h"
|
||||||
|
#include "input_events.h"
|
||||||
|
|
||||||
|
extern const uint8_t SC_HID_MOUSE_REPORT_DESC[];
|
||||||
|
extern const size_t SC_HID_MOUSE_REPORT_DESC_LEN;
|
||||||
|
|
||||||
|
void
|
||||||
|
sc_hid_mouse_event_from_motion(struct sc_hid_event *hid_event,
|
||||||
|
const struct sc_mouse_motion_event *event);
|
||||||
|
|
||||||
|
void
|
||||||
|
sc_hid_mouse_event_from_click(struct sc_hid_event *hid_event,
|
||||||
|
const struct sc_mouse_click_event *event);
|
||||||
|
|
||||||
|
void
|
||||||
|
sc_hid_mouse_event_from_scroll(struct sc_hid_event *hid_event,
|
||||||
|
const struct sc_mouse_scroll_event *event);
|
@ -271,7 +271,7 @@ error:
|
|||||||
}
|
}
|
||||||
|
|
||||||
SDL_Surface *
|
SDL_Surface *
|
||||||
scrcpy_icon_load() {
|
scrcpy_icon_load(void) {
|
||||||
char *icon_path = get_icon_path();
|
char *icon_path = get_icon_path();
|
||||||
if (!icon_path) {
|
if (!icon_path) {
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -52,8 +52,11 @@ is_shortcut_mod(struct sc_input_manager *im, uint16_t sdl_mod) {
|
|||||||
void
|
void
|
||||||
sc_input_manager_init(struct sc_input_manager *im,
|
sc_input_manager_init(struct sc_input_manager *im,
|
||||||
const struct sc_input_manager_params *params) {
|
const struct sc_input_manager_params *params) {
|
||||||
assert(!params->controller || (params->kp && params->kp->ops));
|
// A key/mouse processor may not be present if there is no controller
|
||||||
assert(!params->controller || (params->mp && params->mp->ops));
|
assert((!params->kp && !params->mp) || params->controller);
|
||||||
|
// A processor must have ops initialized
|
||||||
|
assert(!params->kp || params->kp->ops);
|
||||||
|
assert(!params->mp || params->mp->ops);
|
||||||
|
|
||||||
im->controller = params->controller;
|
im->controller = params->controller;
|
||||||
im->fp = params->fp;
|
im->fp = params->fp;
|
||||||
@ -76,6 +79,8 @@ sc_input_manager_init(struct sc_input_manager *im,
|
|||||||
im->sdl_shortcut_mods.count = shortcut_mods->count;
|
im->sdl_shortcut_mods.count = shortcut_mods->count;
|
||||||
|
|
||||||
im->vfinger_down = false;
|
im->vfinger_down = false;
|
||||||
|
im->vfinger_invert_x = false;
|
||||||
|
im->vfinger_invert_y = false;
|
||||||
|
|
||||||
im->last_keycode = SDLK_UNKNOWN;
|
im->last_keycode = SDLK_UNKNOWN;
|
||||||
im->last_mod = 0;
|
im->last_mod = 0;
|
||||||
@ -85,8 +90,10 @@ sc_input_manager_init(struct sc_input_manager *im,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
send_keycode(struct sc_controller *controller, enum android_keycode keycode,
|
send_keycode(struct sc_input_manager *im, enum android_keycode keycode,
|
||||||
enum sc_action action, const char *name) {
|
enum sc_action action, const char *name) {
|
||||||
|
assert(im->controller && im->kp);
|
||||||
|
|
||||||
// send DOWN event
|
// send DOWN event
|
||||||
struct sc_control_msg msg;
|
struct sc_control_msg msg;
|
||||||
msg.type = SC_CONTROL_MSG_TYPE_INJECT_KEYCODE;
|
msg.type = SC_CONTROL_MSG_TYPE_INJECT_KEYCODE;
|
||||||
@ -97,100 +104,109 @@ send_keycode(struct sc_controller *controller, enum android_keycode keycode,
|
|||||||
msg.inject_keycode.metastate = 0;
|
msg.inject_keycode.metastate = 0;
|
||||||
msg.inject_keycode.repeat = 0;
|
msg.inject_keycode.repeat = 0;
|
||||||
|
|
||||||
if (!sc_controller_push_msg(controller, &msg)) {
|
if (!sc_controller_push_msg(im->controller, &msg)) {
|
||||||
LOGW("Could not request 'inject %s'", name);
|
LOGW("Could not request 'inject %s'", name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void
|
static inline void
|
||||||
action_home(struct sc_controller *controller, enum sc_action action) {
|
action_home(struct sc_input_manager *im, enum sc_action action) {
|
||||||
send_keycode(controller, AKEYCODE_HOME, action, "HOME");
|
send_keycode(im, AKEYCODE_HOME, action, "HOME");
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void
|
static inline void
|
||||||
action_back(struct sc_controller *controller, enum sc_action action) {
|
action_back(struct sc_input_manager *im, enum sc_action action) {
|
||||||
send_keycode(controller, AKEYCODE_BACK, action, "BACK");
|
send_keycode(im, AKEYCODE_BACK, action, "BACK");
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void
|
static inline void
|
||||||
action_app_switch(struct sc_controller *controller, enum sc_action action) {
|
action_app_switch(struct sc_input_manager *im, enum sc_action action) {
|
||||||
send_keycode(controller, AKEYCODE_APP_SWITCH, action, "APP_SWITCH");
|
send_keycode(im, AKEYCODE_APP_SWITCH, action, "APP_SWITCH");
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void
|
static inline void
|
||||||
action_power(struct sc_controller *controller, enum sc_action action) {
|
action_power(struct sc_input_manager *im, enum sc_action action) {
|
||||||
send_keycode(controller, AKEYCODE_POWER, action, "POWER");
|
send_keycode(im, AKEYCODE_POWER, action, "POWER");
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void
|
static inline void
|
||||||
action_volume_up(struct sc_controller *controller, enum sc_action action) {
|
action_volume_up(struct sc_input_manager *im, enum sc_action action) {
|
||||||
send_keycode(controller, AKEYCODE_VOLUME_UP, action, "VOLUME_UP");
|
send_keycode(im, AKEYCODE_VOLUME_UP, action, "VOLUME_UP");
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void
|
static inline void
|
||||||
action_volume_down(struct sc_controller *controller, enum sc_action action) {
|
action_volume_down(struct sc_input_manager *im, enum sc_action action) {
|
||||||
send_keycode(controller, AKEYCODE_VOLUME_DOWN, action, "VOLUME_DOWN");
|
send_keycode(im, AKEYCODE_VOLUME_DOWN, action, "VOLUME_DOWN");
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void
|
static inline void
|
||||||
action_menu(struct sc_controller *controller, enum sc_action action) {
|
action_menu(struct sc_input_manager *im, enum sc_action action) {
|
||||||
send_keycode(controller, AKEYCODE_MENU, action, "MENU");
|
send_keycode(im, AKEYCODE_MENU, action, "MENU");
|
||||||
}
|
}
|
||||||
|
|
||||||
// turn the screen on if it was off, press BACK otherwise
|
// turn the screen on if it was off, press BACK otherwise
|
||||||
// If the screen is off, it is turned on only on ACTION_DOWN
|
// If the screen is off, it is turned on only on ACTION_DOWN
|
||||||
static void
|
static void
|
||||||
press_back_or_turn_screen_on(struct sc_controller *controller,
|
press_back_or_turn_screen_on(struct sc_input_manager *im,
|
||||||
enum sc_action action) {
|
enum sc_action action) {
|
||||||
|
assert(im->controller && im->kp);
|
||||||
|
|
||||||
struct sc_control_msg msg;
|
struct sc_control_msg msg;
|
||||||
msg.type = SC_CONTROL_MSG_TYPE_BACK_OR_SCREEN_ON;
|
msg.type = SC_CONTROL_MSG_TYPE_BACK_OR_SCREEN_ON;
|
||||||
msg.back_or_screen_on.action = action == SC_ACTION_DOWN
|
msg.back_or_screen_on.action = action == SC_ACTION_DOWN
|
||||||
? AKEY_EVENT_ACTION_DOWN
|
? AKEY_EVENT_ACTION_DOWN
|
||||||
: AKEY_EVENT_ACTION_UP;
|
: AKEY_EVENT_ACTION_UP;
|
||||||
|
|
||||||
if (!sc_controller_push_msg(controller, &msg)) {
|
if (!sc_controller_push_msg(im->controller, &msg)) {
|
||||||
LOGW("Could not request 'press back or turn screen on'");
|
LOGW("Could not request 'press back or turn screen on'");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
expand_notification_panel(struct sc_controller *controller) {
|
expand_notification_panel(struct sc_input_manager *im) {
|
||||||
|
assert(im->controller);
|
||||||
|
|
||||||
struct sc_control_msg msg;
|
struct sc_control_msg msg;
|
||||||
msg.type = SC_CONTROL_MSG_TYPE_EXPAND_NOTIFICATION_PANEL;
|
msg.type = SC_CONTROL_MSG_TYPE_EXPAND_NOTIFICATION_PANEL;
|
||||||
|
|
||||||
if (!sc_controller_push_msg(controller, &msg)) {
|
if (!sc_controller_push_msg(im->controller, &msg)) {
|
||||||
LOGW("Could not request 'expand notification panel'");
|
LOGW("Could not request 'expand notification panel'");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
expand_settings_panel(struct sc_controller *controller) {
|
expand_settings_panel(struct sc_input_manager *im) {
|
||||||
|
assert(im->controller);
|
||||||
|
|
||||||
struct sc_control_msg msg;
|
struct sc_control_msg msg;
|
||||||
msg.type = SC_CONTROL_MSG_TYPE_EXPAND_SETTINGS_PANEL;
|
msg.type = SC_CONTROL_MSG_TYPE_EXPAND_SETTINGS_PANEL;
|
||||||
|
|
||||||
if (!sc_controller_push_msg(controller, &msg)) {
|
if (!sc_controller_push_msg(im->controller, &msg)) {
|
||||||
LOGW("Could not request 'expand settings panel'");
|
LOGW("Could not request 'expand settings panel'");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
collapse_panels(struct sc_controller *controller) {
|
collapse_panels(struct sc_input_manager *im) {
|
||||||
|
assert(im->controller);
|
||||||
|
|
||||||
struct sc_control_msg msg;
|
struct sc_control_msg msg;
|
||||||
msg.type = SC_CONTROL_MSG_TYPE_COLLAPSE_PANELS;
|
msg.type = SC_CONTROL_MSG_TYPE_COLLAPSE_PANELS;
|
||||||
|
|
||||||
if (!sc_controller_push_msg(controller, &msg)) {
|
if (!sc_controller_push_msg(im->controller, &msg)) {
|
||||||
LOGW("Could not request 'collapse notification panel'");
|
LOGW("Could not request 'collapse notification panel'");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool
|
static bool
|
||||||
get_device_clipboard(struct sc_controller *controller,
|
get_device_clipboard(struct sc_input_manager *im, enum sc_copy_key copy_key) {
|
||||||
enum sc_copy_key copy_key) {
|
assert(im->controller && im->kp);
|
||||||
|
|
||||||
struct sc_control_msg msg;
|
struct sc_control_msg msg;
|
||||||
msg.type = SC_CONTROL_MSG_TYPE_GET_CLIPBOARD;
|
msg.type = SC_CONTROL_MSG_TYPE_GET_CLIPBOARD;
|
||||||
msg.get_clipboard.copy_key = copy_key;
|
msg.get_clipboard.copy_key = copy_key;
|
||||||
|
|
||||||
if (!sc_controller_push_msg(controller, &msg)) {
|
if (!sc_controller_push_msg(im->controller, &msg)) {
|
||||||
LOGW("Could not request 'get device clipboard'");
|
LOGW("Could not request 'get device clipboard'");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -199,8 +215,10 @@ get_device_clipboard(struct sc_controller *controller,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static bool
|
static bool
|
||||||
set_device_clipboard(struct sc_controller *controller, bool paste,
|
set_device_clipboard(struct sc_input_manager *im, bool paste,
|
||||||
uint64_t sequence) {
|
uint64_t sequence) {
|
||||||
|
assert(im->controller && im->kp);
|
||||||
|
|
||||||
char *text = SDL_GetClipboardText();
|
char *text = SDL_GetClipboardText();
|
||||||
if (!text) {
|
if (!text) {
|
||||||
LOGW("Could not get clipboard text: %s", SDL_GetError());
|
LOGW("Could not get clipboard text: %s", SDL_GetError());
|
||||||
@ -220,7 +238,7 @@ set_device_clipboard(struct sc_controller *controller, bool paste,
|
|||||||
msg.set_clipboard.text = text_dup;
|
msg.set_clipboard.text = text_dup;
|
||||||
msg.set_clipboard.paste = paste;
|
msg.set_clipboard.paste = paste;
|
||||||
|
|
||||||
if (!sc_controller_push_msg(controller, &msg)) {
|
if (!sc_controller_push_msg(im->controller, &msg)) {
|
||||||
free(text_dup);
|
free(text_dup);
|
||||||
LOGW("Could not request 'set device clipboard'");
|
LOGW("Could not request 'set device clipboard'");
|
||||||
return false;
|
return false;
|
||||||
@ -230,19 +248,23 @@ set_device_clipboard(struct sc_controller *controller, bool paste,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
set_screen_power_mode(struct sc_controller *controller,
|
set_screen_power_mode(struct sc_input_manager *im,
|
||||||
enum sc_screen_power_mode mode) {
|
enum sc_screen_power_mode mode) {
|
||||||
|
assert(im->controller);
|
||||||
|
|
||||||
struct sc_control_msg msg;
|
struct sc_control_msg msg;
|
||||||
msg.type = SC_CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE;
|
msg.type = SC_CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE;
|
||||||
msg.set_screen_power_mode.mode = mode;
|
msg.set_screen_power_mode.mode = mode;
|
||||||
|
|
||||||
if (!sc_controller_push_msg(controller, &msg)) {
|
if (!sc_controller_push_msg(im->controller, &msg)) {
|
||||||
LOGW("Could not request 'set screen power mode'");
|
LOGW("Could not request 'set screen power mode'");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
switch_fps_counter_state(struct sc_fps_counter *fps_counter) {
|
switch_fps_counter_state(struct sc_input_manager *im) {
|
||||||
|
struct sc_fps_counter *fps_counter = &im->screen->fps_counter;
|
||||||
|
|
||||||
// the started state can only be written from the current thread, so there
|
// the started state can only be written from the current thread, so there
|
||||||
// is no ToCToU issue
|
// is no ToCToU issue
|
||||||
if (sc_fps_counter_is_started(fps_counter)) {
|
if (sc_fps_counter_is_started(fps_counter)) {
|
||||||
@ -254,7 +276,9 @@ switch_fps_counter_state(struct sc_fps_counter *fps_counter) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
clipboard_paste(struct sc_controller *controller) {
|
clipboard_paste(struct sc_input_manager *im) {
|
||||||
|
assert(im->controller && im->kp);
|
||||||
|
|
||||||
char *text = SDL_GetClipboardText();
|
char *text = SDL_GetClipboardText();
|
||||||
if (!text) {
|
if (!text) {
|
||||||
LOGW("Could not get clipboard text: %s", SDL_GetError());
|
LOGW("Could not get clipboard text: %s", SDL_GetError());
|
||||||
@ -276,32 +300,43 @@ clipboard_paste(struct sc_controller *controller) {
|
|||||||
struct sc_control_msg msg;
|
struct sc_control_msg msg;
|
||||||
msg.type = SC_CONTROL_MSG_TYPE_INJECT_TEXT;
|
msg.type = SC_CONTROL_MSG_TYPE_INJECT_TEXT;
|
||||||
msg.inject_text.text = text_dup;
|
msg.inject_text.text = text_dup;
|
||||||
if (!sc_controller_push_msg(controller, &msg)) {
|
if (!sc_controller_push_msg(im->controller, &msg)) {
|
||||||
free(text_dup);
|
free(text_dup);
|
||||||
LOGW("Could not request 'paste clipboard'");
|
LOGW("Could not request 'paste clipboard'");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
rotate_device(struct sc_controller *controller) {
|
rotate_device(struct sc_input_manager *im) {
|
||||||
|
assert(im->controller);
|
||||||
|
|
||||||
struct sc_control_msg msg;
|
struct sc_control_msg msg;
|
||||||
msg.type = SC_CONTROL_MSG_TYPE_ROTATE_DEVICE;
|
msg.type = SC_CONTROL_MSG_TYPE_ROTATE_DEVICE;
|
||||||
|
|
||||||
if (!sc_controller_push_msg(controller, &msg)) {
|
if (!sc_controller_push_msg(im->controller, &msg)) {
|
||||||
LOGW("Could not request device rotation");
|
LOGW("Could not request device rotation");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
rotate_client_left(struct sc_screen *screen) {
|
open_hard_keyboard_settings(struct sc_input_manager *im) {
|
||||||
unsigned new_rotation = (screen->rotation + 1) % 4;
|
assert(im->controller);
|
||||||
sc_screen_set_rotation(screen, new_rotation);
|
|
||||||
|
struct sc_control_msg msg;
|
||||||
|
msg.type = SC_CONTROL_MSG_TYPE_OPEN_HARD_KEYBOARD_SETTINGS;
|
||||||
|
|
||||||
|
if (!sc_controller_push_msg(im->controller, &msg)) {
|
||||||
|
LOGW("Could not request opening hard keyboard settings");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
rotate_client_right(struct sc_screen *screen) {
|
apply_orientation_transform(struct sc_input_manager *im,
|
||||||
unsigned new_rotation = (screen->rotation + 3) % 4;
|
enum sc_orientation transform) {
|
||||||
sc_screen_set_rotation(screen, new_rotation);
|
struct sc_screen *screen = im->screen;
|
||||||
|
enum sc_orientation new_orientation =
|
||||||
|
sc_orientation_apply(screen->orientation, transform);
|
||||||
|
sc_screen_set_orientation(screen, new_orientation);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -351,9 +386,14 @@ simulate_virtual_finger(struct sc_input_manager *im,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static struct sc_point
|
static struct sc_point
|
||||||
inverse_point(struct sc_point point, struct sc_size size) {
|
inverse_point(struct sc_point point, struct sc_size size,
|
||||||
point.x = size.width - point.x;
|
bool invert_x, bool invert_y) {
|
||||||
point.y = size.height - point.y;
|
if (invert_x) {
|
||||||
|
point.x = size.width - point.x;
|
||||||
|
}
|
||||||
|
if (invert_y) {
|
||||||
|
point.y = size.height - point.y;
|
||||||
|
}
|
||||||
return point;
|
return point;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -361,7 +401,9 @@ static void
|
|||||||
sc_input_manager_process_key(struct sc_input_manager *im,
|
sc_input_manager_process_key(struct sc_input_manager *im,
|
||||||
const SDL_KeyboardEvent *event) {
|
const SDL_KeyboardEvent *event) {
|
||||||
// controller is NULL if --no-control is requested
|
// controller is NULL if --no-control is requested
|
||||||
struct sc_controller *controller = im->controller;
|
bool control = im->controller;
|
||||||
|
bool paused = im->screen->paused;
|
||||||
|
bool video = im->screen->video;
|
||||||
|
|
||||||
SDL_Keycode keycode = event->keysym.sym;
|
SDL_Keycode keycode = event->keysym.sym;
|
||||||
uint16_t mod = event->keysym.mod;
|
uint16_t mod = event->keysym.mod;
|
||||||
@ -387,118 +429,151 @@ sc_input_manager_process_key(struct sc_input_manager *im,
|
|||||||
enum sc_action action = down ? SC_ACTION_DOWN : SC_ACTION_UP;
|
enum sc_action action = down ? SC_ACTION_DOWN : SC_ACTION_UP;
|
||||||
switch (keycode) {
|
switch (keycode) {
|
||||||
case SDLK_h:
|
case SDLK_h:
|
||||||
if (controller && !shift && !repeat) {
|
if (im->kp && !shift && !repeat && !paused) {
|
||||||
action_home(controller, action);
|
action_home(im, action);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
case SDLK_b: // fall-through
|
case SDLK_b: // fall-through
|
||||||
case SDLK_BACKSPACE:
|
case SDLK_BACKSPACE:
|
||||||
if (controller && !shift && !repeat) {
|
if (im->kp && !shift && !repeat && !paused) {
|
||||||
action_back(controller, action);
|
action_back(im, action);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
case SDLK_s:
|
case SDLK_s:
|
||||||
if (controller && !shift && !repeat) {
|
if (im->kp && !shift && !repeat && !paused) {
|
||||||
action_app_switch(controller, action);
|
action_app_switch(im, action);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
case SDLK_m:
|
case SDLK_m:
|
||||||
if (controller && !shift && !repeat) {
|
if (im->kp && !shift && !repeat && !paused) {
|
||||||
action_menu(controller, action);
|
action_menu(im, action);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
case SDLK_p:
|
case SDLK_p:
|
||||||
if (controller && !shift && !repeat) {
|
if (im->kp && !shift && !repeat && !paused) {
|
||||||
action_power(controller, action);
|
action_power(im, action);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
case SDLK_o:
|
case SDLK_o:
|
||||||
if (controller && !repeat && down) {
|
if (control && !repeat && down && !paused) {
|
||||||
enum sc_screen_power_mode mode = shift
|
enum sc_screen_power_mode mode = shift
|
||||||
? SC_SCREEN_POWER_MODE_NORMAL
|
? SC_SCREEN_POWER_MODE_NORMAL
|
||||||
: SC_SCREEN_POWER_MODE_OFF;
|
: SC_SCREEN_POWER_MODE_OFF;
|
||||||
set_screen_power_mode(controller, mode);
|
set_screen_power_mode(im, mode);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
case SDLK_z:
|
||||||
|
if (video && down && !repeat) {
|
||||||
|
sc_screen_set_paused(im->screen, !shift);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
case SDLK_DOWN:
|
case SDLK_DOWN:
|
||||||
if (controller && !shift) {
|
if (shift) {
|
||||||
|
if (video && !repeat && down) {
|
||||||
|
apply_orientation_transform(im,
|
||||||
|
SC_ORIENTATION_FLIP_180);
|
||||||
|
}
|
||||||
|
} else if (im->kp && !paused) {
|
||||||
// forward repeated events
|
// forward repeated events
|
||||||
action_volume_down(controller, action);
|
action_volume_down(im, action);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
case SDLK_UP:
|
case SDLK_UP:
|
||||||
if (controller && !shift) {
|
if (shift) {
|
||||||
|
if (video && !repeat && down) {
|
||||||
|
apply_orientation_transform(im,
|
||||||
|
SC_ORIENTATION_FLIP_180);
|
||||||
|
}
|
||||||
|
} else if (im->kp && !paused) {
|
||||||
// forward repeated events
|
// forward repeated events
|
||||||
action_volume_up(controller, action);
|
action_volume_up(im, action);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
case SDLK_LEFT:
|
case SDLK_LEFT:
|
||||||
if (!shift && !repeat && down) {
|
if (video && !repeat && down) {
|
||||||
rotate_client_left(im->screen);
|
if (shift) {
|
||||||
|
apply_orientation_transform(im,
|
||||||
|
SC_ORIENTATION_FLIP_0);
|
||||||
|
} else {
|
||||||
|
apply_orientation_transform(im,
|
||||||
|
SC_ORIENTATION_270);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
case SDLK_RIGHT:
|
case SDLK_RIGHT:
|
||||||
if (!shift && !repeat && down) {
|
if (video && !repeat && down) {
|
||||||
rotate_client_right(im->screen);
|
if (shift) {
|
||||||
|
apply_orientation_transform(im,
|
||||||
|
SC_ORIENTATION_FLIP_0);
|
||||||
|
} else {
|
||||||
|
apply_orientation_transform(im,
|
||||||
|
SC_ORIENTATION_90);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
case SDLK_c:
|
case SDLK_c:
|
||||||
if (controller && !shift && !repeat && down) {
|
if (im->kp && !shift && !repeat && down && !paused) {
|
||||||
get_device_clipboard(controller, SC_COPY_KEY_COPY);
|
get_device_clipboard(im, SC_COPY_KEY_COPY);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
case SDLK_x:
|
case SDLK_x:
|
||||||
if (controller && !shift && !repeat && down) {
|
if (im->kp && !shift && !repeat && down && !paused) {
|
||||||
get_device_clipboard(controller, SC_COPY_KEY_CUT);
|
get_device_clipboard(im, SC_COPY_KEY_CUT);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
case SDLK_v:
|
case SDLK_v:
|
||||||
if (controller && !repeat && down) {
|
if (im->kp && !repeat && down && !paused) {
|
||||||
if (shift || im->legacy_paste) {
|
if (shift || im->legacy_paste) {
|
||||||
// inject the text as input events
|
// inject the text as input events
|
||||||
clipboard_paste(controller);
|
clipboard_paste(im);
|
||||||
} else {
|
} else {
|
||||||
// store the text in the device clipboard and paste,
|
// store the text in the device clipboard and paste,
|
||||||
// without requesting an acknowledgment
|
// without requesting an acknowledgment
|
||||||
set_device_clipboard(controller, true,
|
set_device_clipboard(im, true, SC_SEQUENCE_INVALID);
|
||||||
SC_SEQUENCE_INVALID);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
case SDLK_f:
|
case SDLK_f:
|
||||||
if (!shift && !repeat && down) {
|
if (video && !shift && !repeat && down) {
|
||||||
sc_screen_switch_fullscreen(im->screen);
|
sc_screen_switch_fullscreen(im->screen);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
case SDLK_w:
|
case SDLK_w:
|
||||||
if (!shift && !repeat && down) {
|
if (video && !shift && !repeat && down) {
|
||||||
sc_screen_resize_to_fit(im->screen);
|
sc_screen_resize_to_fit(im->screen);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
case SDLK_g:
|
case SDLK_g:
|
||||||
if (!shift && !repeat && down) {
|
if (video && !shift && !repeat && down) {
|
||||||
sc_screen_resize_to_pixel_perfect(im->screen);
|
sc_screen_resize_to_pixel_perfect(im->screen);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
case SDLK_i:
|
case SDLK_i:
|
||||||
if (!shift && !repeat && down) {
|
if (video && !shift && !repeat && down) {
|
||||||
switch_fps_counter_state(&im->screen->fps_counter);
|
switch_fps_counter_state(im);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
case SDLK_n:
|
case SDLK_n:
|
||||||
if (controller && !repeat && down) {
|
if (control && !repeat && down && !paused) {
|
||||||
if (shift) {
|
if (shift) {
|
||||||
collapse_panels(controller);
|
collapse_panels(im);
|
||||||
} else if (im->key_repeat == 0) {
|
} else if (im->key_repeat == 0) {
|
||||||
expand_notification_panel(controller);
|
expand_notification_panel(im);
|
||||||
} else {
|
} else {
|
||||||
expand_settings_panel(controller);
|
expand_settings_panel(im);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
case SDLK_r:
|
case SDLK_r:
|
||||||
if (controller && !shift && !repeat && down) {
|
if (control && !shift && !repeat && down && !paused) {
|
||||||
rotate_device(controller);
|
rotate_device(im);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
case SDLK_k:
|
||||||
|
if (control && !shift && !repeat && down && !paused
|
||||||
|
&& im->kp && im->kp->hid) {
|
||||||
|
// Only if the current keyboard is hid
|
||||||
|
open_hard_keyboard_settings(im);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -506,7 +581,7 @@ sc_input_manager_process_key(struct sc_input_manager *im,
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!controller) {
|
if (!im->kp || paused) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -515,7 +590,7 @@ sc_input_manager_process_key(struct sc_input_manager *im,
|
|||||||
if (im->clipboard_autosync && is_ctrl_v) {
|
if (im->clipboard_autosync && is_ctrl_v) {
|
||||||
if (im->legacy_paste) {
|
if (im->legacy_paste) {
|
||||||
// inject the text as input events
|
// inject the text as input events
|
||||||
clipboard_paste(controller);
|
clipboard_paste(im);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -525,7 +600,7 @@ sc_input_manager_process_key(struct sc_input_manager *im,
|
|||||||
|
|
||||||
// Synchronize the computer clipboard to the device clipboard before
|
// Synchronize the computer clipboard to the device clipboard before
|
||||||
// sending Ctrl+v, to allow seamless copy-paste.
|
// sending Ctrl+v, to allow seamless copy-paste.
|
||||||
bool ok = set_device_clipboard(controller, false, sequence);
|
bool ok = set_device_clipboard(im, false, sequence);
|
||||||
if (!ok) {
|
if (!ok) {
|
||||||
LOGW("Clipboard could not be synchronized, Ctrl+v not injected");
|
LOGW("Clipboard could not be synchronized, Ctrl+v not injected");
|
||||||
return;
|
return;
|
||||||
@ -551,22 +626,33 @@ sc_input_manager_process_key(struct sc_input_manager *im,
|
|||||||
im->kp->ops->process_key(im->kp, &evt, ack_to_wait);
|
im->kp->ops->process_key(im->kp, &evt, ack_to_wait);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static struct sc_position
|
||||||
|
sc_input_manager_get_position(struct sc_input_manager *im, int32_t x,
|
||||||
|
int32_t y) {
|
||||||
|
if (im->mp->relative_mode) {
|
||||||
|
// No absolute position
|
||||||
|
return (struct sc_position) {
|
||||||
|
.screen_size = {0, 0},
|
||||||
|
.point = {0, 0},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
return (struct sc_position) {
|
||||||
|
.screen_size = im->screen->frame_size,
|
||||||
|
.point = sc_screen_convert_window_to_frame_coords(im->screen, x, y),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
sc_input_manager_process_mouse_motion(struct sc_input_manager *im,
|
sc_input_manager_process_mouse_motion(struct sc_input_manager *im,
|
||||||
const SDL_MouseMotionEvent *event) {
|
const SDL_MouseMotionEvent *event) {
|
||||||
|
|
||||||
if (event->which == SDL_TOUCH_MOUSEID) {
|
if (event->which == SDL_TOUCH_MOUSEID) {
|
||||||
// simulated from touch events, so it's a duplicate
|
// simulated from touch events, so it's a duplicate
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct sc_mouse_motion_event evt = {
|
struct sc_mouse_motion_event evt = {
|
||||||
.position = {
|
.position = sc_input_manager_get_position(im, event->x, event->y),
|
||||||
.screen_size = im->screen->frame_size,
|
|
||||||
.point = sc_screen_convert_window_to_frame_coords(im->screen,
|
|
||||||
event->x,
|
|
||||||
event->y),
|
|
||||||
},
|
|
||||||
.pointer_id = im->forward_all_clicks ? POINTER_ID_MOUSE
|
.pointer_id = im->forward_all_clicks ? POINTER_ID_MOUSE
|
||||||
: POINTER_ID_GENERIC_FINGER,
|
: POINTER_ID_GENERIC_FINGER,
|
||||||
.xrel = event->xrel,
|
.xrel = event->xrel,
|
||||||
@ -587,7 +673,9 @@ sc_input_manager_process_mouse_motion(struct sc_input_manager *im,
|
|||||||
struct sc_point mouse =
|
struct sc_point mouse =
|
||||||
sc_screen_convert_window_to_frame_coords(im->screen, event->x,
|
sc_screen_convert_window_to_frame_coords(im->screen, event->x,
|
||||||
event->y);
|
event->y);
|
||||||
struct sc_point vfinger = inverse_point(mouse, im->screen->frame_size);
|
struct sc_point vfinger = inverse_point(mouse, im->screen->frame_size,
|
||||||
|
im->vfinger_invert_x,
|
||||||
|
im->vfinger_invert_y);
|
||||||
simulate_virtual_finger(im, AMOTION_EVENT_ACTION_MOVE, vfinger);
|
simulate_virtual_finger(im, AMOTION_EVENT_ACTION_MOVE, vfinger);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -625,42 +713,43 @@ sc_input_manager_process_touch(struct sc_input_manager *im,
|
|||||||
static void
|
static void
|
||||||
sc_input_manager_process_mouse_button(struct sc_input_manager *im,
|
sc_input_manager_process_mouse_button(struct sc_input_manager *im,
|
||||||
const SDL_MouseButtonEvent *event) {
|
const SDL_MouseButtonEvent *event) {
|
||||||
struct sc_controller *controller = im->controller;
|
|
||||||
|
|
||||||
if (event->which == SDL_TOUCH_MOUSEID) {
|
if (event->which == SDL_TOUCH_MOUSEID) {
|
||||||
// simulated from touch events, so it's a duplicate
|
// simulated from touch events, so it's a duplicate
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool control = im->controller;
|
||||||
|
bool paused = im->screen->paused;
|
||||||
bool down = event->type == SDL_MOUSEBUTTONDOWN;
|
bool down = event->type == SDL_MOUSEBUTTONDOWN;
|
||||||
if (!im->forward_all_clicks) {
|
if (!im->forward_all_clicks) {
|
||||||
if (controller) {
|
if (control && !paused) {
|
||||||
enum sc_action action = down ? SC_ACTION_DOWN : SC_ACTION_UP;
|
enum sc_action action = down ? SC_ACTION_DOWN : SC_ACTION_UP;
|
||||||
|
|
||||||
if (event->button == SDL_BUTTON_X1) {
|
if (im->kp && event->button == SDL_BUTTON_X1) {
|
||||||
action_app_switch(controller, action);
|
action_app_switch(im, action);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (event->button == SDL_BUTTON_X2 && down) {
|
if (event->button == SDL_BUTTON_X2 && down) {
|
||||||
if (event->clicks < 2) {
|
if (event->clicks < 2) {
|
||||||
expand_notification_panel(controller);
|
expand_notification_panel(im);
|
||||||
} else {
|
} else {
|
||||||
expand_settings_panel(controller);
|
expand_settings_panel(im);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (event->button == SDL_BUTTON_RIGHT) {
|
if (im->kp && event->button == SDL_BUTTON_RIGHT) {
|
||||||
press_back_or_turn_screen_on(controller, action);
|
press_back_or_turn_screen_on(im, action);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (event->button == SDL_BUTTON_MIDDLE) {
|
if (im->kp && event->button == SDL_BUTTON_MIDDLE) {
|
||||||
action_home(controller, action);
|
action_home(im, action);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// double-click on black borders resize to fit the device screen
|
// double-click on black borders resize to fit the device screen
|
||||||
if (event->button == SDL_BUTTON_LEFT && event->clicks == 2) {
|
bool video = im->screen->video;
|
||||||
|
if (video && event->button == SDL_BUTTON_LEFT && event->clicks == 2) {
|
||||||
int32_t x = event->x;
|
int32_t x = event->x;
|
||||||
int32_t y = event->y;
|
int32_t y = event->y;
|
||||||
sc_screen_hidpi_scale_coords(im->screen, &x, &y);
|
sc_screen_hidpi_scale_coords(im->screen, &x, &y);
|
||||||
@ -677,19 +766,14 @@ sc_input_manager_process_mouse_button(struct sc_input_manager *im,
|
|||||||
// otherwise, send the click event to the device
|
// otherwise, send the click event to the device
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!controller) {
|
if (!im->mp || paused) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t sdl_buttons_state = SDL_GetMouseState(NULL, NULL);
|
uint32_t sdl_buttons_state = SDL_GetMouseState(NULL, NULL);
|
||||||
|
|
||||||
struct sc_mouse_click_event evt = {
|
struct sc_mouse_click_event evt = {
|
||||||
.position = {
|
.position = sc_input_manager_get_position(im, event->x, event->y),
|
||||||
.screen_size = im->screen->frame_size,
|
|
||||||
.point = sc_screen_convert_window_to_frame_coords(im->screen,
|
|
||||||
event->x,
|
|
||||||
event->y),
|
|
||||||
},
|
|
||||||
.action = sc_action_from_sdl_mousebutton_type(event->type),
|
.action = sc_action_from_sdl_mousebutton_type(event->type),
|
||||||
.button = sc_mouse_button_from_sdl(event->button),
|
.button = sc_mouse_button_from_sdl(event->button),
|
||||||
.pointer_id = im->forward_all_clicks ? POINTER_ID_MOUSE
|
.pointer_id = im->forward_all_clicks ? POINTER_ID_MOUSE
|
||||||
@ -708,7 +792,7 @@ sc_input_manager_process_mouse_button(struct sc_input_manager *im,
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Pinch-to-zoom simulation.
|
// Pinch-to-zoom, rotate and tilt simulation.
|
||||||
//
|
//
|
||||||
// If Ctrl is hold when the left-click button is pressed, then
|
// If Ctrl is hold when the left-click button is pressed, then
|
||||||
// pinch-to-zoom mode is enabled: on every mouse event until the left-click
|
// pinch-to-zoom mode is enabled: on every mouse event until the left-click
|
||||||
@ -717,14 +801,29 @@ sc_input_manager_process_mouse_button(struct sc_input_manager *im,
|
|||||||
//
|
//
|
||||||
// In other words, the center of the rotation/scaling is the center of the
|
// In other words, the center of the rotation/scaling is the center of the
|
||||||
// screen.
|
// screen.
|
||||||
#define CTRL_PRESSED (SDL_GetModState() & (KMOD_LCTRL | KMOD_RCTRL))
|
//
|
||||||
|
// To simulate a tilt gesture (a vertical slide with two fingers), Shift
|
||||||
|
// can be used instead of Ctrl. The "virtual finger" has a position
|
||||||
|
// inverted with respect to the vertical axis of symmetry in the middle of
|
||||||
|
// the screen.
|
||||||
|
const SDL_Keymod keymod = SDL_GetModState();
|
||||||
|
const bool ctrl_pressed = keymod & KMOD_CTRL;
|
||||||
|
const bool shift_pressed = keymod & KMOD_SHIFT;
|
||||||
if (event->button == SDL_BUTTON_LEFT &&
|
if (event->button == SDL_BUTTON_LEFT &&
|
||||||
((down && !im->vfinger_down && CTRL_PRESSED) ||
|
((down && !im->vfinger_down &&
|
||||||
|
((ctrl_pressed && !shift_pressed) ||
|
||||||
|
(!ctrl_pressed && shift_pressed))) ||
|
||||||
(!down && im->vfinger_down))) {
|
(!down && im->vfinger_down))) {
|
||||||
struct sc_point mouse =
|
struct sc_point mouse =
|
||||||
sc_screen_convert_window_to_frame_coords(im->screen, event->x,
|
sc_screen_convert_window_to_frame_coords(im->screen, event->x,
|
||||||
event->y);
|
event->y);
|
||||||
struct sc_point vfinger = inverse_point(mouse, im->screen->frame_size);
|
if (down) {
|
||||||
|
im->vfinger_invert_x = ctrl_pressed || shift_pressed;
|
||||||
|
im->vfinger_invert_y = ctrl_pressed;
|
||||||
|
}
|
||||||
|
struct sc_point vfinger = inverse_point(mouse, im->screen->frame_size,
|
||||||
|
im->vfinger_invert_x,
|
||||||
|
im->vfinger_invert_y);
|
||||||
enum android_motionevent_action action = down
|
enum android_motionevent_action action = down
|
||||||
? AMOTION_EVENT_ACTION_DOWN
|
? AMOTION_EVENT_ACTION_DOWN
|
||||||
: AMOTION_EVENT_ACTION_UP;
|
: AMOTION_EVENT_ACTION_UP;
|
||||||
@ -749,11 +848,7 @@ sc_input_manager_process_mouse_wheel(struct sc_input_manager *im,
|
|||||||
uint32_t buttons = SDL_GetMouseState(&mouse_x, &mouse_y);
|
uint32_t buttons = SDL_GetMouseState(&mouse_x, &mouse_y);
|
||||||
|
|
||||||
struct sc_mouse_scroll_event evt = {
|
struct sc_mouse_scroll_event evt = {
|
||||||
.position = {
|
.position = sc_input_manager_get_position(im, mouse_x, mouse_y),
|
||||||
.screen_size = im->screen->frame_size,
|
|
||||||
.point = sc_screen_convert_window_to_frame_coords(im->screen,
|
|
||||||
mouse_x, mouse_y),
|
|
||||||
},
|
|
||||||
#if SDL_VERSION_ATLEAST(2, 0, 18)
|
#if SDL_VERSION_ATLEAST(2, 0, 18)
|
||||||
.hscroll = CLAMP(event->preciseX, -1.0f, 1.0f),
|
.hscroll = CLAMP(event->preciseX, -1.0f, 1.0f),
|
||||||
.vscroll = CLAMP(event->preciseY, -1.0f, 1.0f),
|
.vscroll = CLAMP(event->preciseY, -1.0f, 1.0f),
|
||||||
@ -800,9 +895,10 @@ void
|
|||||||
sc_input_manager_handle_event(struct sc_input_manager *im,
|
sc_input_manager_handle_event(struct sc_input_manager *im,
|
||||||
const SDL_Event *event) {
|
const SDL_Event *event) {
|
||||||
bool control = im->controller;
|
bool control = im->controller;
|
||||||
|
bool paused = im->screen->paused;
|
||||||
switch (event->type) {
|
switch (event->type) {
|
||||||
case SDL_TEXTINPUT:
|
case SDL_TEXTINPUT:
|
||||||
if (!control) {
|
if (!im->kp || paused) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
sc_input_manager_process_text_input(im, &event->text);
|
sc_input_manager_process_text_input(im, &event->text);
|
||||||
@ -814,13 +910,13 @@ sc_input_manager_handle_event(struct sc_input_manager *im,
|
|||||||
sc_input_manager_process_key(im, &event->key);
|
sc_input_manager_process_key(im, &event->key);
|
||||||
break;
|
break;
|
||||||
case SDL_MOUSEMOTION:
|
case SDL_MOUSEMOTION:
|
||||||
if (!control) {
|
if (!im->mp || paused) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
sc_input_manager_process_mouse_motion(im, &event->motion);
|
sc_input_manager_process_mouse_motion(im, &event->motion);
|
||||||
break;
|
break;
|
||||||
case SDL_MOUSEWHEEL:
|
case SDL_MOUSEWHEEL:
|
||||||
if (!control) {
|
if (!im->mp || paused) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
sc_input_manager_process_mouse_wheel(im, &event->wheel);
|
sc_input_manager_process_mouse_wheel(im, &event->wheel);
|
||||||
@ -834,7 +930,7 @@ sc_input_manager_handle_event(struct sc_input_manager *im,
|
|||||||
case SDL_FINGERMOTION:
|
case SDL_FINGERMOTION:
|
||||||
case SDL_FINGERDOWN:
|
case SDL_FINGERDOWN:
|
||||||
case SDL_FINGERUP:
|
case SDL_FINGERUP:
|
||||||
if (!control) {
|
if (!im->mp || paused) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
sc_input_manager_process_touch(im, &event->tfinger);
|
sc_input_manager_process_touch(im, &event->tfinger);
|
||||||
|
@ -32,6 +32,8 @@ struct sc_input_manager {
|
|||||||
} sdl_shortcut_mods;
|
} sdl_shortcut_mods;
|
||||||
|
|
||||||
bool vfinger_down;
|
bool vfinger_down;
|
||||||
|
bool vfinger_invert_x;
|
||||||
|
bool vfinger_invert_y;
|
||||||
|
|
||||||
// Tracks the number of identical consecutive shortcut key down events.
|
// Tracks the number of identical consecutive shortcut key down events.
|
||||||
// Not to be confused with event->repeat, which counts the number of
|
// Not to be confused with event->repeat, which counts the number of
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#include "keyboard_inject.h"
|
#include "keyboard_sdk.h"
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
@ -9,8 +9,8 @@
|
|||||||
#include "util/intmap.h"
|
#include "util/intmap.h"
|
||||||
#include "util/log.h"
|
#include "util/log.h"
|
||||||
|
|
||||||
/** Downcast key processor to sc_keyboard_inject */
|
/** Downcast key processor to sc_keyboard_sdk */
|
||||||
#define DOWNCAST(KP) container_of(KP, struct sc_keyboard_inject, key_processor)
|
#define DOWNCAST(KP) container_of(KP, struct sc_keyboard_sdk, key_processor)
|
||||||
|
|
||||||
static enum android_keyevent_action
|
static enum android_keyevent_action
|
||||||
convert_keycode_action(enum sc_action action) {
|
convert_keycode_action(enum sc_action action) {
|
||||||
@ -271,20 +271,20 @@ sc_key_processor_process_key(struct sc_key_processor *kp,
|
|||||||
// is set before injecting Ctrl+v.
|
// is set before injecting Ctrl+v.
|
||||||
(void) ack_to_wait;
|
(void) ack_to_wait;
|
||||||
|
|
||||||
struct sc_keyboard_inject *ki = DOWNCAST(kp);
|
struct sc_keyboard_sdk *kb = DOWNCAST(kp);
|
||||||
|
|
||||||
if (event->repeat) {
|
if (event->repeat) {
|
||||||
if (!ki->forward_key_repeat) {
|
if (!kb->forward_key_repeat) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
++ki->repeat;
|
++kb->repeat;
|
||||||
} else {
|
} else {
|
||||||
ki->repeat = 0;
|
kb->repeat = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct sc_control_msg msg;
|
struct sc_control_msg msg;
|
||||||
if (convert_input_key(event, &msg, ki->key_inject_mode, ki->repeat)) {
|
if (convert_input_key(event, &msg, kb->key_inject_mode, kb->repeat)) {
|
||||||
if (!sc_controller_push_msg(ki->controller, &msg)) {
|
if (!sc_controller_push_msg(kb->controller, &msg)) {
|
||||||
LOGW("Could not request 'inject keycode'");
|
LOGW("Could not request 'inject keycode'");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -293,14 +293,14 @@ sc_key_processor_process_key(struct sc_key_processor *kp,
|
|||||||
static void
|
static void
|
||||||
sc_key_processor_process_text(struct sc_key_processor *kp,
|
sc_key_processor_process_text(struct sc_key_processor *kp,
|
||||||
const struct sc_text_event *event) {
|
const struct sc_text_event *event) {
|
||||||
struct sc_keyboard_inject *ki = DOWNCAST(kp);
|
struct sc_keyboard_sdk *kb = DOWNCAST(kp);
|
||||||
|
|
||||||
if (ki->key_inject_mode == SC_KEY_INJECT_MODE_RAW) {
|
if (kb->key_inject_mode == SC_KEY_INJECT_MODE_RAW) {
|
||||||
// Never inject text events
|
// Never inject text events
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ki->key_inject_mode == SC_KEY_INJECT_MODE_MIXED) {
|
if (kb->key_inject_mode == SC_KEY_INJECT_MODE_MIXED) {
|
||||||
char c = event->text[0];
|
char c = event->text[0];
|
||||||
if (isalpha(c) || c == ' ') {
|
if (isalpha(c) || c == ' ') {
|
||||||
assert(event->text[1] == '\0');
|
assert(event->text[1] == '\0');
|
||||||
@ -316,22 +316,22 @@ sc_key_processor_process_text(struct sc_key_processor *kp,
|
|||||||
LOGW("Could not strdup input text");
|
LOGW("Could not strdup input text");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!sc_controller_push_msg(ki->controller, &msg)) {
|
if (!sc_controller_push_msg(kb->controller, &msg)) {
|
||||||
free(msg.inject_text.text);
|
free(msg.inject_text.text);
|
||||||
LOGW("Could not request 'inject text'");
|
LOGW("Could not request 'inject text'");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
sc_keyboard_inject_init(struct sc_keyboard_inject *ki,
|
sc_keyboard_sdk_init(struct sc_keyboard_sdk *kb,
|
||||||
struct sc_controller *controller,
|
struct sc_controller *controller,
|
||||||
enum sc_key_inject_mode key_inject_mode,
|
enum sc_key_inject_mode key_inject_mode,
|
||||||
bool forward_key_repeat) {
|
bool forward_key_repeat) {
|
||||||
ki->controller = controller;
|
kb->controller = controller;
|
||||||
ki->key_inject_mode = key_inject_mode;
|
kb->key_inject_mode = key_inject_mode;
|
||||||
ki->forward_key_repeat = forward_key_repeat;
|
kb->forward_key_repeat = forward_key_repeat;
|
||||||
|
|
||||||
ki->repeat = 0;
|
kb->repeat = 0;
|
||||||
|
|
||||||
static const struct sc_key_processor_ops ops = {
|
static const struct sc_key_processor_ops ops = {
|
||||||
.process_key = sc_key_processor_process_key,
|
.process_key = sc_key_processor_process_key,
|
||||||
@ -339,6 +339,7 @@ sc_keyboard_inject_init(struct sc_keyboard_inject *ki,
|
|||||||
};
|
};
|
||||||
|
|
||||||
// Key injection and clipboard synchronization are serialized
|
// Key injection and clipboard synchronization are serialized
|
||||||
ki->key_processor.async_paste = false;
|
kb->key_processor.async_paste = false;
|
||||||
ki->key_processor.ops = &ops;
|
kb->key_processor.hid = false;
|
||||||
|
kb->key_processor.ops = &ops;
|
||||||
}
|
}
|
@ -1,5 +1,5 @@
|
|||||||
#ifndef SC_KEYBOARD_INJECT_H
|
#ifndef SC_KEYBOARD_SDK_H
|
||||||
#define SC_KEYBOARD_INJECT_H
|
#define SC_KEYBOARD_SDK_H
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
||||||
@ -9,7 +9,7 @@
|
|||||||
#include "options.h"
|
#include "options.h"
|
||||||
#include "trait/key_processor.h"
|
#include "trait/key_processor.h"
|
||||||
|
|
||||||
struct sc_keyboard_inject {
|
struct sc_keyboard_sdk {
|
||||||
struct sc_key_processor key_processor; // key processor trait
|
struct sc_key_processor key_processor; // key processor trait
|
||||||
|
|
||||||
struct sc_controller *controller;
|
struct sc_controller *controller;
|
||||||
@ -23,9 +23,9 @@ struct sc_keyboard_inject {
|
|||||||
};
|
};
|
||||||
|
|
||||||
void
|
void
|
||||||
sc_keyboard_inject_init(struct sc_keyboard_inject *ki,
|
sc_keyboard_sdk_init(struct sc_keyboard_sdk *kb,
|
||||||
struct sc_controller *controller,
|
struct sc_controller *controller,
|
||||||
enum sc_key_inject_mode key_inject_mode,
|
enum sc_key_inject_mode key_inject_mode,
|
||||||
bool forward_key_repeat);
|
bool forward_key_repeat);
|
||||||
|
|
||||||
#endif
|
#endif
|
@ -23,7 +23,7 @@
|
|||||||
#include "util/str.h"
|
#include "util/str.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
int
|
static int
|
||||||
main_scrcpy(int argc, char *argv[]) {
|
main_scrcpy(int argc, char *argv[]) {
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
// disable buffering, we want logs immediately
|
// disable buffering, we want logs immediately
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#include "mouse_inject.h"
|
#include "mouse_sdk.h"
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
@ -9,8 +9,8 @@
|
|||||||
#include "util/intmap.h"
|
#include "util/intmap.h"
|
||||||
#include "util/log.h"
|
#include "util/log.h"
|
||||||
|
|
||||||
/** Downcast mouse processor to sc_mouse_inject */
|
/** Downcast mouse processor to sc_mouse_sdk */
|
||||||
#define DOWNCAST(MP) container_of(MP, struct sc_mouse_inject, mouse_processor)
|
#define DOWNCAST(MP) container_of(MP, struct sc_mouse_sdk, mouse_processor)
|
||||||
|
|
||||||
static enum android_motionevent_buttons
|
static enum android_motionevent_buttons
|
||||||
convert_mouse_buttons(uint32_t state) {
|
convert_mouse_buttons(uint32_t state) {
|
||||||
@ -63,7 +63,7 @@ sc_mouse_processor_process_mouse_motion(struct sc_mouse_processor *mp,
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct sc_mouse_inject *mi = DOWNCAST(mp);
|
struct sc_mouse_sdk *m = DOWNCAST(mp);
|
||||||
|
|
||||||
struct sc_control_msg msg = {
|
struct sc_control_msg msg = {
|
||||||
.type = SC_CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT,
|
.type = SC_CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT,
|
||||||
@ -76,7 +76,7 @@ sc_mouse_processor_process_mouse_motion(struct sc_mouse_processor *mp,
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
if (!sc_controller_push_msg(mi->controller, &msg)) {
|
if (!sc_controller_push_msg(m->controller, &msg)) {
|
||||||
LOGW("Could not request 'inject mouse motion event'");
|
LOGW("Could not request 'inject mouse motion event'");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -84,7 +84,7 @@ sc_mouse_processor_process_mouse_motion(struct sc_mouse_processor *mp,
|
|||||||
static void
|
static void
|
||||||
sc_mouse_processor_process_mouse_click(struct sc_mouse_processor *mp,
|
sc_mouse_processor_process_mouse_click(struct sc_mouse_processor *mp,
|
||||||
const struct sc_mouse_click_event *event) {
|
const struct sc_mouse_click_event *event) {
|
||||||
struct sc_mouse_inject *mi = DOWNCAST(mp);
|
struct sc_mouse_sdk *m = DOWNCAST(mp);
|
||||||
|
|
||||||
struct sc_control_msg msg = {
|
struct sc_control_msg msg = {
|
||||||
.type = SC_CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT,
|
.type = SC_CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT,
|
||||||
@ -98,7 +98,7 @@ sc_mouse_processor_process_mouse_click(struct sc_mouse_processor *mp,
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
if (!sc_controller_push_msg(mi->controller, &msg)) {
|
if (!sc_controller_push_msg(m->controller, &msg)) {
|
||||||
LOGW("Could not request 'inject mouse click event'");
|
LOGW("Could not request 'inject mouse click event'");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -106,7 +106,7 @@ sc_mouse_processor_process_mouse_click(struct sc_mouse_processor *mp,
|
|||||||
static void
|
static void
|
||||||
sc_mouse_processor_process_mouse_scroll(struct sc_mouse_processor *mp,
|
sc_mouse_processor_process_mouse_scroll(struct sc_mouse_processor *mp,
|
||||||
const struct sc_mouse_scroll_event *event) {
|
const struct sc_mouse_scroll_event *event) {
|
||||||
struct sc_mouse_inject *mi = DOWNCAST(mp);
|
struct sc_mouse_sdk *m = DOWNCAST(mp);
|
||||||
|
|
||||||
struct sc_control_msg msg = {
|
struct sc_control_msg msg = {
|
||||||
.type = SC_CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT,
|
.type = SC_CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT,
|
||||||
@ -118,7 +118,7 @@ sc_mouse_processor_process_mouse_scroll(struct sc_mouse_processor *mp,
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
if (!sc_controller_push_msg(mi->controller, &msg)) {
|
if (!sc_controller_push_msg(m->controller, &msg)) {
|
||||||
LOGW("Could not request 'inject mouse scroll event'");
|
LOGW("Could not request 'inject mouse scroll event'");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -126,7 +126,7 @@ sc_mouse_processor_process_mouse_scroll(struct sc_mouse_processor *mp,
|
|||||||
static void
|
static void
|
||||||
sc_mouse_processor_process_touch(struct sc_mouse_processor *mp,
|
sc_mouse_processor_process_touch(struct sc_mouse_processor *mp,
|
||||||
const struct sc_touch_event *event) {
|
const struct sc_touch_event *event) {
|
||||||
struct sc_mouse_inject *mi = DOWNCAST(mp);
|
struct sc_mouse_sdk *m = DOWNCAST(mp);
|
||||||
|
|
||||||
struct sc_control_msg msg = {
|
struct sc_control_msg msg = {
|
||||||
.type = SC_CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT,
|
.type = SC_CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT,
|
||||||
@ -139,15 +139,14 @@ sc_mouse_processor_process_touch(struct sc_mouse_processor *mp,
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
if (!sc_controller_push_msg(mi->controller, &msg)) {
|
if (!sc_controller_push_msg(m->controller, &msg)) {
|
||||||
LOGW("Could not request 'inject touch event'");
|
LOGW("Could not request 'inject touch event'");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
sc_mouse_inject_init(struct sc_mouse_inject *mi,
|
sc_mouse_sdk_init(struct sc_mouse_sdk *m, struct sc_controller *controller) {
|
||||||
struct sc_controller *controller) {
|
m->controller = controller;
|
||||||
mi->controller = controller;
|
|
||||||
|
|
||||||
static const struct sc_mouse_processor_ops ops = {
|
static const struct sc_mouse_processor_ops ops = {
|
||||||
.process_mouse_motion = sc_mouse_processor_process_mouse_motion,
|
.process_mouse_motion = sc_mouse_processor_process_mouse_motion,
|
||||||
@ -156,7 +155,7 @@ sc_mouse_inject_init(struct sc_mouse_inject *mi,
|
|||||||
.process_touch = sc_mouse_processor_process_touch,
|
.process_touch = sc_mouse_processor_process_touch,
|
||||||
};
|
};
|
||||||
|
|
||||||
mi->mouse_processor.ops = &ops;
|
m->mouse_processor.ops = &ops;
|
||||||
|
|
||||||
mi->mouse_processor.relative_mode = false;
|
m->mouse_processor.relative_mode = false;
|
||||||
}
|
}
|
@ -1,5 +1,5 @@
|
|||||||
#ifndef SC_MOUSE_INJECT_H
|
#ifndef SC_MOUSE_SDK_H
|
||||||
#define SC_MOUSE_INJECT_H
|
#define SC_MOUSE_SDK_H
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
||||||
@ -9,14 +9,13 @@
|
|||||||
#include "screen.h"
|
#include "screen.h"
|
||||||
#include "trait/mouse_processor.h"
|
#include "trait/mouse_processor.h"
|
||||||
|
|
||||||
struct sc_mouse_inject {
|
struct sc_mouse_sdk {
|
||||||
struct sc_mouse_processor mouse_processor; // mouse processor trait
|
struct sc_mouse_processor mouse_processor; // mouse processor trait
|
||||||
|
|
||||||
struct sc_controller *controller;
|
struct sc_controller *controller;
|
||||||
};
|
};
|
||||||
|
|
||||||
void
|
void
|
||||||
sc_mouse_inject_init(struct sc_mouse_inject *mi,
|
sc_mouse_sdk_init(struct sc_mouse_sdk *m, struct sc_controller *controller);
|
||||||
struct sc_controller *controller);
|
|
||||||
|
|
||||||
#endif
|
#endif
|
@ -11,13 +11,19 @@ const struct scrcpy_options scrcpy_options_default = {
|
|||||||
.audio_codec_options = NULL,
|
.audio_codec_options = NULL,
|
||||||
.video_encoder = NULL,
|
.video_encoder = NULL,
|
||||||
.audio_encoder = NULL,
|
.audio_encoder = NULL,
|
||||||
|
.camera_id = NULL,
|
||||||
|
.camera_size = NULL,
|
||||||
|
.camera_ar = NULL,
|
||||||
|
.camera_fps = 0,
|
||||||
.log_level = SC_LOG_LEVEL_INFO,
|
.log_level = SC_LOG_LEVEL_INFO,
|
||||||
.video_codec = SC_CODEC_H264,
|
.video_codec = SC_CODEC_H264,
|
||||||
.audio_codec = SC_CODEC_OPUS,
|
.audio_codec = SC_CODEC_OPUS,
|
||||||
.audio_source = SC_AUDIO_SOURCE_OUTPUT,
|
.video_source = SC_VIDEO_SOURCE_DISPLAY,
|
||||||
|
.audio_source = SC_AUDIO_SOURCE_AUTO,
|
||||||
.record_format = SC_RECORD_FORMAT_AUTO,
|
.record_format = SC_RECORD_FORMAT_AUTO,
|
||||||
.keyboard_input_mode = SC_KEYBOARD_INPUT_MODE_INJECT,
|
.keyboard_input_mode = SC_KEYBOARD_INPUT_MODE_AUTO,
|
||||||
.mouse_input_mode = SC_MOUSE_INPUT_MODE_INJECT,
|
.mouse_input_mode = SC_MOUSE_INPUT_MODE_AUTO,
|
||||||
|
.camera_facing = SC_CAMERA_FACING_ANY,
|
||||||
.port_range = {
|
.port_range = {
|
||||||
.first = DEFAULT_LOCAL_PORT_RANGE_FIRST,
|
.first = DEFAULT_LOCAL_PORT_RANGE_FIRST,
|
||||||
.last = DEFAULT_LOCAL_PORT_RANGE_LAST,
|
.last = DEFAULT_LOCAL_PORT_RANGE_LAST,
|
||||||
@ -33,14 +39,15 @@ const struct scrcpy_options scrcpy_options_default = {
|
|||||||
.audio_bit_rate = 0,
|
.audio_bit_rate = 0,
|
||||||
.max_fps = 0,
|
.max_fps = 0,
|
||||||
.lock_video_orientation = SC_LOCK_VIDEO_ORIENTATION_UNLOCKED,
|
.lock_video_orientation = SC_LOCK_VIDEO_ORIENTATION_UNLOCKED,
|
||||||
.rotation = 0,
|
.display_orientation = SC_ORIENTATION_0,
|
||||||
|
.record_orientation = SC_ORIENTATION_0,
|
||||||
.window_x = SC_WINDOW_POSITION_UNDEFINED,
|
.window_x = SC_WINDOW_POSITION_UNDEFINED,
|
||||||
.window_y = SC_WINDOW_POSITION_UNDEFINED,
|
.window_y = SC_WINDOW_POSITION_UNDEFINED,
|
||||||
.window_width = 0,
|
.window_width = 0,
|
||||||
.window_height = 0,
|
.window_height = 0,
|
||||||
.display_id = 0,
|
.display_id = 0,
|
||||||
.display_buffer = 0,
|
.display_buffer = 0,
|
||||||
.audio_buffer = SC_TICK_FROM_MS(50),
|
.audio_buffer = -1, // depends on the audio format,
|
||||||
.audio_output_buffer = SC_TICK_FROM_MS(5),
|
.audio_output_buffer = SC_TICK_FROM_MS(5),
|
||||||
.time_limit = 0,
|
.time_limit = 0,
|
||||||
#ifdef HAVE_V4L2
|
#ifdef HAVE_V4L2
|
||||||
@ -79,7 +86,44 @@ const struct scrcpy_options scrcpy_options_default = {
|
|||||||
.video = true,
|
.video = true,
|
||||||
.audio = true,
|
.audio = true,
|
||||||
.require_audio = false,
|
.require_audio = false,
|
||||||
.list_encoders = false,
|
|
||||||
.list_displays = false,
|
|
||||||
.kill_adb_on_close = false,
|
.kill_adb_on_close = false,
|
||||||
|
.camera_high_speed = false,
|
||||||
|
.list = 0,
|
||||||
|
.window = true,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
enum sc_orientation
|
||||||
|
sc_orientation_apply(enum sc_orientation src, enum sc_orientation transform) {
|
||||||
|
assert(!(src & ~7));
|
||||||
|
assert(!(transform & ~7));
|
||||||
|
|
||||||
|
unsigned transform_hflip = transform & 4;
|
||||||
|
unsigned transform_rotation = transform & 3;
|
||||||
|
unsigned src_hflip = src & 4;
|
||||||
|
unsigned src_rotation = src & 3;
|
||||||
|
unsigned src_swap = src & 1;
|
||||||
|
if (src_swap && transform_hflip) {
|
||||||
|
// If the src is rotated by 90 or 270 degrees, applying a flipped
|
||||||
|
// transformation requires an additional 180 degrees rotation to
|
||||||
|
// compensate for the inversion of the order of multiplication:
|
||||||
|
//
|
||||||
|
// hflip1 × rotate1 × hflip2 × rotate2
|
||||||
|
// `--------------' `--------------'
|
||||||
|
// src transform
|
||||||
|
//
|
||||||
|
// In the final result, we want all the hflips then all the rotations,
|
||||||
|
// so we must move hflip2 to the left:
|
||||||
|
//
|
||||||
|
// hflip1 × hflip2 × rotate1' × rotate2
|
||||||
|
//
|
||||||
|
// with rotate1' = | rotate1 if src is 0° or 180°
|
||||||
|
// | rotate1 + 180° if src is 90° or 270°
|
||||||
|
|
||||||
|
src_rotation += 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned result_hflip = src_hflip ^ transform_hflip;
|
||||||
|
unsigned result_rotation = (transform_rotation + src_rotation) % 4;
|
||||||
|
enum sc_orientation result = result_hflip | result_rotation;
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
||||||
|
#include <assert.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
@ -25,6 +26,8 @@ enum sc_record_format {
|
|||||||
SC_RECORD_FORMAT_MKA,
|
SC_RECORD_FORMAT_MKA,
|
||||||
SC_RECORD_FORMAT_OPUS,
|
SC_RECORD_FORMAT_OPUS,
|
||||||
SC_RECORD_FORMAT_AAC,
|
SC_RECORD_FORMAT_AAC,
|
||||||
|
SC_RECORD_FORMAT_FLAC,
|
||||||
|
SC_RECORD_FORMAT_WAV,
|
||||||
};
|
};
|
||||||
|
|
||||||
static inline bool
|
static inline bool
|
||||||
@ -32,7 +35,9 @@ sc_record_format_is_audio_only(enum sc_record_format fmt) {
|
|||||||
return fmt == SC_RECORD_FORMAT_M4A
|
return fmt == SC_RECORD_FORMAT_M4A
|
||||||
|| fmt == SC_RECORD_FORMAT_MKA
|
|| fmt == SC_RECORD_FORMAT_MKA
|
||||||
|| fmt == SC_RECORD_FORMAT_OPUS
|
|| fmt == SC_RECORD_FORMAT_OPUS
|
||||||
|| fmt == SC_RECORD_FORMAT_AAC;
|
|| fmt == SC_RECORD_FORMAT_AAC
|
||||||
|
|| fmt == SC_RECORD_FORMAT_FLAC
|
||||||
|
|| fmt == SC_RECORD_FORMAT_WAV;
|
||||||
}
|
}
|
||||||
|
|
||||||
enum sc_codec {
|
enum sc_codec {
|
||||||
@ -41,32 +46,113 @@ enum sc_codec {
|
|||||||
SC_CODEC_AV1,
|
SC_CODEC_AV1,
|
||||||
SC_CODEC_OPUS,
|
SC_CODEC_OPUS,
|
||||||
SC_CODEC_AAC,
|
SC_CODEC_AAC,
|
||||||
|
SC_CODEC_FLAC,
|
||||||
SC_CODEC_RAW,
|
SC_CODEC_RAW,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
enum sc_video_source {
|
||||||
|
SC_VIDEO_SOURCE_DISPLAY,
|
||||||
|
SC_VIDEO_SOURCE_CAMERA,
|
||||||
|
};
|
||||||
|
|
||||||
enum sc_audio_source {
|
enum sc_audio_source {
|
||||||
|
SC_AUDIO_SOURCE_AUTO, // OUTPUT for video DISPLAY, MIC for video CAMERA
|
||||||
SC_AUDIO_SOURCE_OUTPUT,
|
SC_AUDIO_SOURCE_OUTPUT,
|
||||||
SC_AUDIO_SOURCE_MIC,
|
SC_AUDIO_SOURCE_MIC,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
enum sc_camera_facing {
|
||||||
|
SC_CAMERA_FACING_ANY,
|
||||||
|
SC_CAMERA_FACING_FRONT,
|
||||||
|
SC_CAMERA_FACING_BACK,
|
||||||
|
SC_CAMERA_FACING_EXTERNAL,
|
||||||
|
};
|
||||||
|
|
||||||
|
// ,----- hflip (applied before the rotation)
|
||||||
|
// | ,--- 180°
|
||||||
|
// | | ,- 90° clockwise
|
||||||
|
// | | |
|
||||||
|
enum sc_orientation { // v v v
|
||||||
|
SC_ORIENTATION_0, // 0 0 0
|
||||||
|
SC_ORIENTATION_90, // 0 0 1
|
||||||
|
SC_ORIENTATION_180, // 0 1 0
|
||||||
|
SC_ORIENTATION_270, // 0 1 1
|
||||||
|
SC_ORIENTATION_FLIP_0, // 1 0 0
|
||||||
|
SC_ORIENTATION_FLIP_90, // 1 0 1
|
||||||
|
SC_ORIENTATION_FLIP_180, // 1 1 0
|
||||||
|
SC_ORIENTATION_FLIP_270, // 1 1 1
|
||||||
|
};
|
||||||
|
|
||||||
|
static inline bool
|
||||||
|
sc_orientation_is_mirror(enum sc_orientation orientation) {
|
||||||
|
assert(!(orientation & ~7));
|
||||||
|
return orientation & 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Does the orientation swap width and height?
|
||||||
|
static inline bool
|
||||||
|
sc_orientation_is_swap(enum sc_orientation orientation) {
|
||||||
|
assert(!(orientation & ~7));
|
||||||
|
return orientation & 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline enum sc_orientation
|
||||||
|
sc_orientation_get_rotation(enum sc_orientation orientation) {
|
||||||
|
assert(!(orientation & ~7));
|
||||||
|
return orientation & 3;
|
||||||
|
}
|
||||||
|
|
||||||
|
enum sc_orientation
|
||||||
|
sc_orientation_apply(enum sc_orientation src, enum sc_orientation transform);
|
||||||
|
|
||||||
|
static inline const char *
|
||||||
|
sc_orientation_get_name(enum sc_orientation orientation) {
|
||||||
|
switch (orientation) {
|
||||||
|
case SC_ORIENTATION_0:
|
||||||
|
return "0";
|
||||||
|
case SC_ORIENTATION_90:
|
||||||
|
return "90";
|
||||||
|
case SC_ORIENTATION_180:
|
||||||
|
return "180";
|
||||||
|
case SC_ORIENTATION_270:
|
||||||
|
return "270";
|
||||||
|
case SC_ORIENTATION_FLIP_0:
|
||||||
|
return "flip0";
|
||||||
|
case SC_ORIENTATION_FLIP_90:
|
||||||
|
return "flip90";
|
||||||
|
case SC_ORIENTATION_FLIP_180:
|
||||||
|
return "flip180";
|
||||||
|
case SC_ORIENTATION_FLIP_270:
|
||||||
|
return "flip270";
|
||||||
|
default:
|
||||||
|
return "(unknown)";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
enum sc_lock_video_orientation {
|
enum sc_lock_video_orientation {
|
||||||
SC_LOCK_VIDEO_ORIENTATION_UNLOCKED = -1,
|
SC_LOCK_VIDEO_ORIENTATION_UNLOCKED = -1,
|
||||||
// lock the current orientation when scrcpy starts
|
// lock the current orientation when scrcpy starts
|
||||||
SC_LOCK_VIDEO_ORIENTATION_INITIAL = -2,
|
SC_LOCK_VIDEO_ORIENTATION_INITIAL = -2,
|
||||||
SC_LOCK_VIDEO_ORIENTATION_0 = 0,
|
SC_LOCK_VIDEO_ORIENTATION_0 = 0,
|
||||||
SC_LOCK_VIDEO_ORIENTATION_1,
|
SC_LOCK_VIDEO_ORIENTATION_90 = 3,
|
||||||
SC_LOCK_VIDEO_ORIENTATION_2,
|
SC_LOCK_VIDEO_ORIENTATION_180 = 2,
|
||||||
SC_LOCK_VIDEO_ORIENTATION_3,
|
SC_LOCK_VIDEO_ORIENTATION_270 = 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
enum sc_keyboard_input_mode {
|
enum sc_keyboard_input_mode {
|
||||||
SC_KEYBOARD_INPUT_MODE_INJECT,
|
SC_KEYBOARD_INPUT_MODE_AUTO,
|
||||||
SC_KEYBOARD_INPUT_MODE_HID,
|
SC_KEYBOARD_INPUT_MODE_DISABLED,
|
||||||
|
SC_KEYBOARD_INPUT_MODE_SDK,
|
||||||
|
SC_KEYBOARD_INPUT_MODE_UHID,
|
||||||
|
SC_KEYBOARD_INPUT_MODE_AOA,
|
||||||
};
|
};
|
||||||
|
|
||||||
enum sc_mouse_input_mode {
|
enum sc_mouse_input_mode {
|
||||||
SC_MOUSE_INPUT_MODE_INJECT,
|
SC_MOUSE_INPUT_MODE_AUTO,
|
||||||
SC_MOUSE_INPUT_MODE_HID,
|
SC_MOUSE_INPUT_MODE_DISABLED,
|
||||||
|
SC_MOUSE_INPUT_MODE_SDK,
|
||||||
|
SC_MOUSE_INPUT_MODE_UHID,
|
||||||
|
SC_MOUSE_INPUT_MODE_AOA,
|
||||||
};
|
};
|
||||||
|
|
||||||
enum sc_key_inject_mode {
|
enum sc_key_inject_mode {
|
||||||
@ -117,13 +203,19 @@ struct scrcpy_options {
|
|||||||
const char *audio_codec_options;
|
const char *audio_codec_options;
|
||||||
const char *video_encoder;
|
const char *video_encoder;
|
||||||
const char *audio_encoder;
|
const char *audio_encoder;
|
||||||
|
const char *camera_id;
|
||||||
|
const char *camera_size;
|
||||||
|
const char *camera_ar;
|
||||||
|
uint16_t camera_fps;
|
||||||
enum sc_log_level log_level;
|
enum sc_log_level log_level;
|
||||||
enum sc_codec video_codec;
|
enum sc_codec video_codec;
|
||||||
enum sc_codec audio_codec;
|
enum sc_codec audio_codec;
|
||||||
|
enum sc_video_source video_source;
|
||||||
enum sc_audio_source audio_source;
|
enum sc_audio_source audio_source;
|
||||||
enum sc_record_format record_format;
|
enum sc_record_format record_format;
|
||||||
enum sc_keyboard_input_mode keyboard_input_mode;
|
enum sc_keyboard_input_mode keyboard_input_mode;
|
||||||
enum sc_mouse_input_mode mouse_input_mode;
|
enum sc_mouse_input_mode mouse_input_mode;
|
||||||
|
enum sc_camera_facing camera_facing;
|
||||||
struct sc_port_range port_range;
|
struct sc_port_range port_range;
|
||||||
uint32_t tunnel_host;
|
uint32_t tunnel_host;
|
||||||
uint16_t tunnel_port;
|
uint16_t tunnel_port;
|
||||||
@ -133,7 +225,8 @@ struct scrcpy_options {
|
|||||||
uint32_t audio_bit_rate;
|
uint32_t audio_bit_rate;
|
||||||
uint16_t max_fps;
|
uint16_t max_fps;
|
||||||
enum sc_lock_video_orientation lock_video_orientation;
|
enum sc_lock_video_orientation lock_video_orientation;
|
||||||
uint8_t rotation;
|
enum sc_orientation display_orientation;
|
||||||
|
enum sc_orientation record_orientation;
|
||||||
int16_t window_x; // SC_WINDOW_POSITION_UNDEFINED for "auto"
|
int16_t window_x; // SC_WINDOW_POSITION_UNDEFINED for "auto"
|
||||||
int16_t window_y; // SC_WINDOW_POSITION_UNDEFINED for "auto"
|
int16_t window_y; // SC_WINDOW_POSITION_UNDEFINED for "auto"
|
||||||
uint16_t window_width;
|
uint16_t window_width;
|
||||||
@ -179,9 +272,14 @@ struct scrcpy_options {
|
|||||||
bool video;
|
bool video;
|
||||||
bool audio;
|
bool audio;
|
||||||
bool require_audio;
|
bool require_audio;
|
||||||
bool list_encoders;
|
|
||||||
bool list_displays;
|
|
||||||
bool kill_adb_on_close;
|
bool kill_adb_on_close;
|
||||||
|
bool camera_high_speed;
|
||||||
|
#define SC_OPTION_LIST_ENCODERS 0x1
|
||||||
|
#define SC_OPTION_LIST_DISPLAYS 0x2
|
||||||
|
#define SC_OPTION_LIST_CAMERAS 0x4
|
||||||
|
#define SC_OPTION_LIST_CAMERA_SIZES 0x8
|
||||||
|
uint8_t list;
|
||||||
|
bool window;
|
||||||
};
|
};
|
||||||
|
|
||||||
extern const struct scrcpy_options scrcpy_options_default;
|
extern const struct scrcpy_options scrcpy_options_default;
|
||||||
|
@ -1,21 +1,29 @@
|
|||||||
#include "receiver.h"
|
#include "receiver.h"
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
#include <inttypes.h>
|
||||||
|
#include <stdint.h>
|
||||||
#include <SDL2/SDL_clipboard.h>
|
#include <SDL2/SDL_clipboard.h>
|
||||||
|
|
||||||
#include "device_msg.h"
|
#include "device_msg.h"
|
||||||
#include "util/log.h"
|
#include "util/log.h"
|
||||||
|
#include "util/str.h"
|
||||||
|
|
||||||
bool
|
bool
|
||||||
sc_receiver_init(struct sc_receiver *receiver, sc_socket control_socket,
|
sc_receiver_init(struct sc_receiver *receiver, sc_socket control_socket,
|
||||||
struct sc_acksync *acksync) {
|
const struct sc_receiver_callbacks *cbs, void *cbs_userdata) {
|
||||||
bool ok = sc_mutex_init(&receiver->mutex);
|
bool ok = sc_mutex_init(&receiver->mutex);
|
||||||
if (!ok) {
|
if (!ok) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
receiver->control_socket = control_socket;
|
receiver->control_socket = control_socket;
|
||||||
receiver->acksync = acksync;
|
receiver->acksync = NULL;
|
||||||
|
receiver->uhid_devices = NULL;
|
||||||
|
|
||||||
|
assert(cbs && cbs->on_error);
|
||||||
|
receiver->cbs = cbs;
|
||||||
|
receiver->cbs_userdata = cbs_userdata;
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -26,7 +34,7 @@ sc_receiver_destroy(struct sc_receiver *receiver) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
process_msg(struct sc_receiver *receiver, struct device_msg *msg) {
|
process_msg(struct sc_receiver *receiver, struct sc_device_msg *msg) {
|
||||||
switch (msg->type) {
|
switch (msg->type) {
|
||||||
case DEVICE_MSG_TYPE_CLIPBOARD: {
|
case DEVICE_MSG_TYPE_CLIPBOARD: {
|
||||||
char *current = SDL_GetClipboardText();
|
char *current = SDL_GetClipboardText();
|
||||||
@ -42,20 +50,65 @@ process_msg(struct sc_receiver *receiver, struct device_msg *msg) {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case DEVICE_MSG_TYPE_ACK_CLIPBOARD:
|
case DEVICE_MSG_TYPE_ACK_CLIPBOARD:
|
||||||
assert(receiver->acksync);
|
|
||||||
LOGD("Ack device clipboard sequence=%" PRIu64_,
|
LOGD("Ack device clipboard sequence=%" PRIu64_,
|
||||||
msg->ack_clipboard.sequence);
|
msg->ack_clipboard.sequence);
|
||||||
|
|
||||||
|
// This is a programming error to receive this message if there is
|
||||||
|
// no ACK synchronization mechanism
|
||||||
|
assert(receiver->acksync);
|
||||||
|
|
||||||
|
// Also check at runtime (do not trust the server)
|
||||||
|
if (!receiver->acksync) {
|
||||||
|
LOGE("Received unexpected ack");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
sc_acksync_ack(receiver->acksync, msg->ack_clipboard.sequence);
|
sc_acksync_ack(receiver->acksync, msg->ack_clipboard.sequence);
|
||||||
break;
|
break;
|
||||||
|
case DEVICE_MSG_TYPE_UHID_OUTPUT:
|
||||||
|
if (sc_get_log_level() <= SC_LOG_LEVEL_VERBOSE) {
|
||||||
|
char *hex = sc_str_to_hex_string(msg->uhid_output.data,
|
||||||
|
msg->uhid_output.size);
|
||||||
|
if (hex) {
|
||||||
|
LOGV("UHID output [%" PRIu16 "] %s",
|
||||||
|
msg->uhid_output.id, hex);
|
||||||
|
free(hex);
|
||||||
|
} else {
|
||||||
|
LOGV("UHID output [%" PRIu16 "] size=%" PRIu16,
|
||||||
|
msg->uhid_output.id, msg->uhid_output.size);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// This is a programming error to receive this message if there is
|
||||||
|
// no uhid_devices instance
|
||||||
|
assert(receiver->uhid_devices);
|
||||||
|
|
||||||
|
// Also check at runtime (do not trust the server)
|
||||||
|
if (!receiver->uhid_devices) {
|
||||||
|
LOGE("Received unexpected HID output message");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct sc_uhid_receiver *uhid_receiver =
|
||||||
|
sc_uhid_devices_get_receiver(receiver->uhid_devices,
|
||||||
|
msg->uhid_output.id);
|
||||||
|
if (uhid_receiver) {
|
||||||
|
uhid_receiver->ops->process_output(uhid_receiver,
|
||||||
|
msg->uhid_output.data,
|
||||||
|
msg->uhid_output.size);
|
||||||
|
} else {
|
||||||
|
LOGW("No UHID receiver for id %" PRIu16, msg->uhid_output.id);
|
||||||
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static ssize_t
|
static ssize_t
|
||||||
process_msgs(struct sc_receiver *receiver, const unsigned char *buf, size_t len) {
|
process_msgs(struct sc_receiver *receiver, const uint8_t *buf, size_t len) {
|
||||||
size_t head = 0;
|
size_t head = 0;
|
||||||
for (;;) {
|
for (;;) {
|
||||||
struct device_msg msg;
|
struct sc_device_msg msg;
|
||||||
ssize_t r = device_msg_deserialize(&buf[head], len - head, &msg);
|
ssize_t r = sc_device_msg_deserialize(&buf[head], len - head, &msg);
|
||||||
if (r == -1) {
|
if (r == -1) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
@ -64,7 +117,7 @@ process_msgs(struct sc_receiver *receiver, const unsigned char *buf, size_t len)
|
|||||||
}
|
}
|
||||||
|
|
||||||
process_msg(receiver, &msg);
|
process_msg(receiver, &msg);
|
||||||
device_msg_destroy(&msg);
|
sc_device_msg_destroy(&msg);
|
||||||
|
|
||||||
head += r;
|
head += r;
|
||||||
assert(head <= len);
|
assert(head <= len);
|
||||||
@ -78,7 +131,7 @@ static int
|
|||||||
run_receiver(void *data) {
|
run_receiver(void *data) {
|
||||||
struct sc_receiver *receiver = data;
|
struct sc_receiver *receiver = data;
|
||||||
|
|
||||||
static unsigned char buf[DEVICE_MSG_MAX_SIZE];
|
static uint8_t buf[DEVICE_MSG_MAX_SIZE];
|
||||||
size_t head = 0;
|
size_t head = 0;
|
||||||
|
|
||||||
for (;;) {
|
for (;;) {
|
||||||
@ -104,6 +157,8 @@ run_receiver(void *data) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
receiver->cbs->on_error(receiver, receiver->cbs_userdata);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5,6 +5,7 @@
|
|||||||
|
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
|
|
||||||
|
#include "uhid/uhid_output.h"
|
||||||
#include "util/acksync.h"
|
#include "util/acksync.h"
|
||||||
#include "util/net.h"
|
#include "util/net.h"
|
||||||
#include "util/thread.h"
|
#include "util/thread.h"
|
||||||
@ -17,11 +18,19 @@ struct sc_receiver {
|
|||||||
sc_mutex mutex;
|
sc_mutex mutex;
|
||||||
|
|
||||||
struct sc_acksync *acksync;
|
struct sc_acksync *acksync;
|
||||||
|
struct sc_uhid_devices *uhid_devices;
|
||||||
|
|
||||||
|
const struct sc_receiver_callbacks *cbs;
|
||||||
|
void *cbs_userdata;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct sc_receiver_callbacks {
|
||||||
|
void (*on_error)(struct sc_receiver *receiver, void *userdata);
|
||||||
};
|
};
|
||||||
|
|
||||||
bool
|
bool
|
||||||
sc_receiver_init(struct sc_receiver *receiver, sc_socket control_socket,
|
sc_receiver_init(struct sc_receiver *receiver, sc_socket control_socket,
|
||||||
struct sc_acksync *acksync);
|
const struct sc_receiver_callbacks *cbs, void *cbs_userdata);
|
||||||
|
|
||||||
void
|
void
|
||||||
sc_receiver_destroy(struct sc_receiver *receiver);
|
sc_receiver_destroy(struct sc_receiver *receiver);
|
||||||
|
@ -4,6 +4,7 @@
|
|||||||
#include <libavcodec/avcodec.h>
|
#include <libavcodec/avcodec.h>
|
||||||
#include <libavformat/avformat.h>
|
#include <libavformat/avformat.h>
|
||||||
#include <libavutil/time.h>
|
#include <libavutil/time.h>
|
||||||
|
#include <libavutil/display.h>
|
||||||
|
|
||||||
#include "util/log.h"
|
#include "util/log.h"
|
||||||
#include "util/str.h"
|
#include "util/str.h"
|
||||||
@ -69,6 +70,10 @@ sc_recorder_get_format_name(enum sc_record_format format) {
|
|||||||
return "matroska";
|
return "matroska";
|
||||||
case SC_RECORD_FORMAT_OPUS:
|
case SC_RECORD_FORMAT_OPUS:
|
||||||
return "opus";
|
return "opus";
|
||||||
|
case SC_RECORD_FORMAT_FLAC:
|
||||||
|
return "flac";
|
||||||
|
case SC_RECORD_FORMAT_WAV:
|
||||||
|
return "wav";
|
||||||
default:
|
default:
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
@ -101,7 +106,7 @@ sc_recorder_write_stream(struct sc_recorder *recorder,
|
|||||||
AVStream *stream = recorder->ctx->streams[st->index];
|
AVStream *stream = recorder->ctx->streams[st->index];
|
||||||
sc_recorder_rescale_packet(stream, packet);
|
sc_recorder_rescale_packet(stream, packet);
|
||||||
if (st->last_pts != AV_NOPTS_VALUE && packet->pts <= st->last_pts) {
|
if (st->last_pts != AV_NOPTS_VALUE && packet->pts <= st->last_pts) {
|
||||||
LOGW("Fixing PTS non monotonically increasing in stream %d "
|
LOGD("Fixing PTS non monotonically increasing in stream %d "
|
||||||
"(%" PRIi64 " >= %" PRIi64 ")",
|
"(%" PRIi64 " >= %" PRIi64 ")",
|
||||||
st->index, st->last_pts, packet->pts);
|
st->index, st->last_pts, packet->pts);
|
||||||
packet->pts = ++st->last_pts;
|
packet->pts = ++st->last_pts;
|
||||||
@ -166,13 +171,14 @@ sc_recorder_close_output_file(struct sc_recorder *recorder) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static inline bool
|
static inline bool
|
||||||
sc_recorder_has_empty_queues(struct sc_recorder *recorder) {
|
sc_recorder_must_wait_for_config_packets(struct sc_recorder *recorder) {
|
||||||
if (recorder->video && sc_vecdeque_is_empty(&recorder->video_queue)) {
|
if (recorder->video && sc_vecdeque_is_empty(&recorder->video_queue)) {
|
||||||
// The video queue is empty
|
// The video queue is empty
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (recorder->audio && sc_vecdeque_is_empty(&recorder->audio_queue)) {
|
if (recorder->audio && recorder->audio_expects_config_packet
|
||||||
|
&& sc_vecdeque_is_empty(&recorder->audio_queue)) {
|
||||||
// The audio queue is empty (when audio is enabled)
|
// The audio queue is empty (when audio is enabled)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -188,7 +194,7 @@ sc_recorder_process_header(struct sc_recorder *recorder) {
|
|||||||
while (!recorder->stopped &&
|
while (!recorder->stopped &&
|
||||||
((recorder->video && !recorder->video_init)
|
((recorder->video && !recorder->video_init)
|
||||||
|| (recorder->audio && !recorder->audio_init)
|
|| (recorder->audio && !recorder->audio_init)
|
||||||
|| sc_recorder_has_empty_queues(recorder))) {
|
|| sc_recorder_must_wait_for_config_packets(recorder))) {
|
||||||
sc_cond_wait(&recorder->cond, &recorder->mutex);
|
sc_cond_wait(&recorder->cond, &recorder->mutex);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -207,7 +213,8 @@ sc_recorder_process_header(struct sc_recorder *recorder) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
AVPacket *audio_pkt = NULL;
|
AVPacket *audio_pkt = NULL;
|
||||||
if (!sc_vecdeque_is_empty(&recorder->audio_queue)) {
|
if (recorder->audio_expects_config_packet &&
|
||||||
|
!sc_vecdeque_is_empty(&recorder->audio_queue)) {
|
||||||
assert(recorder->audio);
|
assert(recorder->audio);
|
||||||
audio_pkt = sc_vecdeque_pop(&recorder->audio_queue);
|
audio_pkt = sc_vecdeque_pop(&recorder->audio_queue);
|
||||||
}
|
}
|
||||||
@ -487,6 +494,42 @@ run_recorder(void *data) {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool
|
||||||
|
sc_recorder_set_orientation(AVStream *stream, enum sc_orientation orientation) {
|
||||||
|
assert(!sc_orientation_is_mirror(orientation));
|
||||||
|
|
||||||
|
uint8_t *raw_data;
|
||||||
|
#ifdef SCRCPY_LAVC_HAS_CODECPAR_CODEC_SIDEDATA
|
||||||
|
AVPacketSideData *sd =
|
||||||
|
av_packet_side_data_new(&stream->codecpar->coded_side_data,
|
||||||
|
&stream->codecpar->nb_coded_side_data,
|
||||||
|
AV_PKT_DATA_DISPLAYMATRIX,
|
||||||
|
sizeof(int32_t) * 9, 0);
|
||||||
|
if (!sd) {
|
||||||
|
LOG_OOM();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
raw_data = sd->data;
|
||||||
|
#else
|
||||||
|
raw_data = av_stream_new_side_data(stream, AV_PKT_DATA_DISPLAYMATRIX,
|
||||||
|
sizeof(int32_t) * 9);
|
||||||
|
if (!raw_data) {
|
||||||
|
LOG_OOM();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
int32_t *matrix = (int32_t *) raw_data;
|
||||||
|
|
||||||
|
unsigned rotation = orientation;
|
||||||
|
unsigned angle = rotation * 90;
|
||||||
|
|
||||||
|
av_display_rotation_set(matrix, angle);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
static bool
|
static bool
|
||||||
sc_recorder_video_packet_sink_open(struct sc_packet_sink *sink,
|
sc_recorder_video_packet_sink_open(struct sc_packet_sink *sink,
|
||||||
AVCodecContext *ctx) {
|
AVCodecContext *ctx) {
|
||||||
@ -514,6 +557,16 @@ sc_recorder_video_packet_sink_open(struct sc_packet_sink *sink,
|
|||||||
|
|
||||||
recorder->video_stream.index = stream->index;
|
recorder->video_stream.index = stream->index;
|
||||||
|
|
||||||
|
if (recorder->orientation != SC_ORIENTATION_0) {
|
||||||
|
if (!sc_recorder_set_orientation(stream, recorder->orientation)) {
|
||||||
|
sc_mutex_unlock(&recorder->mutex);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
LOGI("Record orientation set to %s",
|
||||||
|
sc_orientation_get_name(recorder->orientation));
|
||||||
|
}
|
||||||
|
|
||||||
recorder->video_init = true;
|
recorder->video_init = true;
|
||||||
sc_cond_signal(&recorder->cond);
|
sc_cond_signal(&recorder->cond);
|
||||||
sc_mutex_unlock(&recorder->mutex);
|
sc_mutex_unlock(&recorder->mutex);
|
||||||
@ -595,6 +648,10 @@ sc_recorder_audio_packet_sink_open(struct sc_packet_sink *sink,
|
|||||||
|
|
||||||
recorder->audio_stream.index = stream->index;
|
recorder->audio_stream.index = stream->index;
|
||||||
|
|
||||||
|
// A config packet is provided for all supported formats except raw audio
|
||||||
|
recorder->audio_expects_config_packet =
|
||||||
|
ctx->codec_id != AV_CODEC_ID_PCM_S16LE;
|
||||||
|
|
||||||
recorder->audio_init = true;
|
recorder->audio_init = true;
|
||||||
sc_cond_signal(&recorder->cond);
|
sc_cond_signal(&recorder->cond);
|
||||||
sc_mutex_unlock(&recorder->mutex);
|
sc_mutex_unlock(&recorder->mutex);
|
||||||
@ -679,7 +736,10 @@ sc_recorder_stream_init(struct sc_recorder_stream *stream) {
|
|||||||
bool
|
bool
|
||||||
sc_recorder_init(struct sc_recorder *recorder, const char *filename,
|
sc_recorder_init(struct sc_recorder *recorder, const char *filename,
|
||||||
enum sc_record_format format, bool video, bool audio,
|
enum sc_record_format format, bool video, bool audio,
|
||||||
|
enum sc_orientation orientation,
|
||||||
const struct sc_recorder_callbacks *cbs, void *cbs_userdata) {
|
const struct sc_recorder_callbacks *cbs, void *cbs_userdata) {
|
||||||
|
assert(!sc_orientation_is_mirror(orientation));
|
||||||
|
|
||||||
recorder->filename = strdup(filename);
|
recorder->filename = strdup(filename);
|
||||||
if (!recorder->filename) {
|
if (!recorder->filename) {
|
||||||
LOG_OOM();
|
LOG_OOM();
|
||||||
@ -700,6 +760,8 @@ sc_recorder_init(struct sc_recorder *recorder, const char *filename,
|
|||||||
recorder->video = video;
|
recorder->video = video;
|
||||||
recorder->audio = audio;
|
recorder->audio = audio;
|
||||||
|
|
||||||
|
recorder->orientation = orientation;
|
||||||
|
|
||||||
sc_vecdeque_init(&recorder->video_queue);
|
sc_vecdeque_init(&recorder->video_queue);
|
||||||
sc_vecdeque_init(&recorder->audio_queue);
|
sc_vecdeque_init(&recorder->audio_queue);
|
||||||
recorder->stopped = false;
|
recorder->stopped = false;
|
||||||
@ -707,6 +769,8 @@ sc_recorder_init(struct sc_recorder *recorder, const char *filename,
|
|||||||
recorder->video_init = false;
|
recorder->video_init = false;
|
||||||
recorder->audio_init = false;
|
recorder->audio_init = false;
|
||||||
|
|
||||||
|
recorder->audio_expects_config_packet = false;
|
||||||
|
|
||||||
sc_recorder_stream_init(&recorder->video_stream);
|
sc_recorder_stream_init(&recorder->video_stream);
|
||||||
sc_recorder_stream_init(&recorder->audio_stream);
|
sc_recorder_stream_init(&recorder->audio_stream);
|
||||||
|
|
||||||
|
@ -34,6 +34,8 @@ struct sc_recorder {
|
|||||||
bool audio;
|
bool audio;
|
||||||
bool video;
|
bool video;
|
||||||
|
|
||||||
|
enum sc_orientation orientation;
|
||||||
|
|
||||||
char *filename;
|
char *filename;
|
||||||
enum sc_record_format format;
|
enum sc_record_format format;
|
||||||
AVFormatContext *ctx;
|
AVFormatContext *ctx;
|
||||||
@ -50,6 +52,8 @@ struct sc_recorder {
|
|||||||
bool video_init;
|
bool video_init;
|
||||||
bool audio_init;
|
bool audio_init;
|
||||||
|
|
||||||
|
bool audio_expects_config_packet;
|
||||||
|
|
||||||
struct sc_recorder_stream video_stream;
|
struct sc_recorder_stream video_stream;
|
||||||
struct sc_recorder_stream audio_stream;
|
struct sc_recorder_stream audio_stream;
|
||||||
|
|
||||||
@ -65,6 +69,7 @@ struct sc_recorder_callbacks {
|
|||||||
bool
|
bool
|
||||||
sc_recorder_init(struct sc_recorder *recorder, const char *filename,
|
sc_recorder_init(struct sc_recorder *recorder, const char *filename,
|
||||||
enum sc_record_format format, bool video, bool audio,
|
enum sc_record_format format, bool video, bool audio,
|
||||||
|
enum sc_orientation orientation,
|
||||||
const struct sc_recorder_callbacks *cbs, void *cbs_userdata);
|
const struct sc_recorder_callbacks *cbs, void *cbs_userdata);
|
||||||
|
|
||||||
bool
|
bool
|
||||||
|
246
app/src/scrcpy.c
246
app/src/scrcpy.c
@ -20,15 +20,17 @@
|
|||||||
#include "demuxer.h"
|
#include "demuxer.h"
|
||||||
#include "events.h"
|
#include "events.h"
|
||||||
#include "file_pusher.h"
|
#include "file_pusher.h"
|
||||||
#include "keyboard_inject.h"
|
#include "keyboard_sdk.h"
|
||||||
#include "mouse_inject.h"
|
#include "mouse_sdk.h"
|
||||||
#include "recorder.h"
|
#include "recorder.h"
|
||||||
#include "screen.h"
|
#include "screen.h"
|
||||||
#include "server.h"
|
#include "server.h"
|
||||||
|
#include "uhid/keyboard_uhid.h"
|
||||||
|
#include "uhid/mouse_uhid.h"
|
||||||
#ifdef HAVE_USB
|
#ifdef HAVE_USB
|
||||||
# include "usb/aoa_hid.h"
|
# include "usb/aoa_hid.h"
|
||||||
# include "usb/hid_keyboard.h"
|
# include "usb/keyboard_aoa.h"
|
||||||
# include "usb/hid_mouse.h"
|
# include "usb/mouse_aoa.h"
|
||||||
# include "usb/usb.h"
|
# include "usb/usb.h"
|
||||||
#endif
|
#endif
|
||||||
#include "util/acksync.h"
|
#include "util/acksync.h"
|
||||||
@ -61,17 +63,20 @@ struct scrcpy {
|
|||||||
struct sc_aoa aoa;
|
struct sc_aoa aoa;
|
||||||
// sequence/ack helper to synchronize clipboard and Ctrl+v via HID
|
// sequence/ack helper to synchronize clipboard and Ctrl+v via HID
|
||||||
struct sc_acksync acksync;
|
struct sc_acksync acksync;
|
||||||
|
struct sc_uhid_devices uhid_devices;
|
||||||
#endif
|
#endif
|
||||||
union {
|
union {
|
||||||
struct sc_keyboard_inject keyboard_inject;
|
struct sc_keyboard_sdk keyboard_sdk;
|
||||||
|
struct sc_keyboard_uhid keyboard_uhid;
|
||||||
#ifdef HAVE_USB
|
#ifdef HAVE_USB
|
||||||
struct sc_hid_keyboard keyboard_hid;
|
struct sc_keyboard_aoa keyboard_aoa;
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
union {
|
union {
|
||||||
struct sc_mouse_inject mouse_inject;
|
struct sc_mouse_sdk mouse_sdk;
|
||||||
|
struct sc_mouse_uhid mouse_uhid;
|
||||||
#ifdef HAVE_USB
|
#ifdef HAVE_USB
|
||||||
struct sc_hid_mouse mouse_hid;
|
struct sc_mouse_aoa mouse_aoa;
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
struct sc_timeout timeout;
|
struct sc_timeout timeout;
|
||||||
@ -90,7 +95,7 @@ push_event(uint32_t type, const char *name) {
|
|||||||
#define PUSH_EVENT(TYPE) push_event(TYPE, # TYPE)
|
#define PUSH_EVENT(TYPE) push_event(TYPE, # TYPE)
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
BOOL WINAPI windows_ctrl_handler(DWORD ctrl_type) {
|
static BOOL WINAPI windows_ctrl_handler(DWORD ctrl_type) {
|
||||||
if (ctrl_type == CTRL_C_EVENT) {
|
if (ctrl_type == CTRL_C_EVENT) {
|
||||||
PUSH_EVENT(SDL_QUIT);
|
PUSH_EVENT(SDL_QUIT);
|
||||||
return TRUE;
|
return TRUE;
|
||||||
@ -101,7 +106,6 @@ BOOL WINAPI windows_ctrl_handler(DWORD ctrl_type) {
|
|||||||
|
|
||||||
static void
|
static void
|
||||||
sdl_set_hints(const char *render_driver) {
|
sdl_set_hints(const char *render_driver) {
|
||||||
|
|
||||||
if (render_driver && !SDL_SetHint(SDL_HINT_RENDER_DRIVER, render_driver)) {
|
if (render_driver && !SDL_SetHint(SDL_HINT_RENDER_DRIVER, render_driver)) {
|
||||||
LOGW("Could not set render driver");
|
LOGW("Could not set render driver");
|
||||||
}
|
}
|
||||||
@ -170,6 +174,9 @@ event_loop(struct scrcpy *s) {
|
|||||||
case SC_EVENT_DEMUXER_ERROR:
|
case SC_EVENT_DEMUXER_ERROR:
|
||||||
LOGE("Demuxer error");
|
LOGE("Demuxer error");
|
||||||
return SCRCPY_EXIT_FAILURE;
|
return SCRCPY_EXIT_FAILURE;
|
||||||
|
case SC_EVENT_CONTROLLER_ERROR:
|
||||||
|
LOGE("Controller error");
|
||||||
|
return SCRCPY_EXIT_FAILURE;
|
||||||
case SC_EVENT_RECORDER_ERROR:
|
case SC_EVENT_RECORDER_ERROR:
|
||||||
LOGE("Recorder error");
|
LOGE("Recorder error");
|
||||||
return SCRCPY_EXIT_FAILURE;
|
return SCRCPY_EXIT_FAILURE;
|
||||||
@ -261,6 +268,16 @@ sc_audio_demuxer_on_ended(struct sc_demuxer *demuxer,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
sc_controller_on_error(struct sc_controller *controller, void *userdata) {
|
||||||
|
// Note: this function may be called twice, once from the controller thread
|
||||||
|
// and once from the receiver thread
|
||||||
|
(void) controller;
|
||||||
|
(void) userdata;
|
||||||
|
|
||||||
|
PUSH_EVENT(SC_EVENT_CONTROLLER_ERROR);
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
sc_server_on_connection_failed(struct sc_server *server, void *userdata) {
|
sc_server_on_connection_failed(struct sc_server *server, void *userdata) {
|
||||||
(void) server;
|
(void) server;
|
||||||
@ -297,7 +314,7 @@ sc_timeout_on_timeout(struct sc_timeout *timeout, void *userdata) {
|
|||||||
|
|
||||||
// Generate a scrcpy id to differentiate multiple running scrcpy instances
|
// Generate a scrcpy id to differentiate multiple running scrcpy instances
|
||||||
static uint32_t
|
static uint32_t
|
||||||
scrcpy_generate_scid() {
|
scrcpy_generate_scid(void) {
|
||||||
struct sc_rand rand;
|
struct sc_rand rand;
|
||||||
sc_rand_init(&rand);
|
sc_rand_init(&rand);
|
||||||
// Only use 31 bits to avoid issues with signed values on the Java-side
|
// Only use 31 bits to avoid issues with signed values on the Java-side
|
||||||
@ -307,6 +324,10 @@ scrcpy_generate_scid() {
|
|||||||
enum scrcpy_exit_code
|
enum scrcpy_exit_code
|
||||||
scrcpy(struct scrcpy_options *options) {
|
scrcpy(struct scrcpy_options *options) {
|
||||||
static struct scrcpy scrcpy;
|
static struct scrcpy scrcpy;
|
||||||
|
#ifndef NDEBUG
|
||||||
|
// Detect missing initializations
|
||||||
|
memset(&scrcpy, 42, sizeof(scrcpy));
|
||||||
|
#endif
|
||||||
struct scrcpy *s = &scrcpy;
|
struct scrcpy *s = &scrcpy;
|
||||||
|
|
||||||
// Minimal SDL initialization
|
// Minimal SDL initialization
|
||||||
@ -330,8 +351,8 @@ scrcpy(struct scrcpy_options *options) {
|
|||||||
bool audio_demuxer_started = false;
|
bool audio_demuxer_started = false;
|
||||||
#ifdef HAVE_USB
|
#ifdef HAVE_USB
|
||||||
bool aoa_hid_initialized = false;
|
bool aoa_hid_initialized = false;
|
||||||
bool hid_keyboard_initialized = false;
|
bool keyboard_aoa_initialized = false;
|
||||||
bool hid_mouse_initialized = false;
|
bool mouse_aoa_initialized = false;
|
||||||
#endif
|
#endif
|
||||||
bool controller_initialized = false;
|
bool controller_initialized = false;
|
||||||
bool controller_started = false;
|
bool controller_started = false;
|
||||||
@ -340,6 +361,7 @@ scrcpy(struct scrcpy_options *options) {
|
|||||||
bool timeout_started = false;
|
bool timeout_started = false;
|
||||||
|
|
||||||
struct sc_acksync *acksync = NULL;
|
struct sc_acksync *acksync = NULL;
|
||||||
|
struct sc_uhid_devices *uhid_devices = NULL;
|
||||||
|
|
||||||
uint32_t scid = scrcpy_generate_scid();
|
uint32_t scid = scrcpy_generate_scid();
|
||||||
|
|
||||||
@ -351,7 +373,9 @@ scrcpy(struct scrcpy_options *options) {
|
|||||||
.log_level = options->log_level,
|
.log_level = options->log_level,
|
||||||
.video_codec = options->video_codec,
|
.video_codec = options->video_codec,
|
||||||
.audio_codec = options->audio_codec,
|
.audio_codec = options->audio_codec,
|
||||||
|
.video_source = options->video_source,
|
||||||
.audio_source = options->audio_source,
|
.audio_source = options->audio_source,
|
||||||
|
.camera_facing = options->camera_facing,
|
||||||
.crop = options->crop,
|
.crop = options->crop,
|
||||||
.port_range = options->port_range,
|
.port_range = options->port_range,
|
||||||
.tunnel_host = options->tunnel_host,
|
.tunnel_host = options->tunnel_host,
|
||||||
@ -371,6 +395,10 @@ scrcpy(struct scrcpy_options *options) {
|
|||||||
.audio_codec_options = options->audio_codec_options,
|
.audio_codec_options = options->audio_codec_options,
|
||||||
.video_encoder = options->video_encoder,
|
.video_encoder = options->video_encoder,
|
||||||
.audio_encoder = options->audio_encoder,
|
.audio_encoder = options->audio_encoder,
|
||||||
|
.camera_id = options->camera_id,
|
||||||
|
.camera_size = options->camera_size,
|
||||||
|
.camera_ar = options->camera_ar,
|
||||||
|
.camera_fps = options->camera_fps,
|
||||||
.force_adb_forward = options->force_adb_forward,
|
.force_adb_forward = options->force_adb_forward,
|
||||||
.power_off_on_close = options->power_off_on_close,
|
.power_off_on_close = options->power_off_on_close,
|
||||||
.clipboard_autosync = options->clipboard_autosync,
|
.clipboard_autosync = options->clipboard_autosync,
|
||||||
@ -379,9 +407,9 @@ scrcpy(struct scrcpy_options *options) {
|
|||||||
.tcpip_dst = options->tcpip_dst,
|
.tcpip_dst = options->tcpip_dst,
|
||||||
.cleanup = options->cleanup,
|
.cleanup = options->cleanup,
|
||||||
.power_on = options->power_on,
|
.power_on = options->power_on,
|
||||||
.list_encoders = options->list_encoders,
|
|
||||||
.list_displays = options->list_displays,
|
|
||||||
.kill_adb_on_close = options->kill_adb_on_close,
|
.kill_adb_on_close = options->kill_adb_on_close,
|
||||||
|
.camera_high_speed = options->camera_high_speed,
|
||||||
|
.list = options->list,
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct sc_server_callbacks cbs = {
|
static const struct sc_server_callbacks cbs = {
|
||||||
@ -393,13 +421,19 @@ scrcpy(struct scrcpy_options *options) {
|
|||||||
return SCRCPY_EXIT_FAILURE;
|
return SCRCPY_EXIT_FAILURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (options->window) {
|
||||||
|
// Set hints before starting the server thread to avoid race conditions
|
||||||
|
// in SDL
|
||||||
|
sdl_set_hints(options->render_driver);
|
||||||
|
}
|
||||||
|
|
||||||
if (!sc_server_start(&s->server)) {
|
if (!sc_server_start(&s->server)) {
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
|
||||||
server_started = true;
|
server_started = true;
|
||||||
|
|
||||||
if (options->list_encoders || options->list_displays) {
|
if (options->list) {
|
||||||
bool ok = await_for_server(NULL);
|
bool ok = await_for_server(NULL);
|
||||||
ret = ok ? SCRCPY_EXIT_SUCCESS : SCRCPY_EXIT_FAILURE;
|
ret = ok ? SCRCPY_EXIT_SUCCESS : SCRCPY_EXIT_FAILURE;
|
||||||
goto end;
|
goto end;
|
||||||
@ -409,11 +443,20 @@ scrcpy(struct scrcpy_options *options) {
|
|||||||
assert(!options->video_playback || options->video);
|
assert(!options->video_playback || options->video);
|
||||||
assert(!options->audio_playback || options->audio);
|
assert(!options->audio_playback || options->audio);
|
||||||
|
|
||||||
if (options->video_playback) {
|
if (options->window ||
|
||||||
sdl_set_hints(options->render_driver);
|
(options->control && options->clipboard_autosync)) {
|
||||||
|
// Initialize the video subsystem even if --no-video or
|
||||||
|
// --no-video-playback is passed so that clipboard synchronization
|
||||||
|
// still works.
|
||||||
|
// <https://github.com/Genymobile/scrcpy/issues/4418>
|
||||||
if (SDL_Init(SDL_INIT_VIDEO)) {
|
if (SDL_Init(SDL_INIT_VIDEO)) {
|
||||||
LOGE("Could not initialize SDL video: %s", SDL_GetError());
|
// If it fails, it is an error only if video playback is enabled
|
||||||
goto end;
|
if (options->video_playback) {
|
||||||
|
LOGE("Could not initialize SDL video: %s", SDL_GetError());
|
||||||
|
goto end;
|
||||||
|
} else {
|
||||||
|
LOGW("Could not initialize SDL video: %s", SDL_GetError());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -497,7 +540,8 @@ scrcpy(struct scrcpy_options *options) {
|
|||||||
};
|
};
|
||||||
if (!sc_recorder_init(&s->recorder, options->record_filename,
|
if (!sc_recorder_init(&s->recorder, options->record_filename,
|
||||||
options->record_format, options->video,
|
options->record_format, options->video,
|
||||||
options->audio, &recorder_cbs, NULL)) {
|
options->audio, options->record_orientation,
|
||||||
|
&recorder_cbs, NULL)) {
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
recorder_initialized = true;
|
recorder_initialized = true;
|
||||||
@ -522,12 +566,24 @@ scrcpy(struct scrcpy_options *options) {
|
|||||||
struct sc_mouse_processor *mp = NULL;
|
struct sc_mouse_processor *mp = NULL;
|
||||||
|
|
||||||
if (options->control) {
|
if (options->control) {
|
||||||
|
static const struct sc_controller_callbacks controller_cbs = {
|
||||||
|
.on_error = sc_controller_on_error,
|
||||||
|
};
|
||||||
|
|
||||||
|
if (!sc_controller_init(&s->controller, s->server.control_socket,
|
||||||
|
&controller_cbs, NULL)) {
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
|
controller_initialized = true;
|
||||||
|
|
||||||
|
controller = &s->controller;
|
||||||
|
|
||||||
#ifdef HAVE_USB
|
#ifdef HAVE_USB
|
||||||
bool use_hid_keyboard =
|
bool use_keyboard_aoa =
|
||||||
options->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_HID;
|
options->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_AOA;
|
||||||
bool use_hid_mouse =
|
bool use_mouse_aoa =
|
||||||
options->mouse_input_mode == SC_MOUSE_INPUT_MODE_HID;
|
options->mouse_input_mode == SC_MOUSE_INPUT_MODE_AOA;
|
||||||
if (use_hid_keyboard || use_hid_mouse) {
|
if (use_keyboard_aoa || use_mouse_aoa) {
|
||||||
bool ok = sc_acksync_init(&s->acksync);
|
bool ok = sc_acksync_init(&s->acksync);
|
||||||
if (!ok) {
|
if (!ok) {
|
||||||
goto end;
|
goto end;
|
||||||
@ -537,7 +593,7 @@ scrcpy(struct scrcpy_options *options) {
|
|||||||
if (!ok) {
|
if (!ok) {
|
||||||
LOGE("Failed to initialize USB");
|
LOGE("Failed to initialize USB");
|
||||||
sc_acksync_destroy(&s->acksync);
|
sc_acksync_destroy(&s->acksync);
|
||||||
goto aoa_hid_end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
|
||||||
assert(serial);
|
assert(serial);
|
||||||
@ -545,7 +601,7 @@ scrcpy(struct scrcpy_options *options) {
|
|||||||
ok = sc_usb_select_device(&s->usb, serial, &usb_device);
|
ok = sc_usb_select_device(&s->usb, serial, &usb_device);
|
||||||
if (!ok) {
|
if (!ok) {
|
||||||
sc_usb_destroy(&s->usb);
|
sc_usb_destroy(&s->usb);
|
||||||
goto aoa_hid_end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
|
||||||
LOGI("USB device: %s (%04" PRIx16 ":%04" PRIx16 ") %s %s",
|
LOGI("USB device: %s (%04" PRIx16 ":%04" PRIx16 ") %s %s",
|
||||||
@ -558,7 +614,7 @@ scrcpy(struct scrcpy_options *options) {
|
|||||||
LOGE("Failed to connect to USB device %s", serial);
|
LOGE("Failed to connect to USB device %s", serial);
|
||||||
sc_usb_destroy(&s->usb);
|
sc_usb_destroy(&s->usb);
|
||||||
sc_acksync_destroy(&s->acksync);
|
sc_acksync_destroy(&s->acksync);
|
||||||
goto aoa_hid_end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
|
||||||
ok = sc_aoa_init(&s->aoa, &s->usb, &s->acksync);
|
ok = sc_aoa_init(&s->aoa, &s->usb, &s->acksync);
|
||||||
@ -567,105 +623,91 @@ scrcpy(struct scrcpy_options *options) {
|
|||||||
sc_usb_disconnect(&s->usb);
|
sc_usb_disconnect(&s->usb);
|
||||||
sc_usb_destroy(&s->usb);
|
sc_usb_destroy(&s->usb);
|
||||||
sc_acksync_destroy(&s->acksync);
|
sc_acksync_destroy(&s->acksync);
|
||||||
goto aoa_hid_end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (use_hid_keyboard) {
|
if (use_keyboard_aoa) {
|
||||||
if (sc_hid_keyboard_init(&s->keyboard_hid, &s->aoa)) {
|
if (sc_keyboard_aoa_init(&s->keyboard_aoa, &s->aoa)) {
|
||||||
hid_keyboard_initialized = true;
|
keyboard_aoa_initialized = true;
|
||||||
kp = &s->keyboard_hid.key_processor;
|
kp = &s->keyboard_aoa.key_processor;
|
||||||
} else {
|
} else {
|
||||||
LOGE("Could not initialize HID keyboard");
|
LOGE("Could not initialize HID keyboard");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (use_hid_mouse) {
|
if (use_mouse_aoa) {
|
||||||
if (sc_hid_mouse_init(&s->mouse_hid, &s->aoa)) {
|
if (sc_mouse_aoa_init(&s->mouse_aoa, &s->aoa)) {
|
||||||
hid_mouse_initialized = true;
|
mouse_aoa_initialized = true;
|
||||||
mp = &s->mouse_hid.mouse_processor;
|
mp = &s->mouse_aoa.mouse_processor;
|
||||||
} else {
|
} else {
|
||||||
LOGE("Could not initialized HID mouse");
|
LOGE("Could not initialized HID mouse");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool need_aoa = hid_keyboard_initialized || hid_mouse_initialized;
|
bool need_aoa = keyboard_aoa_initialized || mouse_aoa_initialized;
|
||||||
|
|
||||||
if (!need_aoa || !sc_aoa_start(&s->aoa)) {
|
if (!need_aoa || !sc_aoa_start(&s->aoa)) {
|
||||||
sc_acksync_destroy(&s->acksync);
|
sc_acksync_destroy(&s->acksync);
|
||||||
sc_usb_disconnect(&s->usb);
|
sc_usb_disconnect(&s->usb);
|
||||||
sc_usb_destroy(&s->usb);
|
sc_usb_destroy(&s->usb);
|
||||||
sc_aoa_destroy(&s->aoa);
|
sc_aoa_destroy(&s->aoa);
|
||||||
goto aoa_hid_end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
|
||||||
acksync = &s->acksync;
|
acksync = &s->acksync;
|
||||||
|
|
||||||
aoa_hid_initialized = true;
|
aoa_hid_initialized = true;
|
||||||
|
|
||||||
aoa_hid_end:
|
|
||||||
if (!aoa_hid_initialized) {
|
|
||||||
if (hid_keyboard_initialized) {
|
|
||||||
sc_hid_keyboard_destroy(&s->keyboard_hid);
|
|
||||||
hid_keyboard_initialized = false;
|
|
||||||
}
|
|
||||||
if (hid_mouse_initialized) {
|
|
||||||
sc_hid_mouse_destroy(&s->mouse_hid);
|
|
||||||
hid_mouse_initialized = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (use_hid_keyboard && !hid_keyboard_initialized) {
|
|
||||||
LOGE("Fallback to default keyboard injection method "
|
|
||||||
"(-K/--hid-keyboard ignored)");
|
|
||||||
options->keyboard_input_mode = SC_KEYBOARD_INPUT_MODE_INJECT;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (use_hid_mouse && !hid_mouse_initialized) {
|
|
||||||
LOGE("Fallback to default mouse injection method "
|
|
||||||
"(-M/--hid-mouse ignored)");
|
|
||||||
options->mouse_input_mode = SC_MOUSE_INPUT_MODE_INJECT;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
assert(options->keyboard_input_mode != SC_KEYBOARD_INPUT_MODE_HID);
|
assert(options->keyboard_input_mode != SC_KEYBOARD_INPUT_MODE_AOA);
|
||||||
assert(options->mouse_input_mode != SC_MOUSE_INPUT_MODE_HID);
|
assert(options->mouse_input_mode != SC_MOUSE_INPUT_MODE_AOA);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// keyboard_input_mode may have been reset if HID mode failed
|
if (options->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_SDK) {
|
||||||
if (options->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_INJECT) {
|
sc_keyboard_sdk_init(&s->keyboard_sdk, &s->controller,
|
||||||
sc_keyboard_inject_init(&s->keyboard_inject, &s->controller,
|
options->key_inject_mode,
|
||||||
options->key_inject_mode,
|
options->forward_key_repeat);
|
||||||
options->forward_key_repeat);
|
kp = &s->keyboard_sdk.key_processor;
|
||||||
kp = &s->keyboard_inject.key_processor;
|
} else if (options->keyboard_input_mode
|
||||||
|
== SC_KEYBOARD_INPUT_MODE_UHID) {
|
||||||
|
sc_uhid_devices_init(&s->uhid_devices);
|
||||||
|
bool ok = sc_keyboard_uhid_init(&s->keyboard_uhid, &s->controller,
|
||||||
|
&s->uhid_devices);
|
||||||
|
if (!ok) {
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
|
uhid_devices = &s->uhid_devices;
|
||||||
|
kp = &s->keyboard_uhid.key_processor;
|
||||||
}
|
}
|
||||||
|
|
||||||
// mouse_input_mode may have been reset if HID mode failed
|
if (options->mouse_input_mode == SC_MOUSE_INPUT_MODE_SDK) {
|
||||||
if (options->mouse_input_mode == SC_MOUSE_INPUT_MODE_INJECT) {
|
sc_mouse_sdk_init(&s->mouse_sdk, &s->controller);
|
||||||
sc_mouse_inject_init(&s->mouse_inject, &s->controller);
|
mp = &s->mouse_sdk.mouse_processor;
|
||||||
mp = &s->mouse_inject.mouse_processor;
|
} else if (options->mouse_input_mode == SC_MOUSE_INPUT_MODE_UHID) {
|
||||||
|
bool ok = sc_mouse_uhid_init(&s->mouse_uhid, &s->controller);
|
||||||
|
if (!ok) {
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
|
mp = &s->mouse_uhid.mouse_processor;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!sc_controller_init(&s->controller, s->server.control_socket,
|
sc_controller_configure(&s->controller, acksync, uhid_devices);
|
||||||
acksync)) {
|
|
||||||
goto end;
|
|
||||||
}
|
|
||||||
controller_initialized = true;
|
|
||||||
|
|
||||||
if (!sc_controller_start(&s->controller)) {
|
if (!sc_controller_start(&s->controller)) {
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
controller_started = true;
|
controller_started = true;
|
||||||
controller = &s->controller;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// There is a controller if and only if control is enabled
|
// There is a controller if and only if control is enabled
|
||||||
assert(options->control == !!controller);
|
assert(options->control == !!controller);
|
||||||
|
|
||||||
if (options->video_playback) {
|
if (options->window) {
|
||||||
const char *window_title =
|
const char *window_title =
|
||||||
options->window_title ? options->window_title : info->device_name;
|
options->window_title ? options->window_title : info->device_name;
|
||||||
|
|
||||||
struct sc_screen_params screen_params = {
|
struct sc_screen_params screen_params = {
|
||||||
|
.video = options->video_playback,
|
||||||
.controller = controller,
|
.controller = controller,
|
||||||
.fp = fp,
|
.fp = fp,
|
||||||
.kp = kp,
|
.kp = kp,
|
||||||
@ -681,18 +723,21 @@ aoa_hid_end:
|
|||||||
.window_width = options->window_width,
|
.window_width = options->window_width,
|
||||||
.window_height = options->window_height,
|
.window_height = options->window_height,
|
||||||
.window_borderless = options->window_borderless,
|
.window_borderless = options->window_borderless,
|
||||||
.rotation = options->rotation,
|
.orientation = options->display_orientation,
|
||||||
.mipmaps = options->mipmaps,
|
.mipmaps = options->mipmaps,
|
||||||
.fullscreen = options->fullscreen,
|
.fullscreen = options->fullscreen,
|
||||||
.start_fps_counter = options->start_fps_counter,
|
.start_fps_counter = options->start_fps_counter,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct sc_frame_source *src = &s->video_decoder.frame_source;
|
struct sc_frame_source *src;
|
||||||
if (options->display_buffer) {
|
if (options->video_playback) {
|
||||||
sc_delay_buffer_init(&s->display_buffer, options->display_buffer,
|
src = &s->video_decoder.frame_source;
|
||||||
true);
|
if (options->display_buffer) {
|
||||||
sc_frame_source_add_sink(src, &s->display_buffer.frame_sink);
|
sc_delay_buffer_init(&s->display_buffer,
|
||||||
src = &s->display_buffer.frame_source;
|
options->display_buffer, true);
|
||||||
|
sc_frame_source_add_sink(src, &s->display_buffer.frame_sink);
|
||||||
|
src = &s->display_buffer.frame_source;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!sc_screen_init(&s->screen, &screen_params)) {
|
if (!sc_screen_init(&s->screen, &screen_params)) {
|
||||||
@ -700,7 +745,9 @@ aoa_hid_end:
|
|||||||
}
|
}
|
||||||
screen_initialized = true;
|
screen_initialized = true;
|
||||||
|
|
||||||
sc_frame_source_add_sink(src, &s->screen.frame_sink);
|
if (options->video_playback) {
|
||||||
|
sc_frame_source_add_sink(src, &s->screen.frame_sink);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (options->audio_playback) {
|
if (options->audio_playback) {
|
||||||
@ -782,9 +829,12 @@ aoa_hid_end:
|
|||||||
ret = event_loop(s);
|
ret = event_loop(s);
|
||||||
LOGD("quit...");
|
LOGD("quit...");
|
||||||
|
|
||||||
// Close the window immediately on closing, because screen_destroy() may
|
if (options->video_playback) {
|
||||||
// only be called once the video demuxer thread is joined (it may take time)
|
// Close the window immediately on closing, because screen_destroy()
|
||||||
sc_screen_hide_window(&s->screen);
|
// may only be called once the video demuxer thread is joined (it may
|
||||||
|
// take time)
|
||||||
|
sc_screen_hide_window(&s->screen);
|
||||||
|
}
|
||||||
|
|
||||||
end:
|
end:
|
||||||
if (timeout_started) {
|
if (timeout_started) {
|
||||||
@ -795,11 +845,11 @@ end:
|
|||||||
// end-of-stream
|
// end-of-stream
|
||||||
#ifdef HAVE_USB
|
#ifdef HAVE_USB
|
||||||
if (aoa_hid_initialized) {
|
if (aoa_hid_initialized) {
|
||||||
if (hid_keyboard_initialized) {
|
if (keyboard_aoa_initialized) {
|
||||||
sc_hid_keyboard_destroy(&s->keyboard_hid);
|
sc_keyboard_aoa_destroy(&s->keyboard_aoa);
|
||||||
}
|
}
|
||||||
if (hid_mouse_initialized) {
|
if (mouse_aoa_initialized) {
|
||||||
sc_hid_mouse_destroy(&s->mouse_hid);
|
sc_mouse_aoa_destroy(&s->mouse_aoa);
|
||||||
}
|
}
|
||||||
sc_aoa_stop(&s->aoa);
|
sc_aoa_stop(&s->aoa);
|
||||||
sc_usb_stop(&s->usb);
|
sc_usb_stop(&s->usb);
|
||||||
|
256
app/src/screen.c
256
app/src/screen.c
@ -14,16 +14,16 @@
|
|||||||
#define DOWNCAST(SINK) container_of(SINK, struct sc_screen, frame_sink)
|
#define DOWNCAST(SINK) container_of(SINK, struct sc_screen, frame_sink)
|
||||||
|
|
||||||
static inline struct sc_size
|
static inline struct sc_size
|
||||||
get_rotated_size(struct sc_size size, int rotation) {
|
get_oriented_size(struct sc_size size, enum sc_orientation orientation) {
|
||||||
struct sc_size rotated_size;
|
struct sc_size oriented_size;
|
||||||
if (rotation & 1) {
|
if (sc_orientation_is_swap(orientation)) {
|
||||||
rotated_size.width = size.height;
|
oriented_size.width = size.height;
|
||||||
rotated_size.height = size.width;
|
oriented_size.height = size.width;
|
||||||
} else {
|
} else {
|
||||||
rotated_size.width = size.width;
|
oriented_size.width = size.width;
|
||||||
rotated_size.height = size.height;
|
oriented_size.height = size.height;
|
||||||
}
|
}
|
||||||
return rotated_size;
|
return oriented_size;
|
||||||
}
|
}
|
||||||
|
|
||||||
// get the window size in a struct sc_size
|
// get the window size in a struct sc_size
|
||||||
@ -205,6 +205,8 @@ sc_screen_toggle_mouse_capture(struct sc_screen *screen) {
|
|||||||
|
|
||||||
static void
|
static void
|
||||||
sc_screen_update_content_rect(struct sc_screen *screen) {
|
sc_screen_update_content_rect(struct sc_screen *screen) {
|
||||||
|
assert(screen->video);
|
||||||
|
|
||||||
int dw;
|
int dw;
|
||||||
int dh;
|
int dh;
|
||||||
SDL_GL_GetDrawableSize(screen->window, &dw, &dh);
|
SDL_GL_GetDrawableSize(screen->window, &dw, &dh);
|
||||||
@ -246,12 +248,21 @@ sc_screen_update_content_rect(struct sc_screen *screen) {
|
|||||||
// changed, so that the content rectangle is recomputed
|
// changed, so that the content rectangle is recomputed
|
||||||
static void
|
static void
|
||||||
sc_screen_render(struct sc_screen *screen, bool update_content_rect) {
|
sc_screen_render(struct sc_screen *screen, bool update_content_rect) {
|
||||||
|
assert(screen->video);
|
||||||
|
|
||||||
if (update_content_rect) {
|
if (update_content_rect) {
|
||||||
sc_screen_update_content_rect(screen);
|
sc_screen_update_content_rect(screen);
|
||||||
}
|
}
|
||||||
|
|
||||||
enum sc_display_result res =
|
enum sc_display_result res =
|
||||||
sc_display_render(&screen->display, &screen->rect, screen->rotation);
|
sc_display_render(&screen->display, &screen->rect, screen->orientation);
|
||||||
|
(void) res; // any error already logged
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
sc_screen_render_novideo(struct sc_screen *screen) {
|
||||||
|
enum sc_display_result res =
|
||||||
|
sc_display_render(&screen->display, NULL, SC_ORIENTATION_0);
|
||||||
(void) res; // any error already logged
|
(void) res; // any error already logged
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -268,6 +279,8 @@ sc_screen_render(struct sc_screen *screen, bool update_content_rect) {
|
|||||||
static int
|
static int
|
||||||
event_watcher(void *data, SDL_Event *event) {
|
event_watcher(void *data, SDL_Event *event) {
|
||||||
struct sc_screen *screen = data;
|
struct sc_screen *screen = data;
|
||||||
|
assert(screen->video);
|
||||||
|
|
||||||
if (event->type == SDL_WINDOWEVENT
|
if (event->type == SDL_WINDOWEVENT
|
||||||
&& event->window.event == SDL_WINDOWEVENT_RESIZED) {
|
&& event->window.event == SDL_WINDOWEVENT_RESIZED) {
|
||||||
// In practice, it seems to always be called from the same thread in
|
// In practice, it seems to always be called from the same thread in
|
||||||
@ -326,6 +339,7 @@ sc_screen_frame_sink_close(struct sc_frame_sink *sink) {
|
|||||||
static bool
|
static bool
|
||||||
sc_screen_frame_sink_push(struct sc_frame_sink *sink, const AVFrame *frame) {
|
sc_screen_frame_sink_push(struct sc_frame_sink *sink, const AVFrame *frame) {
|
||||||
struct sc_screen *screen = DOWNCAST(sink);
|
struct sc_screen *screen = DOWNCAST(sink);
|
||||||
|
assert(screen->video);
|
||||||
|
|
||||||
bool previous_skipped;
|
bool previous_skipped;
|
||||||
bool ok = sc_frame_buffer_push(&screen->fb, frame, &previous_skipped);
|
bool ok = sc_frame_buffer_push(&screen->fb, frame, &previous_skipped);
|
||||||
@ -362,6 +376,11 @@ sc_screen_init(struct sc_screen *screen,
|
|||||||
screen->maximized = false;
|
screen->maximized = false;
|
||||||
screen->minimized = false;
|
screen->minimized = false;
|
||||||
screen->mouse_capture_key_pressed = 0;
|
screen->mouse_capture_key_pressed = 0;
|
||||||
|
screen->paused = false;
|
||||||
|
screen->resume_frame = NULL;
|
||||||
|
screen->orientation = SC_ORIENTATION_0;
|
||||||
|
|
||||||
|
screen->video = params->video;
|
||||||
|
|
||||||
screen->req.x = params->window_x;
|
screen->req.x = params->window_x;
|
||||||
screen->req.y = params->window_y;
|
screen->req.y = params->window_y;
|
||||||
@ -379,40 +398,75 @@ sc_screen_init(struct sc_screen *screen,
|
|||||||
goto error_destroy_frame_buffer;
|
goto error_destroy_frame_buffer;
|
||||||
}
|
}
|
||||||
|
|
||||||
screen->rotation = params->rotation;
|
if (screen->video) {
|
||||||
if (screen->rotation) {
|
screen->orientation = params->orientation;
|
||||||
LOGI("Initial display rotation set to %u", screen->rotation);
|
if (screen->orientation != SC_ORIENTATION_0) {
|
||||||
|
LOGI("Initial display orientation set to %s",
|
||||||
|
sc_orientation_get_name(screen->orientation));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t window_flags = SDL_WINDOW_HIDDEN
|
uint32_t window_flags = SDL_WINDOW_ALLOW_HIGHDPI;
|
||||||
| SDL_WINDOW_RESIZABLE
|
|
||||||
| SDL_WINDOW_ALLOW_HIGHDPI;
|
|
||||||
if (params->always_on_top) {
|
if (params->always_on_top) {
|
||||||
window_flags |= SDL_WINDOW_ALWAYS_ON_TOP;
|
window_flags |= SDL_WINDOW_ALWAYS_ON_TOP;
|
||||||
}
|
}
|
||||||
if (params->window_borderless) {
|
if (params->window_borderless) {
|
||||||
window_flags |= SDL_WINDOW_BORDERLESS;
|
window_flags |= SDL_WINDOW_BORDERLESS;
|
||||||
}
|
}
|
||||||
|
if (params->video) {
|
||||||
|
// The window will be shown on first frame
|
||||||
|
window_flags |= SDL_WINDOW_HIDDEN
|
||||||
|
| SDL_WINDOW_RESIZABLE;
|
||||||
|
}
|
||||||
|
|
||||||
|
const char *title = params->window_title;
|
||||||
|
assert(title);
|
||||||
|
|
||||||
|
int x = SDL_WINDOWPOS_UNDEFINED;
|
||||||
|
int y = SDL_WINDOWPOS_UNDEFINED;
|
||||||
|
int width = 256;
|
||||||
|
int height = 256;
|
||||||
|
if (params->window_x != SC_WINDOW_POSITION_UNDEFINED) {
|
||||||
|
x = params->window_x;
|
||||||
|
}
|
||||||
|
if (params->window_y != SC_WINDOW_POSITION_UNDEFINED) {
|
||||||
|
y = params->window_y;
|
||||||
|
}
|
||||||
|
if (params->window_width) {
|
||||||
|
width = params->window_width;
|
||||||
|
}
|
||||||
|
if (params->window_height) {
|
||||||
|
height = params->window_height;
|
||||||
|
}
|
||||||
|
|
||||||
// The window will be positioned and sized on first video frame
|
// The window will be positioned and sized on first video frame
|
||||||
screen->window =
|
screen->window = SDL_CreateWindow(title, x, y, width, height, window_flags);
|
||||||
SDL_CreateWindow(params->window_title, 0, 0, 0, 0, window_flags);
|
|
||||||
if (!screen->window) {
|
if (!screen->window) {
|
||||||
LOGE("Could not create window: %s", SDL_GetError());
|
LOGE("Could not create window: %s", SDL_GetError());
|
||||||
goto error_destroy_fps_counter;
|
goto error_destroy_fps_counter;
|
||||||
}
|
}
|
||||||
|
|
||||||
ok = sc_display_init(&screen->display, screen->window, params->mipmaps);
|
|
||||||
if (!ok) {
|
|
||||||
goto error_destroy_window;
|
|
||||||
}
|
|
||||||
|
|
||||||
SDL_Surface *icon = scrcpy_icon_load();
|
SDL_Surface *icon = scrcpy_icon_load();
|
||||||
if (icon) {
|
if (icon) {
|
||||||
SDL_SetWindowIcon(screen->window, icon);
|
SDL_SetWindowIcon(screen->window, icon);
|
||||||
scrcpy_icon_destroy(icon);
|
} else if (params->video) {
|
||||||
} else {
|
// just a warning
|
||||||
LOGW("Could not load icon");
|
LOGW("Could not load icon");
|
||||||
|
} else {
|
||||||
|
// without video, the icon is used as window content, it must be present
|
||||||
|
LOGE("Could not load icon");
|
||||||
|
goto error_destroy_fps_counter;
|
||||||
|
}
|
||||||
|
|
||||||
|
SDL_Surface *icon_novideo = params->video ? NULL : icon;
|
||||||
|
bool mipmaps = params->video && params->mipmaps;
|
||||||
|
ok = sc_display_init(&screen->display, screen->window, icon_novideo,
|
||||||
|
mipmaps);
|
||||||
|
if (icon) {
|
||||||
|
scrcpy_icon_destroy(icon);
|
||||||
|
}
|
||||||
|
if (!ok) {
|
||||||
|
goto error_destroy_window;
|
||||||
}
|
}
|
||||||
|
|
||||||
screen->frame = av_frame_alloc();
|
screen->frame = av_frame_alloc();
|
||||||
@ -436,7 +490,9 @@ sc_screen_init(struct sc_screen *screen,
|
|||||||
sc_input_manager_init(&screen->im, &im_params);
|
sc_input_manager_init(&screen->im, &im_params);
|
||||||
|
|
||||||
#ifdef CONTINUOUS_RESIZING_WORKAROUND
|
#ifdef CONTINUOUS_RESIZING_WORKAROUND
|
||||||
SDL_AddEventWatch(event_watcher, screen);
|
if (screen->video) {
|
||||||
|
SDL_AddEventWatch(event_watcher, screen);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static const struct sc_frame_sink_ops ops = {
|
static const struct sc_frame_sink_ops ops = {
|
||||||
@ -451,6 +507,11 @@ sc_screen_init(struct sc_screen *screen,
|
|||||||
screen->open = false;
|
screen->open = false;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
if (!screen->video && sc_screen_is_relative_mode(screen)) {
|
||||||
|
// Capture mouse immediately if video mirroring is disabled
|
||||||
|
sc_screen_set_mouse_capture(screen, true);
|
||||||
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
error_destroy_display:
|
error_destroy_display:
|
||||||
@ -521,6 +582,8 @@ sc_screen_destroy(struct sc_screen *screen) {
|
|||||||
static void
|
static void
|
||||||
resize_for_content(struct sc_screen *screen, struct sc_size old_content_size,
|
resize_for_content(struct sc_screen *screen, struct sc_size old_content_size,
|
||||||
struct sc_size new_content_size) {
|
struct sc_size new_content_size) {
|
||||||
|
assert(screen->video);
|
||||||
|
|
||||||
struct sc_size window_size = get_window_size(screen);
|
struct sc_size window_size = get_window_size(screen);
|
||||||
struct sc_size target_size = {
|
struct sc_size target_size = {
|
||||||
.width = (uint32_t) window_size.width * new_content_size.width
|
.width = (uint32_t) window_size.width * new_content_size.width
|
||||||
@ -534,6 +597,8 @@ resize_for_content(struct sc_screen *screen, struct sc_size old_content_size,
|
|||||||
|
|
||||||
static void
|
static void
|
||||||
set_content_size(struct sc_screen *screen, struct sc_size new_content_size) {
|
set_content_size(struct sc_screen *screen, struct sc_size new_content_size) {
|
||||||
|
assert(screen->video);
|
||||||
|
|
||||||
if (!screen->fullscreen && !screen->maximized && !screen->minimized) {
|
if (!screen->fullscreen && !screen->maximized && !screen->minimized) {
|
||||||
resize_for_content(screen, screen->content_size, new_content_size);
|
resize_for_content(screen, screen->content_size, new_content_size);
|
||||||
} else if (!screen->resize_pending) {
|
} else if (!screen->resize_pending) {
|
||||||
@ -548,6 +613,8 @@ set_content_size(struct sc_screen *screen, struct sc_size new_content_size) {
|
|||||||
|
|
||||||
static void
|
static void
|
||||||
apply_pending_resize(struct sc_screen *screen) {
|
apply_pending_resize(struct sc_screen *screen) {
|
||||||
|
assert(screen->video);
|
||||||
|
|
||||||
assert(!screen->fullscreen);
|
assert(!screen->fullscreen);
|
||||||
assert(!screen->maximized);
|
assert(!screen->maximized);
|
||||||
assert(!screen->minimized);
|
assert(!screen->minimized);
|
||||||
@ -559,19 +626,21 @@ apply_pending_resize(struct sc_screen *screen) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
sc_screen_set_rotation(struct sc_screen *screen, unsigned rotation) {
|
sc_screen_set_orientation(struct sc_screen *screen,
|
||||||
assert(rotation < 4);
|
enum sc_orientation orientation) {
|
||||||
if (rotation == screen->rotation) {
|
assert(screen->video);
|
||||||
|
|
||||||
|
if (orientation == screen->orientation) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct sc_size new_content_size =
|
struct sc_size new_content_size =
|
||||||
get_rotated_size(screen->frame_size, rotation);
|
get_oriented_size(screen->frame_size, orientation);
|
||||||
|
|
||||||
set_content_size(screen, new_content_size);
|
set_content_size(screen, new_content_size);
|
||||||
|
|
||||||
screen->rotation = rotation;
|
screen->orientation = orientation;
|
||||||
LOGI("Display rotation set to %u", rotation);
|
LOGI("Display orientation set to %s", sc_orientation_get_name(orientation));
|
||||||
|
|
||||||
sc_screen_render(screen, true);
|
sc_screen_render(screen, true);
|
||||||
}
|
}
|
||||||
@ -584,7 +653,7 @@ sc_screen_init_size(struct sc_screen *screen) {
|
|||||||
// The requested size is passed via screen->frame_size
|
// The requested size is passed via screen->frame_size
|
||||||
|
|
||||||
struct sc_size content_size =
|
struct sc_size content_size =
|
||||||
get_rotated_size(screen->frame_size, screen->rotation);
|
get_oriented_size(screen->frame_size, screen->orientation);
|
||||||
screen->content_size = content_size;
|
screen->content_size = content_size;
|
||||||
|
|
||||||
enum sc_display_result res =
|
enum sc_display_result res =
|
||||||
@ -595,6 +664,8 @@ sc_screen_init_size(struct sc_screen *screen) {
|
|||||||
// recreate the texture and resize the window if the frame size has changed
|
// recreate the texture and resize the window if the frame size has changed
|
||||||
static enum sc_display_result
|
static enum sc_display_result
|
||||||
prepare_for_frame(struct sc_screen *screen, struct sc_size new_frame_size) {
|
prepare_for_frame(struct sc_screen *screen, struct sc_size new_frame_size) {
|
||||||
|
assert(screen->video);
|
||||||
|
|
||||||
if (screen->frame_size.width == new_frame_size.width
|
if (screen->frame_size.width == new_frame_size.width
|
||||||
&& screen->frame_size.height == new_frame_size.height) {
|
&& screen->frame_size.height == new_frame_size.height) {
|
||||||
return SC_DISPLAY_RESULT_OK;
|
return SC_DISPLAY_RESULT_OK;
|
||||||
@ -604,7 +675,7 @@ prepare_for_frame(struct sc_screen *screen, struct sc_size new_frame_size) {
|
|||||||
screen->frame_size = new_frame_size;
|
screen->frame_size = new_frame_size;
|
||||||
|
|
||||||
struct sc_size new_content_size =
|
struct sc_size new_content_size =
|
||||||
get_rotated_size(new_frame_size, screen->rotation);
|
get_oriented_size(new_frame_size, screen->orientation);
|
||||||
set_content_size(screen, new_content_size);
|
set_content_size(screen, new_content_size);
|
||||||
|
|
||||||
sc_screen_update_content_rect(screen);
|
sc_screen_update_content_rect(screen);
|
||||||
@ -613,13 +684,12 @@ prepare_for_frame(struct sc_screen *screen, struct sc_size new_frame_size) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static bool
|
static bool
|
||||||
sc_screen_update_frame(struct sc_screen *screen) {
|
sc_screen_apply_frame(struct sc_screen *screen) {
|
||||||
av_frame_unref(screen->frame);
|
assert(screen->video);
|
||||||
sc_frame_buffer_consume(&screen->fb, screen->frame);
|
|
||||||
AVFrame *frame = screen->frame;
|
|
||||||
|
|
||||||
sc_fps_counter_add_rendered_frame(&screen->fps_counter);
|
sc_fps_counter_add_rendered_frame(&screen->fps_counter);
|
||||||
|
|
||||||
|
AVFrame *frame = screen->frame;
|
||||||
struct sc_size new_frame_size = {frame->width, frame->height};
|
struct sc_size new_frame_size = {frame->width, frame->height};
|
||||||
enum sc_display_result res = prepare_for_frame(screen, new_frame_size);
|
enum sc_display_result res = prepare_for_frame(screen, new_frame_size);
|
||||||
if (res == SC_DISPLAY_RESULT_ERROR) {
|
if (res == SC_DISPLAY_RESULT_ERROR) {
|
||||||
@ -654,8 +724,62 @@ sc_screen_update_frame(struct sc_screen *screen) {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool
|
||||||
|
sc_screen_update_frame(struct sc_screen *screen) {
|
||||||
|
assert(screen->video);
|
||||||
|
|
||||||
|
if (screen->paused) {
|
||||||
|
if (!screen->resume_frame) {
|
||||||
|
screen->resume_frame = av_frame_alloc();
|
||||||
|
if (!screen->resume_frame) {
|
||||||
|
LOG_OOM();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
av_frame_unref(screen->resume_frame);
|
||||||
|
}
|
||||||
|
sc_frame_buffer_consume(&screen->fb, screen->resume_frame);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
av_frame_unref(screen->frame);
|
||||||
|
sc_frame_buffer_consume(&screen->fb, screen->frame);
|
||||||
|
return sc_screen_apply_frame(screen);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
sc_screen_set_paused(struct sc_screen *screen, bool paused) {
|
||||||
|
assert(screen->video);
|
||||||
|
|
||||||
|
if (!paused && !screen->paused) {
|
||||||
|
// nothing to do
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (screen->paused && screen->resume_frame) {
|
||||||
|
// If display screen was paused, refresh the frame immediately, even if
|
||||||
|
// the new state is also paused.
|
||||||
|
av_frame_free(&screen->frame);
|
||||||
|
screen->frame = screen->resume_frame;
|
||||||
|
screen->resume_frame = NULL;
|
||||||
|
sc_screen_apply_frame(screen);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!paused) {
|
||||||
|
LOGI("Display screen unpaused");
|
||||||
|
} else if (!screen->paused) {
|
||||||
|
LOGI("Display screen paused");
|
||||||
|
} else {
|
||||||
|
LOGI("Display screen re-paused");
|
||||||
|
}
|
||||||
|
|
||||||
|
screen->paused = paused;
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
sc_screen_switch_fullscreen(struct sc_screen *screen) {
|
sc_screen_switch_fullscreen(struct sc_screen *screen) {
|
||||||
|
assert(screen->video);
|
||||||
|
|
||||||
uint32_t new_mode = screen->fullscreen ? 0 : SDL_WINDOW_FULLSCREEN_DESKTOP;
|
uint32_t new_mode = screen->fullscreen ? 0 : SDL_WINDOW_FULLSCREEN_DESKTOP;
|
||||||
if (SDL_SetWindowFullscreen(screen->window, new_mode)) {
|
if (SDL_SetWindowFullscreen(screen->window, new_mode)) {
|
||||||
LOGW("Could not switch fullscreen mode: %s", SDL_GetError());
|
LOGW("Could not switch fullscreen mode: %s", SDL_GetError());
|
||||||
@ -673,6 +797,8 @@ sc_screen_switch_fullscreen(struct sc_screen *screen) {
|
|||||||
|
|
||||||
void
|
void
|
||||||
sc_screen_resize_to_fit(struct sc_screen *screen) {
|
sc_screen_resize_to_fit(struct sc_screen *screen) {
|
||||||
|
assert(screen->video);
|
||||||
|
|
||||||
if (screen->fullscreen || screen->maximized || screen->minimized) {
|
if (screen->fullscreen || screen->maximized || screen->minimized) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -697,6 +823,8 @@ sc_screen_resize_to_fit(struct sc_screen *screen) {
|
|||||||
|
|
||||||
void
|
void
|
||||||
sc_screen_resize_to_pixel_perfect(struct sc_screen *screen) {
|
sc_screen_resize_to_pixel_perfect(struct sc_screen *screen) {
|
||||||
|
assert(screen->video);
|
||||||
|
|
||||||
if (screen->fullscreen || screen->minimized) {
|
if (screen->fullscreen || screen->minimized) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -740,6 +868,13 @@ sc_screen_handle_event(struct sc_screen *screen, const SDL_Event *event) {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
case SDL_WINDOWEVENT:
|
case SDL_WINDOWEVENT:
|
||||||
|
if (!screen->video
|
||||||
|
&& event->window.event == SDL_WINDOWEVENT_EXPOSED) {
|
||||||
|
sc_screen_render_novideo(screen);
|
||||||
|
}
|
||||||
|
|
||||||
|
// !video implies !has_frame
|
||||||
|
assert(screen->video || !screen->has_frame);
|
||||||
if (!screen->has_frame) {
|
if (!screen->has_frame) {
|
||||||
// Do nothing
|
// Do nothing
|
||||||
return true;
|
return true;
|
||||||
@ -843,8 +978,9 @@ sc_screen_handle_event(struct sc_screen *screen, const SDL_Event *event) {
|
|||||||
struct sc_point
|
struct sc_point
|
||||||
sc_screen_convert_drawable_to_frame_coords(struct sc_screen *screen,
|
sc_screen_convert_drawable_to_frame_coords(struct sc_screen *screen,
|
||||||
int32_t x, int32_t y) {
|
int32_t x, int32_t y) {
|
||||||
unsigned rotation = screen->rotation;
|
assert(screen->video);
|
||||||
assert(rotation < 4);
|
|
||||||
|
enum sc_orientation orientation = screen->orientation;
|
||||||
|
|
||||||
int32_t w = screen->content_size.width;
|
int32_t w = screen->content_size.width;
|
||||||
int32_t h = screen->content_size.height;
|
int32_t h = screen->content_size.height;
|
||||||
@ -855,27 +991,43 @@ sc_screen_convert_drawable_to_frame_coords(struct sc_screen *screen,
|
|||||||
x = (int64_t) (x - screen->rect.x) * w / screen->rect.w;
|
x = (int64_t) (x - screen->rect.x) * w / screen->rect.w;
|
||||||
y = (int64_t) (y - screen->rect.y) * h / screen->rect.h;
|
y = (int64_t) (y - screen->rect.y) * h / screen->rect.h;
|
||||||
|
|
||||||
// rotate
|
|
||||||
struct sc_point result;
|
struct sc_point result;
|
||||||
switch (rotation) {
|
switch (orientation) {
|
||||||
case 0:
|
case SC_ORIENTATION_0:
|
||||||
result.x = x;
|
result.x = x;
|
||||||
result.y = y;
|
result.y = y;
|
||||||
break;
|
break;
|
||||||
case 1:
|
case SC_ORIENTATION_90:
|
||||||
result.x = h - y;
|
|
||||||
result.y = x;
|
|
||||||
break;
|
|
||||||
case 2:
|
|
||||||
result.x = w - x;
|
|
||||||
result.y = h - y;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
assert(rotation == 3);
|
|
||||||
result.x = y;
|
result.x = y;
|
||||||
result.y = w - x;
|
result.y = w - x;
|
||||||
break;
|
break;
|
||||||
|
case SC_ORIENTATION_180:
|
||||||
|
result.x = w - x;
|
||||||
|
result.y = h - y;
|
||||||
|
break;
|
||||||
|
case SC_ORIENTATION_270:
|
||||||
|
result.x = h - y;
|
||||||
|
result.y = x;
|
||||||
|
break;
|
||||||
|
case SC_ORIENTATION_FLIP_0:
|
||||||
|
result.x = w - x;
|
||||||
|
result.y = y;
|
||||||
|
break;
|
||||||
|
case SC_ORIENTATION_FLIP_90:
|
||||||
|
result.x = h - y;
|
||||||
|
result.y = w - x;
|
||||||
|
break;
|
||||||
|
case SC_ORIENTATION_FLIP_180:
|
||||||
|
result.x = x;
|
||||||
|
result.y = h - y;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
assert(orientation == SC_ORIENTATION_FLIP_270);
|
||||||
|
result.x = y;
|
||||||
|
result.y = x;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -14,6 +14,7 @@
|
|||||||
#include "frame_buffer.h"
|
#include "frame_buffer.h"
|
||||||
#include "input_manager.h"
|
#include "input_manager.h"
|
||||||
#include "opengl.h"
|
#include "opengl.h"
|
||||||
|
#include "options.h"
|
||||||
#include "trait/key_processor.h"
|
#include "trait/key_processor.h"
|
||||||
#include "trait/frame_sink.h"
|
#include "trait/frame_sink.h"
|
||||||
#include "trait/mouse_processor.h"
|
#include "trait/mouse_processor.h"
|
||||||
@ -25,6 +26,8 @@ struct sc_screen {
|
|||||||
bool open; // track the open/close state to assert correct behavior
|
bool open; // track the open/close state to assert correct behavior
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
bool video;
|
||||||
|
|
||||||
struct sc_display display;
|
struct sc_display display;
|
||||||
struct sc_input_manager im;
|
struct sc_input_manager im;
|
||||||
struct sc_frame_buffer fb;
|
struct sc_frame_buffer fb;
|
||||||
@ -49,8 +52,8 @@ struct sc_screen {
|
|||||||
// fullscreen (meaningful only when resize_pending is true)
|
// fullscreen (meaningful only when resize_pending is true)
|
||||||
struct sc_size windowed_content_size;
|
struct sc_size windowed_content_size;
|
||||||
|
|
||||||
// client rotation: 0, 1, 2 or 3 (x90 degrees counterclockwise)
|
// client orientation
|
||||||
unsigned rotation;
|
enum sc_orientation orientation;
|
||||||
// rectangle of the content (excluding black borders)
|
// rectangle of the content (excluding black borders)
|
||||||
struct SDL_Rect rect;
|
struct SDL_Rect rect;
|
||||||
bool has_frame;
|
bool has_frame;
|
||||||
@ -63,9 +66,14 @@ struct sc_screen {
|
|||||||
SDL_Keycode mouse_capture_key_pressed;
|
SDL_Keycode mouse_capture_key_pressed;
|
||||||
|
|
||||||
AVFrame *frame;
|
AVFrame *frame;
|
||||||
|
|
||||||
|
bool paused;
|
||||||
|
AVFrame *resume_frame;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct sc_screen_params {
|
struct sc_screen_params {
|
||||||
|
bool video;
|
||||||
|
|
||||||
struct sc_controller *controller;
|
struct sc_controller *controller;
|
||||||
struct sc_file_pusher *fp;
|
struct sc_file_pusher *fp;
|
||||||
struct sc_key_processor *kp;
|
struct sc_key_processor *kp;
|
||||||
@ -86,7 +94,7 @@ struct sc_screen_params {
|
|||||||
|
|
||||||
bool window_borderless;
|
bool window_borderless;
|
||||||
|
|
||||||
uint8_t rotation;
|
enum sc_orientation orientation;
|
||||||
bool mipmaps;
|
bool mipmaps;
|
||||||
|
|
||||||
bool fullscreen;
|
bool fullscreen;
|
||||||
@ -129,9 +137,14 @@ sc_screen_resize_to_fit(struct sc_screen *screen);
|
|||||||
void
|
void
|
||||||
sc_screen_resize_to_pixel_perfect(struct sc_screen *screen);
|
sc_screen_resize_to_pixel_perfect(struct sc_screen *screen);
|
||||||
|
|
||||||
// set the display rotation (0, 1, 2 or 3, x90 degrees counterclockwise)
|
// set the display orientation
|
||||||
void
|
void
|
||||||
sc_screen_set_rotation(struct sc_screen *screen, unsigned rotation);
|
sc_screen_set_orientation(struct sc_screen *screen,
|
||||||
|
enum sc_orientation orientation);
|
||||||
|
|
||||||
|
// set the display pause state
|
||||||
|
void
|
||||||
|
sc_screen_set_paused(struct sc_screen *screen, bool paused);
|
||||||
|
|
||||||
// react to SDL events
|
// react to SDL events
|
||||||
// If this function returns false, scrcpy must exit with an error.
|
// If this function returns false, scrcpy must exit with an error.
|
||||||
|
@ -76,6 +76,8 @@ sc_server_params_destroy(struct sc_server_params *params) {
|
|||||||
free((char *) params->video_encoder);
|
free((char *) params->video_encoder);
|
||||||
free((char *) params->audio_encoder);
|
free((char *) params->audio_encoder);
|
||||||
free((char *) params->tcpip_dst);
|
free((char *) params->tcpip_dst);
|
||||||
|
free((char *) params->camera_id);
|
||||||
|
free((char *) params->camera_ar);
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool
|
static bool
|
||||||
@ -86,14 +88,15 @@ sc_server_params_copy(struct sc_server_params *dst,
|
|||||||
// The params reference user-allocated memory, so we must copy them to
|
// The params reference user-allocated memory, so we must copy them to
|
||||||
// handle them from another thread
|
// handle them from another thread
|
||||||
|
|
||||||
#define COPY(FIELD) \
|
#define COPY(FIELD) do { \
|
||||||
dst->FIELD = NULL; \
|
dst->FIELD = NULL; \
|
||||||
if (src->FIELD) { \
|
if (src->FIELD) { \
|
||||||
dst->FIELD = strdup(src->FIELD); \
|
dst->FIELD = strdup(src->FIELD); \
|
||||||
if (!dst->FIELD) { \
|
if (!dst->FIELD) { \
|
||||||
goto error; \
|
goto error; \
|
||||||
} \
|
} \
|
||||||
}
|
} \
|
||||||
|
} while(0)
|
||||||
|
|
||||||
COPY(req_serial);
|
COPY(req_serial);
|
||||||
COPY(crop);
|
COPY(crop);
|
||||||
@ -102,6 +105,8 @@ sc_server_params_copy(struct sc_server_params *dst,
|
|||||||
COPY(video_encoder);
|
COPY(video_encoder);
|
||||||
COPY(audio_encoder);
|
COPY(audio_encoder);
|
||||||
COPY(tcpip_dst);
|
COPY(tcpip_dst);
|
||||||
|
COPY(camera_id);
|
||||||
|
COPY(camera_ar);
|
||||||
#undef COPY
|
#undef COPY
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
@ -173,6 +178,8 @@ sc_server_get_codec_name(enum sc_codec codec) {
|
|||||||
return "opus";
|
return "opus";
|
||||||
case SC_CODEC_AAC:
|
case SC_CODEC_AAC:
|
||||||
return "aac";
|
return "aac";
|
||||||
|
case SC_CODEC_FLAC:
|
||||||
|
return "flac";
|
||||||
case SC_CODEC_RAW:
|
case SC_CODEC_RAW:
|
||||||
return "raw";
|
return "raw";
|
||||||
default:
|
default:
|
||||||
@ -180,6 +187,20 @@ sc_server_get_codec_name(enum sc_codec codec) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static const char *
|
||||||
|
sc_server_get_camera_facing_name(enum sc_camera_facing camera_facing) {
|
||||||
|
switch (camera_facing) {
|
||||||
|
case SC_CAMERA_FACING_FRONT:
|
||||||
|
return "front";
|
||||||
|
case SC_CAMERA_FACING_BACK:
|
||||||
|
return "back";
|
||||||
|
case SC_CAMERA_FACING_EXTERNAL:
|
||||||
|
return "external";
|
||||||
|
default:
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static sc_pid
|
static sc_pid
|
||||||
execute_server(struct sc_server *server,
|
execute_server(struct sc_server *server,
|
||||||
const struct sc_server_params *params) {
|
const struct sc_server_params *params) {
|
||||||
@ -215,13 +236,13 @@ execute_server(struct sc_server *server,
|
|||||||
cmd[count++] = SCRCPY_VERSION;
|
cmd[count++] = SCRCPY_VERSION;
|
||||||
|
|
||||||
unsigned dyn_idx = count; // from there, the strings are allocated
|
unsigned dyn_idx = count; // from there, the strings are allocated
|
||||||
#define ADD_PARAM(fmt, ...) { \
|
#define ADD_PARAM(fmt, ...) do { \
|
||||||
char *p; \
|
char *p; \
|
||||||
if (asprintf(&p, fmt, ## __VA_ARGS__) == -1) { \
|
if (asprintf(&p, fmt, ## __VA_ARGS__) == -1) { \
|
||||||
goto end; \
|
goto end; \
|
||||||
} \
|
} \
|
||||||
cmd[count++] = p; \
|
cmd[count++] = p; \
|
||||||
}
|
} while(0)
|
||||||
|
|
||||||
ADD_PARAM("scid=%08x", params->scid);
|
ADD_PARAM("scid=%08x", params->scid);
|
||||||
ADD_PARAM("log_level=%s", log_level_to_server_string(params->log_level));
|
ADD_PARAM("log_level=%s", log_level_to_server_string(params->log_level));
|
||||||
@ -246,8 +267,11 @@ execute_server(struct sc_server *server,
|
|||||||
ADD_PARAM("audio_codec=%s",
|
ADD_PARAM("audio_codec=%s",
|
||||||
sc_server_get_codec_name(params->audio_codec));
|
sc_server_get_codec_name(params->audio_codec));
|
||||||
}
|
}
|
||||||
if (params->audio_source != SC_AUDIO_SOURCE_OUTPUT) {
|
if (params->video_source != SC_VIDEO_SOURCE_DISPLAY) {
|
||||||
assert(params->audio_source == SC_AUDIO_SOURCE_MIC);
|
assert(params->video_source == SC_VIDEO_SOURCE_CAMERA);
|
||||||
|
ADD_PARAM("video_source=camera");
|
||||||
|
}
|
||||||
|
if (params->audio_source == SC_AUDIO_SOURCE_MIC) {
|
||||||
ADD_PARAM("audio_source=mic");
|
ADD_PARAM("audio_source=mic");
|
||||||
}
|
}
|
||||||
if (params->max_size) {
|
if (params->max_size) {
|
||||||
@ -273,6 +297,25 @@ execute_server(struct sc_server *server,
|
|||||||
if (params->display_id) {
|
if (params->display_id) {
|
||||||
ADD_PARAM("display_id=%" PRIu32, params->display_id);
|
ADD_PARAM("display_id=%" PRIu32, params->display_id);
|
||||||
}
|
}
|
||||||
|
if (params->camera_id) {
|
||||||
|
ADD_PARAM("camera_id=%s", params->camera_id);
|
||||||
|
}
|
||||||
|
if (params->camera_size) {
|
||||||
|
ADD_PARAM("camera_size=%s", params->camera_size);
|
||||||
|
}
|
||||||
|
if (params->camera_facing != SC_CAMERA_FACING_ANY) {
|
||||||
|
ADD_PARAM("camera_facing=%s",
|
||||||
|
sc_server_get_camera_facing_name(params->camera_facing));
|
||||||
|
}
|
||||||
|
if (params->camera_ar) {
|
||||||
|
ADD_PARAM("camera_ar=%s", params->camera_ar);
|
||||||
|
}
|
||||||
|
if (params->camera_fps) {
|
||||||
|
ADD_PARAM("camera_fps=%" PRIu16, params->camera_fps);
|
||||||
|
}
|
||||||
|
if (params->camera_high_speed) {
|
||||||
|
ADD_PARAM("camera_high_speed=true");
|
||||||
|
}
|
||||||
if (params->show_touches) {
|
if (params->show_touches) {
|
||||||
ADD_PARAM("show_touches=true");
|
ADD_PARAM("show_touches=true");
|
||||||
}
|
}
|
||||||
@ -310,12 +353,18 @@ execute_server(struct sc_server *server,
|
|||||||
// By default, power_on is true
|
// By default, power_on is true
|
||||||
ADD_PARAM("power_on=false");
|
ADD_PARAM("power_on=false");
|
||||||
}
|
}
|
||||||
if (params->list_encoders) {
|
if (params->list & SC_OPTION_LIST_ENCODERS) {
|
||||||
ADD_PARAM("list_encoders=true");
|
ADD_PARAM("list_encoders=true");
|
||||||
}
|
}
|
||||||
if (params->list_displays) {
|
if (params->list & SC_OPTION_LIST_DISPLAYS) {
|
||||||
ADD_PARAM("list_displays=true");
|
ADD_PARAM("list_displays=true");
|
||||||
}
|
}
|
||||||
|
if (params->list & SC_OPTION_LIST_CAMERAS) {
|
||||||
|
ADD_PARAM("list_cameras=true");
|
||||||
|
}
|
||||||
|
if (params->list & SC_OPTION_LIST_CAMERA_SIZES) {
|
||||||
|
ADD_PARAM("list_camera_sizes=true");
|
||||||
|
}
|
||||||
|
|
||||||
#undef ADD_PARAM
|
#undef ADD_PARAM
|
||||||
|
|
||||||
@ -449,7 +498,7 @@ sc_server_init(struct sc_server *server, const struct sc_server_params *params,
|
|||||||
static bool
|
static bool
|
||||||
device_read_info(struct sc_intr *intr, sc_socket device_socket,
|
device_read_info(struct sc_intr *intr, sc_socket device_socket,
|
||||||
struct sc_server_info *info) {
|
struct sc_server_info *info) {
|
||||||
unsigned char buf[SC_DEVICE_NAME_FIELD_LENGTH];
|
uint8_t buf[SC_DEVICE_NAME_FIELD_LENGTH];
|
||||||
ssize_t r = net_recv_all_intr(intr, device_socket, buf, sizeof(buf));
|
ssize_t r = net_recv_all_intr(intr, device_socket, buf, sizeof(buf));
|
||||||
if (r < SC_DEVICE_NAME_FIELD_LENGTH) {
|
if (r < SC_DEVICE_NAME_FIELD_LENGTH) {
|
||||||
LOGE("Could not retrieve device information");
|
LOGE("Could not retrieve device information");
|
||||||
@ -895,7 +944,7 @@ run_server(void *data) {
|
|||||||
|
|
||||||
// If --list-* is passed, then the server just prints the requested data
|
// If --list-* is passed, then the server just prints the requested data
|
||||||
// then exits.
|
// then exits.
|
||||||
if (params->list_encoders || params->list_displays) {
|
if (params->list) {
|
||||||
sc_pid pid = execute_server(server, params);
|
sc_pid pid = execute_server(server, params);
|
||||||
if (pid == SC_PROCESS_NONE) {
|
if (pid == SC_PROCESS_NONE) {
|
||||||
goto error_connection_failed;
|
goto error_connection_failed;
|
||||||
|
@ -26,12 +26,18 @@ struct sc_server_params {
|
|||||||
enum sc_log_level log_level;
|
enum sc_log_level log_level;
|
||||||
enum sc_codec video_codec;
|
enum sc_codec video_codec;
|
||||||
enum sc_codec audio_codec;
|
enum sc_codec audio_codec;
|
||||||
|
enum sc_video_source video_source;
|
||||||
enum sc_audio_source audio_source;
|
enum sc_audio_source audio_source;
|
||||||
|
enum sc_camera_facing camera_facing;
|
||||||
const char *crop;
|
const char *crop;
|
||||||
const char *video_codec_options;
|
const char *video_codec_options;
|
||||||
const char *audio_codec_options;
|
const char *audio_codec_options;
|
||||||
const char *video_encoder;
|
const char *video_encoder;
|
||||||
const char *audio_encoder;
|
const char *audio_encoder;
|
||||||
|
const char *camera_id;
|
||||||
|
const char *camera_size;
|
||||||
|
const char *camera_ar;
|
||||||
|
uint16_t camera_fps;
|
||||||
struct sc_port_range port_range;
|
struct sc_port_range port_range;
|
||||||
uint32_t tunnel_host;
|
uint32_t tunnel_host;
|
||||||
uint16_t tunnel_port;
|
uint16_t tunnel_port;
|
||||||
@ -56,9 +62,9 @@ struct sc_server_params {
|
|||||||
bool select_tcpip;
|
bool select_tcpip;
|
||||||
bool cleanup;
|
bool cleanup;
|
||||||
bool power_on;
|
bool power_on;
|
||||||
bool list_encoders;
|
|
||||||
bool list_displays;
|
|
||||||
bool kill_adb_on_close;
|
bool kill_adb_on_close;
|
||||||
|
bool camera_high_speed;
|
||||||
|
uint8_t list;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct sc_server {
|
struct sc_server {
|
||||||
|
@ -23,6 +23,13 @@ struct sc_key_processor {
|
|||||||
*/
|
*/
|
||||||
bool async_paste;
|
bool async_paste;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set by the implementation to indicate that the keyboard is HID. In
|
||||||
|
* practice, it is used to react on a shortcut to open the hard keyboard
|
||||||
|
* settings only if the keyboard is HID.
|
||||||
|
*/
|
||||||
|
bool hid;
|
||||||
|
|
||||||
const struct sc_key_processor_ops *ops;
|
const struct sc_key_processor_ops *ops;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
162
app/src/uhid/keyboard_uhid.c
Normal file
162
app/src/uhid/keyboard_uhid.c
Normal file
@ -0,0 +1,162 @@
|
|||||||
|
#include "keyboard_uhid.h"
|
||||||
|
|
||||||
|
#include "util/log.h"
|
||||||
|
|
||||||
|
/** Downcast key processor to keyboard_uhid */
|
||||||
|
#define DOWNCAST(KP) container_of(KP, struct sc_keyboard_uhid, key_processor)
|
||||||
|
|
||||||
|
/** Downcast uhid_receiver to keyboard_uhid */
|
||||||
|
#define DOWNCAST_RECEIVER(UR) \
|
||||||
|
container_of(UR, struct sc_keyboard_uhid, uhid_receiver)
|
||||||
|
|
||||||
|
#define UHID_KEYBOARD_ID 1
|
||||||
|
|
||||||
|
static void
|
||||||
|
sc_keyboard_uhid_send_input(struct sc_keyboard_uhid *kb,
|
||||||
|
const struct sc_hid_event *event) {
|
||||||
|
struct sc_control_msg msg;
|
||||||
|
msg.type = SC_CONTROL_MSG_TYPE_UHID_INPUT;
|
||||||
|
msg.uhid_input.id = UHID_KEYBOARD_ID;
|
||||||
|
|
||||||
|
assert(event->size <= SC_HID_MAX_SIZE);
|
||||||
|
memcpy(msg.uhid_input.data, event->data, event->size);
|
||||||
|
msg.uhid_input.size = event->size;
|
||||||
|
|
||||||
|
if (!sc_controller_push_msg(kb->controller, &msg)) {
|
||||||
|
LOGE("Could not send UHID_INPUT message (key)");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
sc_keyboard_uhid_synchronize_mod(struct sc_keyboard_uhid *kb) {
|
||||||
|
SDL_Keymod sdl_mod = SDL_GetModState();
|
||||||
|
uint16_t mod = sc_mods_state_from_sdl(sdl_mod) & (SC_MOD_CAPS | SC_MOD_NUM);
|
||||||
|
|
||||||
|
uint16_t device_mod =
|
||||||
|
atomic_load_explicit(&kb->device_mod, memory_order_relaxed);
|
||||||
|
uint16_t diff = mod ^ device_mod;
|
||||||
|
|
||||||
|
if (diff) {
|
||||||
|
// Inherently racy (the HID output reports arrive asynchronously in
|
||||||
|
// response to key presses), but will re-synchronize on next key press
|
||||||
|
// or HID output anyway
|
||||||
|
atomic_store_explicit(&kb->device_mod, mod, memory_order_relaxed);
|
||||||
|
|
||||||
|
struct sc_hid_event hid_event;
|
||||||
|
sc_hid_keyboard_event_from_mods(&hid_event, diff);
|
||||||
|
|
||||||
|
LOGV("HID keyboard state synchronized");
|
||||||
|
|
||||||
|
sc_keyboard_uhid_send_input(kb, &hid_event);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
sc_key_processor_process_key(struct sc_key_processor *kp,
|
||||||
|
const struct sc_key_event *event,
|
||||||
|
uint64_t ack_to_wait) {
|
||||||
|
(void) ack_to_wait;
|
||||||
|
|
||||||
|
if (event->repeat) {
|
||||||
|
// In USB HID protocol, key repeat is handled by the host (Android), so
|
||||||
|
// just ignore key repeat here.
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct sc_keyboard_uhid *kb = DOWNCAST(kp);
|
||||||
|
|
||||||
|
struct sc_hid_event hid_event;
|
||||||
|
|
||||||
|
// Not all keys are supported, just ignore unsupported keys
|
||||||
|
if (sc_hid_keyboard_event_from_key(&kb->hid, &hid_event, event)) {
|
||||||
|
if (event->scancode == SC_SCANCODE_CAPSLOCK) {
|
||||||
|
atomic_fetch_xor_explicit(&kb->device_mod, SC_MOD_CAPS,
|
||||||
|
memory_order_relaxed);
|
||||||
|
} else if (event->scancode == SC_SCANCODE_NUMLOCK) {
|
||||||
|
atomic_fetch_xor_explicit(&kb->device_mod, SC_MOD_NUM,
|
||||||
|
memory_order_relaxed);
|
||||||
|
} else {
|
||||||
|
// Synchronize modifiers (only if the scancode itself does not
|
||||||
|
// change the modifiers)
|
||||||
|
sc_keyboard_uhid_synchronize_mod(kb);
|
||||||
|
}
|
||||||
|
sc_keyboard_uhid_send_input(kb, &hid_event);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static unsigned
|
||||||
|
sc_keyboard_uhid_to_sc_mod(uint8_t hid_led) {
|
||||||
|
// <https://www.usb.org/sites/default/files/documents/hut1_12v2.pdf>
|
||||||
|
// (chapter 11: LED page)
|
||||||
|
unsigned mod = 0;
|
||||||
|
if (hid_led & 0x01) {
|
||||||
|
mod |= SC_MOD_NUM;
|
||||||
|
}
|
||||||
|
if (hid_led & 0x02) {
|
||||||
|
mod |= SC_MOD_CAPS;
|
||||||
|
}
|
||||||
|
return mod;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
sc_uhid_receiver_process_output(struct sc_uhid_receiver *receiver,
|
||||||
|
const uint8_t *data, size_t len) {
|
||||||
|
// Called from the thread receiving device messages
|
||||||
|
|
||||||
|
assert(len);
|
||||||
|
|
||||||
|
// Also check at runtime (do not trust the server)
|
||||||
|
if (!len) {
|
||||||
|
LOGE("Unexpected empty HID output message");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct sc_keyboard_uhid *kb = DOWNCAST_RECEIVER(receiver);
|
||||||
|
|
||||||
|
uint8_t hid_led = data[0];
|
||||||
|
uint16_t device_mod = sc_keyboard_uhid_to_sc_mod(hid_led);
|
||||||
|
atomic_store_explicit(&kb->device_mod, device_mod, memory_order_relaxed);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool
|
||||||
|
sc_keyboard_uhid_init(struct sc_keyboard_uhid *kb,
|
||||||
|
struct sc_controller *controller,
|
||||||
|
struct sc_uhid_devices *uhid_devices) {
|
||||||
|
sc_hid_keyboard_init(&kb->hid);
|
||||||
|
|
||||||
|
kb->controller = controller;
|
||||||
|
atomic_init(&kb->device_mod, 0);
|
||||||
|
|
||||||
|
static const struct sc_key_processor_ops ops = {
|
||||||
|
.process_key = sc_key_processor_process_key,
|
||||||
|
// Never forward text input via HID (all the keys are injected
|
||||||
|
// separately)
|
||||||
|
.process_text = NULL,
|
||||||
|
};
|
||||||
|
|
||||||
|
// Clipboard synchronization is requested over the same control socket, so
|
||||||
|
// there is no need for a specific synchronization mechanism
|
||||||
|
kb->key_processor.async_paste = false;
|
||||||
|
kb->key_processor.hid = true;
|
||||||
|
kb->key_processor.ops = &ops;
|
||||||
|
|
||||||
|
static const struct sc_uhid_receiver_ops uhid_receiver_ops = {
|
||||||
|
.process_output = sc_uhid_receiver_process_output,
|
||||||
|
};
|
||||||
|
|
||||||
|
kb->uhid_receiver.id = UHID_KEYBOARD_ID;
|
||||||
|
kb->uhid_receiver.ops = &uhid_receiver_ops;
|
||||||
|
sc_uhid_devices_add_receiver(uhid_devices, &kb->uhid_receiver);
|
||||||
|
|
||||||
|
struct sc_control_msg msg;
|
||||||
|
msg.type = SC_CONTROL_MSG_TYPE_UHID_CREATE;
|
||||||
|
msg.uhid_create.id = UHID_KEYBOARD_ID;
|
||||||
|
msg.uhid_create.report_desc = SC_HID_KEYBOARD_REPORT_DESC;
|
||||||
|
msg.uhid_create.report_desc_size = SC_HID_KEYBOARD_REPORT_DESC_LEN;
|
||||||
|
if (!sc_controller_push_msg(controller, &msg)) {
|
||||||
|
LOGE("Could not send UHID_CREATE message (keyboard)");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
27
app/src/uhid/keyboard_uhid.h
Normal file
27
app/src/uhid/keyboard_uhid.h
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
#ifndef SC_KEYBOARD_UHID_H
|
||||||
|
#define SC_KEYBOARD_UHID_H
|
||||||
|
|
||||||
|
#include "common.h"
|
||||||
|
|
||||||
|
#include <stdbool.h>
|
||||||
|
|
||||||
|
#include "controller.h"
|
||||||
|
#include "hid/hid_keyboard.h"
|
||||||
|
#include "uhid/uhid_output.h"
|
||||||
|
#include "trait/key_processor.h"
|
||||||
|
|
||||||
|
struct sc_keyboard_uhid {
|
||||||
|
struct sc_key_processor key_processor; // key processor trait
|
||||||
|
struct sc_uhid_receiver uhid_receiver;
|
||||||
|
|
||||||
|
struct sc_hid_keyboard hid;
|
||||||
|
struct sc_controller *controller;
|
||||||
|
atomic_uint_least16_t device_mod;
|
||||||
|
};
|
||||||
|
|
||||||
|
bool
|
||||||
|
sc_keyboard_uhid_init(struct sc_keyboard_uhid *kb,
|
||||||
|
struct sc_controller *controller,
|
||||||
|
struct sc_uhid_devices *uhid_devices);
|
||||||
|
|
||||||
|
#endif
|
89
app/src/uhid/mouse_uhid.c
Normal file
89
app/src/uhid/mouse_uhid.c
Normal file
@ -0,0 +1,89 @@
|
|||||||
|
#include "mouse_uhid.h"
|
||||||
|
|
||||||
|
#include "hid/hid_mouse.h"
|
||||||
|
#include "input_events.h"
|
||||||
|
#include "util/log.h"
|
||||||
|
|
||||||
|
/** Downcast mouse processor to mouse_uhid */
|
||||||
|
#define DOWNCAST(MP) container_of(MP, struct sc_mouse_uhid, mouse_processor)
|
||||||
|
|
||||||
|
#define UHID_MOUSE_ID 2
|
||||||
|
|
||||||
|
static void
|
||||||
|
sc_mouse_uhid_send_input(struct sc_mouse_uhid *mouse,
|
||||||
|
const struct sc_hid_event *event, const char *name) {
|
||||||
|
struct sc_control_msg msg;
|
||||||
|
msg.type = SC_CONTROL_MSG_TYPE_UHID_INPUT;
|
||||||
|
msg.uhid_input.id = UHID_MOUSE_ID;
|
||||||
|
|
||||||
|
assert(event->size <= SC_HID_MAX_SIZE);
|
||||||
|
memcpy(msg.uhid_input.data, event->data, event->size);
|
||||||
|
msg.uhid_input.size = event->size;
|
||||||
|
|
||||||
|
if (!sc_controller_push_msg(mouse->controller, &msg)) {
|
||||||
|
LOGE("Could not send UHID_INPUT message (%s)", name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
sc_mouse_processor_process_mouse_motion(struct sc_mouse_processor *mp,
|
||||||
|
const struct sc_mouse_motion_event *event) {
|
||||||
|
struct sc_mouse_uhid *mouse = DOWNCAST(mp);
|
||||||
|
|
||||||
|
struct sc_hid_event hid_event;
|
||||||
|
sc_hid_mouse_event_from_motion(&hid_event, event);
|
||||||
|
|
||||||
|
sc_mouse_uhid_send_input(mouse, &hid_event, "mouse motion");
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
sc_mouse_processor_process_mouse_click(struct sc_mouse_processor *mp,
|
||||||
|
const struct sc_mouse_click_event *event) {
|
||||||
|
struct sc_mouse_uhid *mouse = DOWNCAST(mp);
|
||||||
|
|
||||||
|
struct sc_hid_event hid_event;
|
||||||
|
sc_hid_mouse_event_from_click(&hid_event, event);
|
||||||
|
|
||||||
|
sc_mouse_uhid_send_input(mouse, &hid_event, "mouse click");
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
sc_mouse_processor_process_mouse_scroll(struct sc_mouse_processor *mp,
|
||||||
|
const struct sc_mouse_scroll_event *event) {
|
||||||
|
struct sc_mouse_uhid *mouse = DOWNCAST(mp);
|
||||||
|
|
||||||
|
struct sc_hid_event hid_event;
|
||||||
|
sc_hid_mouse_event_from_scroll(&hid_event, event);
|
||||||
|
|
||||||
|
sc_mouse_uhid_send_input(mouse, &hid_event, "mouse scroll");
|
||||||
|
}
|
||||||
|
|
||||||
|
bool
|
||||||
|
sc_mouse_uhid_init(struct sc_mouse_uhid *mouse,
|
||||||
|
struct sc_controller *controller) {
|
||||||
|
mouse->controller = controller;
|
||||||
|
|
||||||
|
static const struct sc_mouse_processor_ops ops = {
|
||||||
|
.process_mouse_motion = sc_mouse_processor_process_mouse_motion,
|
||||||
|
.process_mouse_click = sc_mouse_processor_process_mouse_click,
|
||||||
|
.process_mouse_scroll = sc_mouse_processor_process_mouse_scroll,
|
||||||
|
// Touch events not supported (coordinates are not relative)
|
||||||
|
.process_touch = NULL,
|
||||||
|
};
|
||||||
|
|
||||||
|
mouse->mouse_processor.ops = &ops;
|
||||||
|
|
||||||
|
mouse->mouse_processor.relative_mode = true;
|
||||||
|
|
||||||
|
struct sc_control_msg msg;
|
||||||
|
msg.type = SC_CONTROL_MSG_TYPE_UHID_CREATE;
|
||||||
|
msg.uhid_create.id = UHID_MOUSE_ID;
|
||||||
|
msg.uhid_create.report_desc = SC_HID_MOUSE_REPORT_DESC;
|
||||||
|
msg.uhid_create.report_desc_size = SC_HID_MOUSE_REPORT_DESC_LEN;
|
||||||
|
if (!sc_controller_push_msg(controller, &msg)) {
|
||||||
|
LOGE("Could not send UHID_CREATE message (mouse)");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
19
app/src/uhid/mouse_uhid.h
Normal file
19
app/src/uhid/mouse_uhid.h
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
#ifndef SC_MOUSE_UHID_H
|
||||||
|
#define SC_MOUSE_UHID_H
|
||||||
|
|
||||||
|
#include <stdbool.h>
|
||||||
|
|
||||||
|
#include "controller.h"
|
||||||
|
#include "trait/mouse_processor.h"
|
||||||
|
|
||||||
|
struct sc_mouse_uhid {
|
||||||
|
struct sc_mouse_processor mouse_processor; // mouse processor trait
|
||||||
|
|
||||||
|
struct sc_controller *controller;
|
||||||
|
};
|
||||||
|
|
||||||
|
bool
|
||||||
|
sc_mouse_uhid_init(struct sc_mouse_uhid *mouse,
|
||||||
|
struct sc_controller *controller);
|
||||||
|
|
||||||
|
#endif
|
25
app/src/uhid/uhid_output.c
Normal file
25
app/src/uhid/uhid_output.c
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
#include "uhid_output.h"
|
||||||
|
|
||||||
|
#include <assert.h>
|
||||||
|
|
||||||
|
void
|
||||||
|
sc_uhid_devices_init(struct sc_uhid_devices *devices) {
|
||||||
|
devices->count = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
sc_uhid_devices_add_receiver(struct sc_uhid_devices *devices,
|
||||||
|
struct sc_uhid_receiver *receiver) {
|
||||||
|
assert(devices->count < SC_UHID_MAX_RECEIVERS);
|
||||||
|
devices->receivers[devices->count++] = receiver;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct sc_uhid_receiver *
|
||||||
|
sc_uhid_devices_get_receiver(struct sc_uhid_devices *devices, uint16_t id) {
|
||||||
|
for (size_t i = 0; i < devices->count; ++i) {
|
||||||
|
if (devices->receivers[i]->id == id) {
|
||||||
|
return devices->receivers[i];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return NULL;
|
||||||
|
}
|
45
app/src/uhid/uhid_output.h
Normal file
45
app/src/uhid/uhid_output.h
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
#ifndef SC_UHID_OUTPUT_H
|
||||||
|
#define SC_UHID_OUTPUT_H
|
||||||
|
|
||||||
|
#include "common.h"
|
||||||
|
|
||||||
|
#include <stdbool.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The communication with UHID devices is bidirectional.
|
||||||
|
*
|
||||||
|
* This component manages the registration of receivers to handle UHID output
|
||||||
|
* messages (sent from the device to the computer).
|
||||||
|
*/
|
||||||
|
|
||||||
|
struct sc_uhid_receiver {
|
||||||
|
uint16_t id;
|
||||||
|
|
||||||
|
const struct sc_uhid_receiver_ops *ops;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct sc_uhid_receiver_ops {
|
||||||
|
void
|
||||||
|
(*process_output)(struct sc_uhid_receiver *receiver,
|
||||||
|
const uint8_t *data, size_t len);
|
||||||
|
};
|
||||||
|
|
||||||
|
#define SC_UHID_MAX_RECEIVERS 1
|
||||||
|
|
||||||
|
struct sc_uhid_devices {
|
||||||
|
struct sc_uhid_receiver *receivers[SC_UHID_MAX_RECEIVERS];
|
||||||
|
unsigned count;
|
||||||
|
};
|
||||||
|
|
||||||
|
void
|
||||||
|
sc_uhid_devices_init(struct sc_uhid_devices *devices);
|
||||||
|
|
||||||
|
void
|
||||||
|
sc_uhid_devices_add_receiver(struct sc_uhid_devices *devices,
|
||||||
|
struct sc_uhid_receiver *receiver);
|
||||||
|
|
||||||
|
struct sc_uhid_receiver *
|
||||||
|
sc_uhid_devices_get_receiver(struct sc_uhid_devices *devices, uint16_t id);
|
||||||
|
|
||||||
|
#endif
|
@ -5,6 +5,7 @@
|
|||||||
|
|
||||||
#include "aoa_hid.h"
|
#include "aoa_hid.h"
|
||||||
#include "util/log.h"
|
#include "util/log.h"
|
||||||
|
#include "util/str.h"
|
||||||
|
|
||||||
// See <https://source.android.com/devices/accessories/aoa2#hid-support>.
|
// See <https://source.android.com/devices/accessories/aoa2#hid-support>.
|
||||||
#define ACCESSORY_REGISTER_HID 54
|
#define ACCESSORY_REGISTER_HID 54
|
||||||
@ -14,37 +15,18 @@
|
|||||||
|
|
||||||
#define DEFAULT_TIMEOUT 1000
|
#define DEFAULT_TIMEOUT 1000
|
||||||
|
|
||||||
#define SC_HID_EVENT_QUEUE_MAX 64
|
#define SC_AOA_EVENT_QUEUE_MAX 64
|
||||||
|
|
||||||
static void
|
static void
|
||||||
sc_hid_event_log(const struct sc_hid_event *event) {
|
sc_hid_event_log(uint16_t accessory_id, const struct sc_hid_event *event) {
|
||||||
// HID Event: [00] FF FF FF FF...
|
// HID Event: [00] FF FF FF FF...
|
||||||
assert(event->size);
|
assert(event->size);
|
||||||
unsigned buffer_size = event->size * 3 + 1;
|
char *hex = sc_str_to_hex_string(event->data, event->size);
|
||||||
char *buffer = malloc(buffer_size);
|
if (!hex) {
|
||||||
if (!buffer) {
|
|
||||||
LOG_OOM();
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
for (unsigned i = 0; i < event->size; ++i) {
|
LOGV("HID Event: [%d] %s", accessory_id, hex);
|
||||||
snprintf(buffer + i * 3, 4, " %02x", event->buffer[i]);
|
free(hex);
|
||||||
}
|
|
||||||
LOGV("HID Event: [%d]%s", event->accessory_id, buffer);
|
|
||||||
free(buffer);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
sc_hid_event_init(struct sc_hid_event *hid_event, uint16_t accessory_id,
|
|
||||||
unsigned char *buffer, uint16_t buffer_size) {
|
|
||||||
hid_event->accessory_id = accessory_id;
|
|
||||||
hid_event->buffer = buffer;
|
|
||||||
hid_event->size = buffer_size;
|
|
||||||
hid_event->ack_to_wait = SC_SEQUENCE_INVALID;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
sc_hid_event_destroy(struct sc_hid_event *hid_event) {
|
|
||||||
free(hid_event->buffer);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
@ -52,7 +34,7 @@ sc_aoa_init(struct sc_aoa *aoa, struct sc_usb *usb,
|
|||||||
struct sc_acksync *acksync) {
|
struct sc_acksync *acksync) {
|
||||||
sc_vecdeque_init(&aoa->queue);
|
sc_vecdeque_init(&aoa->queue);
|
||||||
|
|
||||||
if (!sc_vecdeque_reserve(&aoa->queue, SC_HID_EVENT_QUEUE_MAX)) {
|
if (!sc_vecdeque_reserve(&aoa->queue, SC_AOA_EVENT_QUEUE_MAX)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -76,12 +58,7 @@ sc_aoa_init(struct sc_aoa *aoa, struct sc_usb *usb,
|
|||||||
|
|
||||||
void
|
void
|
||||||
sc_aoa_destroy(struct sc_aoa *aoa) {
|
sc_aoa_destroy(struct sc_aoa *aoa) {
|
||||||
// Destroy remaining events
|
sc_vecdeque_destroy(&aoa->queue);
|
||||||
while (!sc_vecdeque_is_empty(&aoa->queue)) {
|
|
||||||
struct sc_hid_event *event = sc_vecdeque_popref(&aoa->queue);
|
|
||||||
assert(event);
|
|
||||||
sc_hid_event_destroy(event);
|
|
||||||
}
|
|
||||||
|
|
||||||
sc_cond_destroy(&aoa->event_cond);
|
sc_cond_destroy(&aoa->event_cond);
|
||||||
sc_mutex_destroy(&aoa->mutex);
|
sc_mutex_destroy(&aoa->mutex);
|
||||||
@ -97,10 +74,10 @@ sc_aoa_register_hid(struct sc_aoa *aoa, uint16_t accessory_id,
|
|||||||
// index (arg1): total length of the HID report descriptor
|
// index (arg1): total length of the HID report descriptor
|
||||||
uint16_t value = accessory_id;
|
uint16_t value = accessory_id;
|
||||||
uint16_t index = report_desc_size;
|
uint16_t index = report_desc_size;
|
||||||
unsigned char *buffer = NULL;
|
unsigned char *data = NULL;
|
||||||
uint16_t length = 0;
|
uint16_t length = 0;
|
||||||
int result = libusb_control_transfer(aoa->usb->handle, request_type,
|
int result = libusb_control_transfer(aoa->usb->handle, request_type,
|
||||||
request, value, index, buffer, length,
|
request, value, index, data, length,
|
||||||
DEFAULT_TIMEOUT);
|
DEFAULT_TIMEOUT);
|
||||||
if (result < 0) {
|
if (result < 0) {
|
||||||
LOGE("REGISTER_HID: libusb error: %s", libusb_strerror(result));
|
LOGE("REGISTER_HID: libusb error: %s", libusb_strerror(result));
|
||||||
@ -113,7 +90,7 @@ sc_aoa_register_hid(struct sc_aoa *aoa, uint16_t accessory_id,
|
|||||||
|
|
||||||
static bool
|
static bool
|
||||||
sc_aoa_set_hid_report_desc(struct sc_aoa *aoa, uint16_t accessory_id,
|
sc_aoa_set_hid_report_desc(struct sc_aoa *aoa, uint16_t accessory_id,
|
||||||
const unsigned char *report_desc,
|
const uint8_t *report_desc,
|
||||||
uint16_t report_desc_size) {
|
uint16_t report_desc_size) {
|
||||||
uint8_t request_type = LIBUSB_ENDPOINT_OUT | LIBUSB_REQUEST_TYPE_VENDOR;
|
uint8_t request_type = LIBUSB_ENDPOINT_OUT | LIBUSB_REQUEST_TYPE_VENDOR;
|
||||||
uint8_t request = ACCESSORY_SET_HID_REPORT_DESC;
|
uint8_t request = ACCESSORY_SET_HID_REPORT_DESC;
|
||||||
@ -130,14 +107,14 @@ sc_aoa_set_hid_report_desc(struct sc_aoa *aoa, uint16_t accessory_id,
|
|||||||
* See <https://libusb.sourceforge.io/api-1.0/libusb_packetoverflow.html>
|
* See <https://libusb.sourceforge.io/api-1.0/libusb_packetoverflow.html>
|
||||||
*/
|
*/
|
||||||
// value (arg0): accessory assigned ID for the HID device
|
// value (arg0): accessory assigned ID for the HID device
|
||||||
// index (arg1): offset of data (buffer) in descriptor
|
// index (arg1): offset of data in descriptor
|
||||||
uint16_t value = accessory_id;
|
uint16_t value = accessory_id;
|
||||||
uint16_t index = 0;
|
uint16_t index = 0;
|
||||||
// libusb_control_transfer expects a pointer to non-const
|
// libusb_control_transfer expects a pointer to non-const
|
||||||
unsigned char *buffer = (unsigned char *) report_desc;
|
unsigned char *data = (unsigned char *) report_desc;
|
||||||
uint16_t length = report_desc_size;
|
uint16_t length = report_desc_size;
|
||||||
int result = libusb_control_transfer(aoa->usb->handle, request_type,
|
int result = libusb_control_transfer(aoa->usb->handle, request_type,
|
||||||
request, value, index, buffer, length,
|
request, value, index, data, length,
|
||||||
DEFAULT_TIMEOUT);
|
DEFAULT_TIMEOUT);
|
||||||
if (result < 0) {
|
if (result < 0) {
|
||||||
LOGE("SET_HID_REPORT_DESC: libusb error: %s", libusb_strerror(result));
|
LOGE("SET_HID_REPORT_DESC: libusb error: %s", libusb_strerror(result));
|
||||||
@ -150,7 +127,7 @@ sc_aoa_set_hid_report_desc(struct sc_aoa *aoa, uint16_t accessory_id,
|
|||||||
|
|
||||||
bool
|
bool
|
||||||
sc_aoa_setup_hid(struct sc_aoa *aoa, uint16_t accessory_id,
|
sc_aoa_setup_hid(struct sc_aoa *aoa, uint16_t accessory_id,
|
||||||
const unsigned char *report_desc, uint16_t report_desc_size) {
|
const uint8_t *report_desc, uint16_t report_desc_size) {
|
||||||
bool ok = sc_aoa_register_hid(aoa, accessory_id, report_desc_size);
|
bool ok = sc_aoa_register_hid(aoa, accessory_id, report_desc_size);
|
||||||
if (!ok) {
|
if (!ok) {
|
||||||
return false;
|
return false;
|
||||||
@ -169,18 +146,19 @@ sc_aoa_setup_hid(struct sc_aoa *aoa, uint16_t accessory_id,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static bool
|
static bool
|
||||||
sc_aoa_send_hid_event(struct sc_aoa *aoa, const struct sc_hid_event *event) {
|
sc_aoa_send_hid_event(struct sc_aoa *aoa, uint16_t accessory_id,
|
||||||
|
const struct sc_hid_event *event) {
|
||||||
uint8_t request_type = LIBUSB_ENDPOINT_OUT | LIBUSB_REQUEST_TYPE_VENDOR;
|
uint8_t request_type = LIBUSB_ENDPOINT_OUT | LIBUSB_REQUEST_TYPE_VENDOR;
|
||||||
uint8_t request = ACCESSORY_SEND_HID_EVENT;
|
uint8_t request = ACCESSORY_SEND_HID_EVENT;
|
||||||
// <https://source.android.com/devices/accessories/aoa2.html#hid-support>
|
// <https://source.android.com/devices/accessories/aoa2.html#hid-support>
|
||||||
// value (arg0): accessory assigned ID for the HID device
|
// value (arg0): accessory assigned ID for the HID device
|
||||||
// index (arg1): 0 (unused)
|
// index (arg1): 0 (unused)
|
||||||
uint16_t value = event->accessory_id;
|
uint16_t value = accessory_id;
|
||||||
uint16_t index = 0;
|
uint16_t index = 0;
|
||||||
unsigned char *buffer = event->buffer;
|
unsigned char *data = (uint8_t *) event->data; // discard const
|
||||||
uint16_t length = event->size;
|
uint16_t length = event->size;
|
||||||
int result = libusb_control_transfer(aoa->usb->handle, request_type,
|
int result = libusb_control_transfer(aoa->usb->handle, request_type,
|
||||||
request, value, index, buffer, length,
|
request, value, index, data, length,
|
||||||
DEFAULT_TIMEOUT);
|
DEFAULT_TIMEOUT);
|
||||||
if (result < 0) {
|
if (result < 0) {
|
||||||
LOGE("SEND_HID_EVENT: libusb error: %s", libusb_strerror(result));
|
LOGE("SEND_HID_EVENT: libusb error: %s", libusb_strerror(result));
|
||||||
@ -192,7 +170,7 @@ sc_aoa_send_hid_event(struct sc_aoa *aoa, const struct sc_hid_event *event) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
sc_aoa_unregister_hid(struct sc_aoa *aoa, const uint16_t accessory_id) {
|
sc_aoa_unregister_hid(struct sc_aoa *aoa, uint16_t accessory_id) {
|
||||||
uint8_t request_type = LIBUSB_ENDPOINT_OUT | LIBUSB_REQUEST_TYPE_VENDOR;
|
uint8_t request_type = LIBUSB_ENDPOINT_OUT | LIBUSB_REQUEST_TYPE_VENDOR;
|
||||||
uint8_t request = ACCESSORY_UNREGISTER_HID;
|
uint8_t request = ACCESSORY_UNREGISTER_HID;
|
||||||
// <https://source.android.com/devices/accessories/aoa2.html#hid-support>
|
// <https://source.android.com/devices/accessories/aoa2.html#hid-support>
|
||||||
@ -200,10 +178,10 @@ sc_aoa_unregister_hid(struct sc_aoa *aoa, const uint16_t accessory_id) {
|
|||||||
// index (arg1): 0
|
// index (arg1): 0
|
||||||
uint16_t value = accessory_id;
|
uint16_t value = accessory_id;
|
||||||
uint16_t index = 0;
|
uint16_t index = 0;
|
||||||
unsigned char *buffer = NULL;
|
unsigned char *data = NULL;
|
||||||
uint16_t length = 0;
|
uint16_t length = 0;
|
||||||
int result = libusb_control_transfer(aoa->usb->handle, request_type,
|
int result = libusb_control_transfer(aoa->usb->handle, request_type,
|
||||||
request, value, index, buffer, length,
|
request, value, index, data, length,
|
||||||
DEFAULT_TIMEOUT);
|
DEFAULT_TIMEOUT);
|
||||||
if (result < 0) {
|
if (result < 0) {
|
||||||
LOGE("UNREGISTER_HID: libusb error: %s", libusb_strerror(result));
|
LOGE("UNREGISTER_HID: libusb error: %s", libusb_strerror(result));
|
||||||
@ -215,16 +193,25 @@ sc_aoa_unregister_hid(struct sc_aoa *aoa, const uint16_t accessory_id) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
sc_aoa_push_hid_event(struct sc_aoa *aoa, const struct sc_hid_event *event) {
|
sc_aoa_push_hid_event_with_ack_to_wait(struct sc_aoa *aoa,
|
||||||
|
uint16_t accessory_id,
|
||||||
|
const struct sc_hid_event *event,
|
||||||
|
uint64_t ack_to_wait) {
|
||||||
if (sc_get_log_level() <= SC_LOG_LEVEL_VERBOSE) {
|
if (sc_get_log_level() <= SC_LOG_LEVEL_VERBOSE) {
|
||||||
sc_hid_event_log(event);
|
sc_hid_event_log(accessory_id, event);
|
||||||
}
|
}
|
||||||
|
|
||||||
sc_mutex_lock(&aoa->mutex);
|
sc_mutex_lock(&aoa->mutex);
|
||||||
bool full = sc_vecdeque_is_full(&aoa->queue);
|
bool full = sc_vecdeque_is_full(&aoa->queue);
|
||||||
if (!full) {
|
if (!full) {
|
||||||
bool was_empty = sc_vecdeque_is_empty(&aoa->queue);
|
bool was_empty = sc_vecdeque_is_empty(&aoa->queue);
|
||||||
sc_vecdeque_push_noresize(&aoa->queue, *event);
|
|
||||||
|
struct sc_aoa_event *aoa_event =
|
||||||
|
sc_vecdeque_push_hole_noresize(&aoa->queue);
|
||||||
|
aoa_event->hid = *event;
|
||||||
|
aoa_event->accessory_id = accessory_id;
|
||||||
|
aoa_event->ack_to_wait = ack_to_wait;
|
||||||
|
|
||||||
if (was_empty) {
|
if (was_empty) {
|
||||||
sc_cond_signal(&aoa->event_cond);
|
sc_cond_signal(&aoa->event_cond);
|
||||||
}
|
}
|
||||||
@ -252,7 +239,7 @@ run_aoa_thread(void *data) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
assert(!sc_vecdeque_is_empty(&aoa->queue));
|
assert(!sc_vecdeque_is_empty(&aoa->queue));
|
||||||
struct sc_hid_event event = sc_vecdeque_pop(&aoa->queue);
|
struct sc_aoa_event event = sc_vecdeque_pop(&aoa->queue);
|
||||||
uint64_t ack_to_wait = event.ack_to_wait;
|
uint64_t ack_to_wait = event.ack_to_wait;
|
||||||
sc_mutex_unlock(&aoa->mutex);
|
sc_mutex_unlock(&aoa->mutex);
|
||||||
|
|
||||||
@ -271,17 +258,14 @@ run_aoa_thread(void *data) {
|
|||||||
|
|
||||||
if (result == SC_ACKSYNC_WAIT_TIMEOUT) {
|
if (result == SC_ACKSYNC_WAIT_TIMEOUT) {
|
||||||
LOGW("Ack not received after 500ms, discarding HID event");
|
LOGW("Ack not received after 500ms, discarding HID event");
|
||||||
sc_hid_event_destroy(&event);
|
|
||||||
continue;
|
continue;
|
||||||
} else if (result == SC_ACKSYNC_WAIT_INTR) {
|
} else if (result == SC_ACKSYNC_WAIT_INTR) {
|
||||||
// stopped
|
// stopped
|
||||||
sc_hid_event_destroy(&event);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ok = sc_aoa_send_hid_event(aoa, &event);
|
bool ok = sc_aoa_send_hid_event(aoa, event.accessory_id, &event.hid);
|
||||||
sc_hid_event_destroy(&event);
|
|
||||||
if (!ok) {
|
if (!ok) {
|
||||||
LOGW("Could not send HID event to USB device");
|
LOGW("Could not send HID event to USB device");
|
||||||
}
|
}
|
||||||
|
@ -6,28 +6,22 @@
|
|||||||
|
|
||||||
#include <libusb-1.0/libusb.h>
|
#include <libusb-1.0/libusb.h>
|
||||||
|
|
||||||
|
#include "hid/hid_event.h"
|
||||||
#include "usb.h"
|
#include "usb.h"
|
||||||
#include "util/acksync.h"
|
#include "util/acksync.h"
|
||||||
#include "util/thread.h"
|
#include "util/thread.h"
|
||||||
#include "util/tick.h"
|
#include "util/tick.h"
|
||||||
#include "util/vecdeque.h"
|
#include "util/vecdeque.h"
|
||||||
|
|
||||||
struct sc_hid_event {
|
#define SC_HID_MAX_SIZE 8
|
||||||
|
|
||||||
|
struct sc_aoa_event {
|
||||||
|
struct sc_hid_event hid;
|
||||||
uint16_t accessory_id;
|
uint16_t accessory_id;
|
||||||
unsigned char *buffer;
|
|
||||||
uint16_t size;
|
|
||||||
uint64_t ack_to_wait;
|
uint64_t ack_to_wait;
|
||||||
};
|
};
|
||||||
|
|
||||||
// Takes ownership of buffer
|
struct sc_aoa_event_queue SC_VECDEQUE(struct sc_aoa_event);
|
||||||
void
|
|
||||||
sc_hid_event_init(struct sc_hid_event *hid_event, uint16_t accessory_id,
|
|
||||||
unsigned char *buffer, uint16_t buffer_size);
|
|
||||||
|
|
||||||
void
|
|
||||||
sc_hid_event_destroy(struct sc_hid_event *hid_event);
|
|
||||||
|
|
||||||
struct sc_hid_event_queue SC_VECDEQUE(struct sc_hid_event);
|
|
||||||
|
|
||||||
struct sc_aoa {
|
struct sc_aoa {
|
||||||
struct sc_usb *usb;
|
struct sc_usb *usb;
|
||||||
@ -35,7 +29,7 @@ struct sc_aoa {
|
|||||||
sc_mutex mutex;
|
sc_mutex mutex;
|
||||||
sc_cond event_cond;
|
sc_cond event_cond;
|
||||||
bool stopped;
|
bool stopped;
|
||||||
struct sc_hid_event_queue queue;
|
struct sc_aoa_event_queue queue;
|
||||||
|
|
||||||
struct sc_acksync *acksync;
|
struct sc_acksync *acksync;
|
||||||
};
|
};
|
||||||
@ -57,12 +51,22 @@ sc_aoa_join(struct sc_aoa *aoa);
|
|||||||
|
|
||||||
bool
|
bool
|
||||||
sc_aoa_setup_hid(struct sc_aoa *aoa, uint16_t accessory_id,
|
sc_aoa_setup_hid(struct sc_aoa *aoa, uint16_t accessory_id,
|
||||||
const unsigned char *report_desc, uint16_t report_desc_size);
|
const uint8_t *report_desc, uint16_t report_desc_size);
|
||||||
|
|
||||||
bool
|
bool
|
||||||
sc_aoa_unregister_hid(struct sc_aoa *aoa, uint16_t accessory_id);
|
sc_aoa_unregister_hid(struct sc_aoa *aoa, uint16_t accessory_id);
|
||||||
|
|
||||||
bool
|
bool
|
||||||
sc_aoa_push_hid_event(struct sc_aoa *aoa, const struct sc_hid_event *event);
|
sc_aoa_push_hid_event_with_ack_to_wait(struct sc_aoa *aoa,
|
||||||
|
uint16_t accessory_id,
|
||||||
|
const struct sc_hid_event *event,
|
||||||
|
uint64_t ack_to_wait);
|
||||||
|
|
||||||
|
static inline bool
|
||||||
|
sc_aoa_push_hid_event(struct sc_aoa *aoa, uint16_t accessory_id,
|
||||||
|
const struct sc_hid_event *event) {
|
||||||
|
return sc_aoa_push_hid_event_with_ack_to_wait(aoa, accessory_id, event,
|
||||||
|
SC_SEQUENCE_INVALID);
|
||||||
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -1,267 +0,0 @@
|
|||||||
#include "hid_mouse.h"
|
|
||||||
|
|
||||||
#include <assert.h>
|
|
||||||
|
|
||||||
#include "input_events.h"
|
|
||||||
#include "util/log.h"
|
|
||||||
|
|
||||||
/** Downcast mouse processor to hid_mouse */
|
|
||||||
#define DOWNCAST(MP) container_of(MP, struct sc_hid_mouse, mouse_processor)
|
|
||||||
|
|
||||||
#define HID_MOUSE_ACCESSORY_ID 2
|
|
||||||
|
|
||||||
// 1 byte for buttons + padding, 1 byte for X position, 1 byte for Y position
|
|
||||||
#define HID_MOUSE_EVENT_SIZE 4
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Mouse descriptor from the specification:
|
|
||||||
* <https://www.usb.org/sites/default/files/hid1_11.pdf>
|
|
||||||
*
|
|
||||||
* Appendix E (p71): §E.10 Report Descriptor (Mouse)
|
|
||||||
*
|
|
||||||
* The usage tags (like Wheel) are listed in "HID Usage Tables":
|
|
||||||
* <https://www.usb.org/sites/default/files/documents/hut1_12v2.pdf>
|
|
||||||
* §4 Generic Desktop Page (0x01) (p26)
|
|
||||||
*/
|
|
||||||
static const unsigned char mouse_report_desc[] = {
|
|
||||||
// Usage Page (Generic Desktop)
|
|
||||||
0x05, 0x01,
|
|
||||||
// Usage (Mouse)
|
|
||||||
0x09, 0x02,
|
|
||||||
|
|
||||||
// Collection (Application)
|
|
||||||
0xA1, 0x01,
|
|
||||||
|
|
||||||
// Usage (Pointer)
|
|
||||||
0x09, 0x01,
|
|
||||||
|
|
||||||
// Collection (Physical)
|
|
||||||
0xA1, 0x00,
|
|
||||||
|
|
||||||
// Usage Page (Buttons)
|
|
||||||
0x05, 0x09,
|
|
||||||
|
|
||||||
// Usage Minimum (1)
|
|
||||||
0x19, 0x01,
|
|
||||||
// Usage Maximum (5)
|
|
||||||
0x29, 0x05,
|
|
||||||
// Logical Minimum (0)
|
|
||||||
0x15, 0x00,
|
|
||||||
// Logical Maximum (1)
|
|
||||||
0x25, 0x01,
|
|
||||||
// Report Count (5)
|
|
||||||
0x95, 0x05,
|
|
||||||
// Report Size (1)
|
|
||||||
0x75, 0x01,
|
|
||||||
// Input (Data, Variable, Absolute): 5 buttons bits
|
|
||||||
0x81, 0x02,
|
|
||||||
|
|
||||||
// Report Count (1)
|
|
||||||
0x95, 0x01,
|
|
||||||
// Report Size (3)
|
|
||||||
0x75, 0x03,
|
|
||||||
// Input (Constant): 3 bits padding
|
|
||||||
0x81, 0x01,
|
|
||||||
|
|
||||||
// Usage Page (Generic Desktop)
|
|
||||||
0x05, 0x01,
|
|
||||||
// Usage (X)
|
|
||||||
0x09, 0x30,
|
|
||||||
// Usage (Y)
|
|
||||||
0x09, 0x31,
|
|
||||||
// Usage (Wheel)
|
|
||||||
0x09, 0x38,
|
|
||||||
// Local Minimum (-127)
|
|
||||||
0x15, 0x81,
|
|
||||||
// Local Maximum (127)
|
|
||||||
0x25, 0x7F,
|
|
||||||
// Report Size (8)
|
|
||||||
0x75, 0x08,
|
|
||||||
// Report Count (3)
|
|
||||||
0x95, 0x03,
|
|
||||||
// Input (Data, Variable, Relative): 3 position bytes (X, Y, Wheel)
|
|
||||||
0x81, 0x06,
|
|
||||||
|
|
||||||
// End Collection
|
|
||||||
0xC0,
|
|
||||||
|
|
||||||
// End Collection
|
|
||||||
0xC0,
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A mouse HID event is 3 bytes long:
|
|
||||||
*
|
|
||||||
* - byte 0: buttons state
|
|
||||||
* - byte 1: relative x motion (signed byte from -127 to 127)
|
|
||||||
* - byte 2: relative y motion (signed byte from -127 to 127)
|
|
||||||
*
|
|
||||||
* 7 6 5 4 3 2 1 0
|
|
||||||
* +---------------+
|
|
||||||
* byte 0: |0 0 0 . . . . .| buttons state
|
|
||||||
* +---------------+
|
|
||||||
* ^ ^ ^ ^ ^
|
|
||||||
* | | | | `- left button
|
|
||||||
* | | | `--- right button
|
|
||||||
* | | `----- middle button
|
|
||||||
* | `------- button 4
|
|
||||||
* `--------- button 5
|
|
||||||
*
|
|
||||||
* +---------------+
|
|
||||||
* byte 1: |. . . . . . . .| relative x motion
|
|
||||||
* +---------------+
|
|
||||||
* byte 2: |. . . . . . . .| relative y motion
|
|
||||||
* +---------------+
|
|
||||||
* byte 3: |. . . . . . . .| wheel motion (-1, 0 or 1)
|
|
||||||
* +---------------+
|
|
||||||
*
|
|
||||||
* As an example, here is the report for a motion of (x=5, y=-4) with left
|
|
||||||
* button pressed:
|
|
||||||
*
|
|
||||||
* +---------------+
|
|
||||||
* |0 0 0 0 0 0 0 1| left button pressed
|
|
||||||
* +---------------+
|
|
||||||
* |0 0 0 0 0 1 0 1| horizontal motion (x = 5)
|
|
||||||
* +---------------+
|
|
||||||
* |1 1 1 1 1 1 0 0| relative y motion (y = -4)
|
|
||||||
* +---------------+
|
|
||||||
* |0 0 0 0 0 0 0 0| wheel motion
|
|
||||||
* +---------------+
|
|
||||||
*/
|
|
||||||
|
|
||||||
static bool
|
|
||||||
sc_hid_mouse_event_init(struct sc_hid_event *hid_event) {
|
|
||||||
unsigned char *buffer = calloc(1, HID_MOUSE_EVENT_SIZE);
|
|
||||||
if (!buffer) {
|
|
||||||
LOG_OOM();
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
sc_hid_event_init(hid_event, HID_MOUSE_ACCESSORY_ID, buffer,
|
|
||||||
HID_MOUSE_EVENT_SIZE);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
static unsigned char
|
|
||||||
buttons_state_to_hid_buttons(uint8_t buttons_state) {
|
|
||||||
unsigned char c = 0;
|
|
||||||
if (buttons_state & SC_MOUSE_BUTTON_LEFT) {
|
|
||||||
c |= 1 << 0;
|
|
||||||
}
|
|
||||||
if (buttons_state & SC_MOUSE_BUTTON_RIGHT) {
|
|
||||||
c |= 1 << 1;
|
|
||||||
}
|
|
||||||
if (buttons_state & SC_MOUSE_BUTTON_MIDDLE) {
|
|
||||||
c |= 1 << 2;
|
|
||||||
}
|
|
||||||
if (buttons_state & SC_MOUSE_BUTTON_X1) {
|
|
||||||
c |= 1 << 3;
|
|
||||||
}
|
|
||||||
if (buttons_state & SC_MOUSE_BUTTON_X2) {
|
|
||||||
c |= 1 << 4;
|
|
||||||
}
|
|
||||||
return c;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
sc_mouse_processor_process_mouse_motion(struct sc_mouse_processor *mp,
|
|
||||||
const struct sc_mouse_motion_event *event) {
|
|
||||||
struct sc_hid_mouse *mouse = DOWNCAST(mp);
|
|
||||||
|
|
||||||
struct sc_hid_event hid_event;
|
|
||||||
if (!sc_hid_mouse_event_init(&hid_event)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
unsigned char *buffer = hid_event.buffer;
|
|
||||||
buffer[0] = buttons_state_to_hid_buttons(event->buttons_state);
|
|
||||||
buffer[1] = CLAMP(event->xrel, -127, 127);
|
|
||||||
buffer[2] = CLAMP(event->yrel, -127, 127);
|
|
||||||
buffer[3] = 0; // wheel coordinates only used for scrolling
|
|
||||||
|
|
||||||
if (!sc_aoa_push_hid_event(mouse->aoa, &hid_event)) {
|
|
||||||
sc_hid_event_destroy(&hid_event);
|
|
||||||
LOGW("Could not request HID event (mouse motion)");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
sc_mouse_processor_process_mouse_click(struct sc_mouse_processor *mp,
|
|
||||||
const struct sc_mouse_click_event *event) {
|
|
||||||
struct sc_hid_mouse *mouse = DOWNCAST(mp);
|
|
||||||
|
|
||||||
struct sc_hid_event hid_event;
|
|
||||||
if (!sc_hid_mouse_event_init(&hid_event)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
unsigned char *buffer = hid_event.buffer;
|
|
||||||
buffer[0] = buttons_state_to_hid_buttons(event->buttons_state);
|
|
||||||
buffer[1] = 0; // no x motion
|
|
||||||
buffer[2] = 0; // no y motion
|
|
||||||
buffer[3] = 0; // wheel coordinates only used for scrolling
|
|
||||||
|
|
||||||
if (!sc_aoa_push_hid_event(mouse->aoa, &hid_event)) {
|
|
||||||
sc_hid_event_destroy(&hid_event);
|
|
||||||
LOGW("Could not request HID event (mouse click)");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
sc_mouse_processor_process_mouse_scroll(struct sc_mouse_processor *mp,
|
|
||||||
const struct sc_mouse_scroll_event *event) {
|
|
||||||
struct sc_hid_mouse *mouse = DOWNCAST(mp);
|
|
||||||
|
|
||||||
struct sc_hid_event hid_event;
|
|
||||||
if (!sc_hid_mouse_event_init(&hid_event)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
unsigned char *buffer = hid_event.buffer;
|
|
||||||
buffer[0] = 0; // buttons state irrelevant (and unknown)
|
|
||||||
buffer[1] = 0; // no x motion
|
|
||||||
buffer[2] = 0; // no y motion
|
|
||||||
// In practice, vscroll is always -1, 0 or 1, but in theory other values
|
|
||||||
// are possible
|
|
||||||
buffer[3] = CLAMP(event->vscroll, -127, 127);
|
|
||||||
// Horizontal scrolling ignored
|
|
||||||
|
|
||||||
if (!sc_aoa_push_hid_event(mouse->aoa, &hid_event)) {
|
|
||||||
sc_hid_event_destroy(&hid_event);
|
|
||||||
LOGW("Could not request HID event (mouse scroll)");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
bool
|
|
||||||
sc_hid_mouse_init(struct sc_hid_mouse *mouse, struct sc_aoa *aoa) {
|
|
||||||
mouse->aoa = aoa;
|
|
||||||
|
|
||||||
bool ok = sc_aoa_setup_hid(aoa, HID_MOUSE_ACCESSORY_ID, mouse_report_desc,
|
|
||||||
ARRAY_LEN(mouse_report_desc));
|
|
||||||
if (!ok) {
|
|
||||||
LOGW("Register HID mouse failed");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
static const struct sc_mouse_processor_ops ops = {
|
|
||||||
.process_mouse_motion = sc_mouse_processor_process_mouse_motion,
|
|
||||||
.process_mouse_click = sc_mouse_processor_process_mouse_click,
|
|
||||||
.process_mouse_scroll = sc_mouse_processor_process_mouse_scroll,
|
|
||||||
// Touch events not supported (coordinates are not relative)
|
|
||||||
.process_touch = NULL,
|
|
||||||
};
|
|
||||||
|
|
||||||
mouse->mouse_processor.ops = &ops;
|
|
||||||
|
|
||||||
mouse->mouse_processor.relative_mode = true;
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
sc_hid_mouse_destroy(struct sc_hid_mouse *mouse) {
|
|
||||||
bool ok = sc_aoa_unregister_hid(mouse->aoa, HID_MOUSE_ACCESSORY_ID);
|
|
||||||
if (!ok) {
|
|
||||||
LOGW("Could not unregister HID mouse");
|
|
||||||
}
|
|
||||||
}
|
|
110
app/src/usb/keyboard_aoa.c
Normal file
110
app/src/usb/keyboard_aoa.c
Normal file
@ -0,0 +1,110 @@
|
|||||||
|
#include "keyboard_aoa.h"
|
||||||
|
|
||||||
|
#include <assert.h>
|
||||||
|
|
||||||
|
#include "input_events.h"
|
||||||
|
#include "util/log.h"
|
||||||
|
|
||||||
|
/** Downcast key processor to keyboard_aoa */
|
||||||
|
#define DOWNCAST(KP) container_of(KP, struct sc_keyboard_aoa, key_processor)
|
||||||
|
|
||||||
|
#define HID_KEYBOARD_ACCESSORY_ID 1
|
||||||
|
|
||||||
|
static bool
|
||||||
|
push_mod_lock_state(struct sc_keyboard_aoa *kb, uint16_t mods_state) {
|
||||||
|
struct sc_hid_event hid_event;
|
||||||
|
if (!sc_hid_keyboard_event_from_mods(&hid_event, mods_state)) {
|
||||||
|
// Nothing to do
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!sc_aoa_push_hid_event(kb->aoa, HID_KEYBOARD_ACCESSORY_ID,
|
||||||
|
&hid_event)) {
|
||||||
|
LOGW("Could not request HID event (mod lock state)");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
LOGD("HID keyboard state synchronized");
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
sc_key_processor_process_key(struct sc_key_processor *kp,
|
||||||
|
const struct sc_key_event *event,
|
||||||
|
uint64_t ack_to_wait) {
|
||||||
|
if (event->repeat) {
|
||||||
|
// In USB HID protocol, key repeat is handled by the host (Android), so
|
||||||
|
// just ignore key repeat here.
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct sc_keyboard_aoa *kb = DOWNCAST(kp);
|
||||||
|
|
||||||
|
struct sc_hid_event hid_event;
|
||||||
|
|
||||||
|
// Not all keys are supported, just ignore unsupported keys
|
||||||
|
if (sc_hid_keyboard_event_from_key(&kb->hid, &hid_event, event)) {
|
||||||
|
if (!kb->mod_lock_synchronized) {
|
||||||
|
// Inject CAPSLOCK and/or NUMLOCK if necessary to synchronize
|
||||||
|
// keyboard state
|
||||||
|
if (push_mod_lock_state(kb, event->mods_state)) {
|
||||||
|
kb->mod_lock_synchronized = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// If ack_to_wait is != SC_SEQUENCE_INVALID, then Ctrl+v is pressed, so
|
||||||
|
// clipboard synchronization has been requested. Wait until clipboard
|
||||||
|
// synchronization is acknowledged by the server, otherwise it could
|
||||||
|
// paste the old clipboard content.
|
||||||
|
|
||||||
|
if (!sc_aoa_push_hid_event_with_ack_to_wait(kb->aoa,
|
||||||
|
HID_KEYBOARD_ACCESSORY_ID,
|
||||||
|
&hid_event,
|
||||||
|
ack_to_wait)) {
|
||||||
|
LOGW("Could not request HID event (key)");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool
|
||||||
|
sc_keyboard_aoa_init(struct sc_keyboard_aoa *kb, struct sc_aoa *aoa) {
|
||||||
|
kb->aoa = aoa;
|
||||||
|
|
||||||
|
bool ok = sc_aoa_setup_hid(aoa, HID_KEYBOARD_ACCESSORY_ID,
|
||||||
|
SC_HID_KEYBOARD_REPORT_DESC,
|
||||||
|
SC_HID_KEYBOARD_REPORT_DESC_LEN);
|
||||||
|
if (!ok) {
|
||||||
|
LOGW("Register HID keyboard failed");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
sc_hid_keyboard_init(&kb->hid);
|
||||||
|
|
||||||
|
kb->mod_lock_synchronized = false;
|
||||||
|
|
||||||
|
static const struct sc_key_processor_ops ops = {
|
||||||
|
.process_key = sc_key_processor_process_key,
|
||||||
|
// Never forward text input via HID (all the keys are injected
|
||||||
|
// separately)
|
||||||
|
.process_text = NULL,
|
||||||
|
};
|
||||||
|
|
||||||
|
// Clipboard synchronization is requested over the control socket, while HID
|
||||||
|
// events are sent over AOA, so it must wait for clipboard synchronization
|
||||||
|
// to be acknowledged by the device before injecting Ctrl+v.
|
||||||
|
kb->key_processor.async_paste = true;
|
||||||
|
kb->key_processor.hid = true;
|
||||||
|
kb->key_processor.ops = &ops;
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
sc_keyboard_aoa_destroy(struct sc_keyboard_aoa *kb) {
|
||||||
|
// Unregister HID keyboard so the soft keyboard shows again on Android
|
||||||
|
bool ok = sc_aoa_unregister_hid(kb->aoa, HID_KEYBOARD_ACCESSORY_ID);
|
||||||
|
if (!ok) {
|
||||||
|
LOGW("Could not unregister HID keyboard");
|
||||||
|
}
|
||||||
|
}
|
27
app/src/usb/keyboard_aoa.h
Normal file
27
app/src/usb/keyboard_aoa.h
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
#ifndef SC_KEYBOARD_AOA_H
|
||||||
|
#define SC_KEYBOARD_AOA_H
|
||||||
|
|
||||||
|
#include "common.h"
|
||||||
|
|
||||||
|
#include <stdbool.h>
|
||||||
|
|
||||||
|
#include "aoa_hid.h"
|
||||||
|
#include "hid/hid_keyboard.h"
|
||||||
|
#include "trait/key_processor.h"
|
||||||
|
|
||||||
|
struct sc_keyboard_aoa {
|
||||||
|
struct sc_key_processor key_processor; // key processor trait
|
||||||
|
|
||||||
|
struct sc_hid_keyboard hid;
|
||||||
|
struct sc_aoa *aoa;
|
||||||
|
|
||||||
|
bool mod_lock_synchronized;
|
||||||
|
};
|
||||||
|
|
||||||
|
bool
|
||||||
|
sc_keyboard_aoa_init(struct sc_keyboard_aoa *kb, struct sc_aoa *aoa);
|
||||||
|
|
||||||
|
void
|
||||||
|
sc_keyboard_aoa_destroy(struct sc_keyboard_aoa *kb);
|
||||||
|
|
||||||
|
#endif
|
89
app/src/usb/mouse_aoa.c
Normal file
89
app/src/usb/mouse_aoa.c
Normal file
@ -0,0 +1,89 @@
|
|||||||
|
#include "mouse_aoa.h"
|
||||||
|
|
||||||
|
#include <assert.h>
|
||||||
|
|
||||||
|
#include "hid/hid_mouse.h"
|
||||||
|
#include "input_events.h"
|
||||||
|
#include "util/log.h"
|
||||||
|
|
||||||
|
/** Downcast mouse processor to mouse_aoa */
|
||||||
|
#define DOWNCAST(MP) container_of(MP, struct sc_mouse_aoa, mouse_processor)
|
||||||
|
|
||||||
|
#define HID_MOUSE_ACCESSORY_ID 2
|
||||||
|
|
||||||
|
static void
|
||||||
|
sc_mouse_processor_process_mouse_motion(struct sc_mouse_processor *mp,
|
||||||
|
const struct sc_mouse_motion_event *event) {
|
||||||
|
struct sc_mouse_aoa *mouse = DOWNCAST(mp);
|
||||||
|
|
||||||
|
struct sc_hid_event hid_event;
|
||||||
|
sc_hid_mouse_event_from_motion(&hid_event, event);
|
||||||
|
|
||||||
|
if (!sc_aoa_push_hid_event(mouse->aoa, HID_MOUSE_ACCESSORY_ID,
|
||||||
|
&hid_event)) {
|
||||||
|
LOGW("Could not request HID event (mouse motion)");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
sc_mouse_processor_process_mouse_click(struct sc_mouse_processor *mp,
|
||||||
|
const struct sc_mouse_click_event *event) {
|
||||||
|
struct sc_mouse_aoa *mouse = DOWNCAST(mp);
|
||||||
|
|
||||||
|
struct sc_hid_event hid_event;
|
||||||
|
sc_hid_mouse_event_from_click(&hid_event, event);
|
||||||
|
|
||||||
|
if (!sc_aoa_push_hid_event(mouse->aoa, HID_MOUSE_ACCESSORY_ID,
|
||||||
|
&hid_event)) {
|
||||||
|
LOGW("Could not request HID event (mouse click)");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
sc_mouse_processor_process_mouse_scroll(struct sc_mouse_processor *mp,
|
||||||
|
const struct sc_mouse_scroll_event *event) {
|
||||||
|
struct sc_mouse_aoa *mouse = DOWNCAST(mp);
|
||||||
|
|
||||||
|
struct sc_hid_event hid_event;
|
||||||
|
sc_hid_mouse_event_from_scroll(&hid_event, event);
|
||||||
|
|
||||||
|
if (!sc_aoa_push_hid_event(mouse->aoa, HID_MOUSE_ACCESSORY_ID,
|
||||||
|
&hid_event)) {
|
||||||
|
LOGW("Could not request HID event (mouse scroll)");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool
|
||||||
|
sc_mouse_aoa_init(struct sc_mouse_aoa *mouse, struct sc_aoa *aoa) {
|
||||||
|
mouse->aoa = aoa;
|
||||||
|
|
||||||
|
bool ok = sc_aoa_setup_hid(aoa, HID_MOUSE_ACCESSORY_ID,
|
||||||
|
SC_HID_MOUSE_REPORT_DESC,
|
||||||
|
SC_HID_MOUSE_REPORT_DESC_LEN);
|
||||||
|
if (!ok) {
|
||||||
|
LOGW("Register HID mouse failed");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
static const struct sc_mouse_processor_ops ops = {
|
||||||
|
.process_mouse_motion = sc_mouse_processor_process_mouse_motion,
|
||||||
|
.process_mouse_click = sc_mouse_processor_process_mouse_click,
|
||||||
|
.process_mouse_scroll = sc_mouse_processor_process_mouse_scroll,
|
||||||
|
// Touch events not supported (coordinates are not relative)
|
||||||
|
.process_touch = NULL,
|
||||||
|
};
|
||||||
|
|
||||||
|
mouse->mouse_processor.ops = &ops;
|
||||||
|
|
||||||
|
mouse->mouse_processor.relative_mode = true;
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
sc_mouse_aoa_destroy(struct sc_mouse_aoa *mouse) {
|
||||||
|
bool ok = sc_aoa_unregister_hid(mouse->aoa, HID_MOUSE_ACCESSORY_ID);
|
||||||
|
if (!ok) {
|
||||||
|
LOGW("Could not unregister HID mouse");
|
||||||
|
}
|
||||||
|
}
|
@ -1,5 +1,5 @@
|
|||||||
#ifndef SC_HID_MOUSE_H
|
#ifndef SC_MOUSE_AOA_H
|
||||||
#define SC_HID_MOUSE_H
|
#define SC_MOUSE_AOA_H
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
||||||
@ -8,16 +8,16 @@
|
|||||||
#include "aoa_hid.h"
|
#include "aoa_hid.h"
|
||||||
#include "trait/mouse_processor.h"
|
#include "trait/mouse_processor.h"
|
||||||
|
|
||||||
struct sc_hid_mouse {
|
struct sc_mouse_aoa {
|
||||||
struct sc_mouse_processor mouse_processor; // mouse processor trait
|
struct sc_mouse_processor mouse_processor; // mouse processor trait
|
||||||
|
|
||||||
struct sc_aoa *aoa;
|
struct sc_aoa *aoa;
|
||||||
};
|
};
|
||||||
|
|
||||||
bool
|
bool
|
||||||
sc_hid_mouse_init(struct sc_hid_mouse *mouse, struct sc_aoa *aoa);
|
sc_mouse_aoa_init(struct sc_mouse_aoa *mouse, struct sc_aoa *aoa);
|
||||||
|
|
||||||
void
|
void
|
||||||
sc_hid_mouse_destroy(struct sc_hid_mouse *mouse);
|
sc_mouse_aoa_destroy(struct sc_mouse_aoa *mouse);
|
||||||
|
|
||||||
#endif
|
#endif
|
@ -10,8 +10,8 @@
|
|||||||
struct scrcpy_otg {
|
struct scrcpy_otg {
|
||||||
struct sc_usb usb;
|
struct sc_usb usb;
|
||||||
struct sc_aoa aoa;
|
struct sc_aoa aoa;
|
||||||
struct sc_hid_keyboard keyboard;
|
struct sc_keyboard_aoa keyboard;
|
||||||
struct sc_hid_mouse mouse;
|
struct sc_mouse_aoa mouse;
|
||||||
|
|
||||||
struct sc_screen_otg screen_otg;
|
struct sc_screen_otg screen_otg;
|
||||||
};
|
};
|
||||||
@ -62,7 +62,7 @@ scrcpy_otg(struct scrcpy_options *options) {
|
|||||||
// Minimal SDL initialization
|
// Minimal SDL initialization
|
||||||
if (SDL_Init(SDL_INIT_EVENTS)) {
|
if (SDL_Init(SDL_INIT_EVENTS)) {
|
||||||
LOGE("Could not initialize SDL: %s", SDL_GetError());
|
LOGE("Could not initialize SDL: %s", SDL_GetError());
|
||||||
return false;
|
return SCRCPY_EXIT_FAILURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
atexit(SDL_Quit);
|
atexit(SDL_Quit);
|
||||||
@ -73,8 +73,8 @@ scrcpy_otg(struct scrcpy_options *options) {
|
|||||||
|
|
||||||
enum scrcpy_exit_code ret = SCRCPY_EXIT_FAILURE;
|
enum scrcpy_exit_code ret = SCRCPY_EXIT_FAILURE;
|
||||||
|
|
||||||
struct sc_hid_keyboard *keyboard = NULL;
|
struct sc_keyboard_aoa *keyboard = NULL;
|
||||||
struct sc_hid_mouse *mouse = NULL;
|
struct sc_mouse_aoa *mouse = NULL;
|
||||||
bool usb_device_initialized = false;
|
bool usb_device_initialized = false;
|
||||||
bool usb_connected = false;
|
bool usb_connected = false;
|
||||||
bool aoa_started = false;
|
bool aoa_started = false;
|
||||||
@ -117,19 +117,18 @@ scrcpy_otg(struct scrcpy_options *options) {
|
|||||||
}
|
}
|
||||||
aoa_initialized = true;
|
aoa_initialized = true;
|
||||||
|
|
||||||
bool enable_keyboard =
|
assert(options->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_AOA
|
||||||
options->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_HID;
|
|| options->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_DISABLED);
|
||||||
bool enable_mouse =
|
assert(options->mouse_input_mode == SC_MOUSE_INPUT_MODE_AOA
|
||||||
options->mouse_input_mode == SC_MOUSE_INPUT_MODE_HID;
|
|| options->mouse_input_mode == SC_MOUSE_INPUT_MODE_DISABLED);
|
||||||
|
|
||||||
// If neither --hid-keyboard or --hid-mouse is passed, enable both
|
bool enable_keyboard =
|
||||||
if (!enable_keyboard && !enable_mouse) {
|
options->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_AOA;
|
||||||
enable_keyboard = true;
|
bool enable_mouse =
|
||||||
enable_mouse = true;
|
options->mouse_input_mode == SC_MOUSE_INPUT_MODE_AOA;
|
||||||
}
|
|
||||||
|
|
||||||
if (enable_keyboard) {
|
if (enable_keyboard) {
|
||||||
ok = sc_hid_keyboard_init(&s->keyboard, &s->aoa);
|
ok = sc_keyboard_aoa_init(&s->keyboard, &s->aoa);
|
||||||
if (!ok) {
|
if (!ok) {
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
@ -137,7 +136,7 @@ scrcpy_otg(struct scrcpy_options *options) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (enable_mouse) {
|
if (enable_mouse) {
|
||||||
ok = sc_hid_mouse_init(&s->mouse, &s->aoa);
|
ok = sc_mouse_aoa_init(&s->mouse, &s->aoa);
|
||||||
if (!ok) {
|
if (!ok) {
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
@ -186,10 +185,10 @@ end:
|
|||||||
sc_usb_stop(&s->usb);
|
sc_usb_stop(&s->usb);
|
||||||
|
|
||||||
if (mouse) {
|
if (mouse) {
|
||||||
sc_hid_mouse_destroy(&s->mouse);
|
sc_mouse_aoa_destroy(&s->mouse);
|
||||||
}
|
}
|
||||||
if (keyboard) {
|
if (keyboard) {
|
||||||
sc_hid_keyboard_destroy(&s->keyboard);
|
sc_keyboard_aoa_destroy(&s->keyboard);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (aoa_initialized) {
|
if (aoa_initialized) {
|
||||||
|
@ -6,12 +6,12 @@
|
|||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <SDL2/SDL.h>
|
#include <SDL2/SDL.h>
|
||||||
|
|
||||||
#include "hid_keyboard.h"
|
#include "keyboard_aoa.h"
|
||||||
#include "hid_mouse.h"
|
#include "mouse_aoa.h"
|
||||||
|
|
||||||
struct sc_screen_otg {
|
struct sc_screen_otg {
|
||||||
struct sc_hid_keyboard *keyboard;
|
struct sc_keyboard_aoa *keyboard;
|
||||||
struct sc_hid_mouse *mouse;
|
struct sc_mouse_aoa *mouse;
|
||||||
|
|
||||||
SDL_Window *window;
|
SDL_Window *window;
|
||||||
SDL_Renderer *renderer;
|
SDL_Renderer *renderer;
|
||||||
@ -22,8 +22,8 @@ struct sc_screen_otg {
|
|||||||
};
|
};
|
||||||
|
|
||||||
struct sc_screen_otg_params {
|
struct sc_screen_otg_params {
|
||||||
struct sc_hid_keyboard *keyboard;
|
struct sc_keyboard_aoa *keyboard;
|
||||||
struct sc_hid_mouse *mouse;
|
struct sc_mouse_aoa *mouse;
|
||||||
|
|
||||||
const char *window_title;
|
const char *window_title;
|
||||||
bool always_on_top;
|
bool always_on_top;
|
||||||
|
@ -93,7 +93,7 @@ sc_usb_device_move(struct sc_usb_device *dst, struct sc_usb_device *src) {
|
|||||||
src->product = NULL;
|
src->product = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
static void
|
||||||
sc_usb_devices_destroy(struct sc_vec_usb_devices *usb_devices) {
|
sc_usb_devices_destroy(struct sc_vec_usb_devices *usb_devices) {
|
||||||
for (size_t i = 0; i < usb_devices->size; ++i) {
|
for (size_t i = 0; i < usb_devices->size; ++i) {
|
||||||
sc_usb_device_destroy(&usb_devices->data[i]);
|
sc_usb_device_destroy(&usb_devices->data[i]);
|
||||||
|
112
app/src/util/audiobuf.c
Normal file
112
app/src/util/audiobuf.c
Normal file
@ -0,0 +1,112 @@
|
|||||||
|
#include "audiobuf.h"
|
||||||
|
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <util/log.h>
|
||||||
|
#include <util/memory.h>
|
||||||
|
|
||||||
|
bool
|
||||||
|
sc_audiobuf_init(struct sc_audiobuf *buf, size_t sample_size,
|
||||||
|
uint32_t capacity) {
|
||||||
|
assert(sample_size);
|
||||||
|
assert(capacity);
|
||||||
|
|
||||||
|
// The actual capacity is (alloc_size - 1) so that head == tail is
|
||||||
|
// non-ambiguous
|
||||||
|
buf->alloc_size = capacity + 1;
|
||||||
|
buf->data = sc_allocarray(buf->alloc_size, sample_size);
|
||||||
|
if (!buf->data) {
|
||||||
|
LOG_OOM();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
buf->sample_size = sample_size;
|
||||||
|
atomic_init(&buf->head, 0);
|
||||||
|
atomic_init(&buf->tail, 0);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
sc_audiobuf_destroy(struct sc_audiobuf *buf) {
|
||||||
|
free(buf->data);
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32_t
|
||||||
|
sc_audiobuf_read(struct sc_audiobuf *buf, void *to_, uint32_t samples_count) {
|
||||||
|
assert(samples_count);
|
||||||
|
|
||||||
|
uint8_t *to = to_;
|
||||||
|
|
||||||
|
// Only the reader thread can write tail without synchronization, so
|
||||||
|
// memory_order_relaxed is sufficient
|
||||||
|
uint32_t tail = atomic_load_explicit(&buf->tail, memory_order_relaxed);
|
||||||
|
|
||||||
|
// The head cursor is updated after the data is written to the array
|
||||||
|
uint32_t head = atomic_load_explicit(&buf->head, memory_order_acquire);
|
||||||
|
|
||||||
|
uint32_t can_read = (buf->alloc_size + head - tail) % buf->alloc_size;
|
||||||
|
if (samples_count > can_read) {
|
||||||
|
samples_count = can_read;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (to) {
|
||||||
|
uint32_t right_count = buf->alloc_size - tail;
|
||||||
|
if (right_count > samples_count) {
|
||||||
|
right_count = samples_count;
|
||||||
|
}
|
||||||
|
memcpy(to,
|
||||||
|
buf->data + (tail * buf->sample_size),
|
||||||
|
right_count * buf->sample_size);
|
||||||
|
|
||||||
|
if (samples_count > right_count) {
|
||||||
|
uint32_t left_count = samples_count - right_count;
|
||||||
|
memcpy(to + (right_count * buf->sample_size),
|
||||||
|
buf->data,
|
||||||
|
left_count * buf->sample_size);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32_t new_tail = (tail + samples_count) % buf->alloc_size;
|
||||||
|
atomic_store_explicit(&buf->tail, new_tail, memory_order_release);
|
||||||
|
|
||||||
|
return samples_count;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32_t
|
||||||
|
sc_audiobuf_write(struct sc_audiobuf *buf, const void *from_,
|
||||||
|
uint32_t samples_count) {
|
||||||
|
const uint8_t *from = from_;
|
||||||
|
|
||||||
|
// Only the writer thread can write head, so memory_order_relaxed is
|
||||||
|
// sufficient
|
||||||
|
uint32_t head = atomic_load_explicit(&buf->head, memory_order_relaxed);
|
||||||
|
|
||||||
|
// The tail cursor is updated after the data is consumed by the reader
|
||||||
|
uint32_t tail = atomic_load_explicit(&buf->tail, memory_order_acquire);
|
||||||
|
|
||||||
|
uint32_t can_write = (buf->alloc_size + tail - head - 1) % buf->alloc_size;
|
||||||
|
if (samples_count > can_write) {
|
||||||
|
samples_count = can_write;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32_t right_count = buf->alloc_size - head;
|
||||||
|
if (right_count > samples_count) {
|
||||||
|
right_count = samples_count;
|
||||||
|
}
|
||||||
|
memcpy(buf->data + (head * buf->sample_size),
|
||||||
|
from,
|
||||||
|
right_count * buf->sample_size);
|
||||||
|
|
||||||
|
if (samples_count > right_count) {
|
||||||
|
uint32_t left_count = samples_count - right_count;
|
||||||
|
memcpy(buf->data,
|
||||||
|
from + (right_count * buf->sample_size),
|
||||||
|
left_count * buf->sample_size);
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32_t new_head = (head + samples_count) % buf->alloc_size;
|
||||||
|
atomic_store_explicit(&buf->head, new_head, memory_order_release);
|
||||||
|
|
||||||
|
return samples_count;
|
||||||
|
}
|
@ -3,19 +3,25 @@
|
|||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
||||||
|
#include <assert.h>
|
||||||
|
#include <stdatomic.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
#include "util/bytebuf.h"
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Wrapper around bytebuf to read and write samples
|
* Wrapper around bytebuf to read and write samples
|
||||||
*
|
*
|
||||||
* Each sample takes sample_size bytes.
|
* Each sample takes sample_size bytes.
|
||||||
*/
|
*/
|
||||||
struct sc_audiobuf {
|
struct sc_audiobuf {
|
||||||
struct sc_bytebuf buf;
|
uint8_t *data;
|
||||||
|
uint32_t alloc_size; // in samples
|
||||||
size_t sample_size;
|
size_t sample_size;
|
||||||
|
|
||||||
|
atomic_uint_least32_t head; // writer cursor, in samples
|
||||||
|
atomic_uint_least32_t tail; // reader cursor, in samples
|
||||||
|
// empty: tail == head
|
||||||
|
// full: ((tail + 1) % alloc_size) == head
|
||||||
};
|
};
|
||||||
|
|
||||||
static inline uint32_t
|
static inline uint32_t
|
||||||
@ -29,66 +35,31 @@ sc_audiobuf_to_bytes(struct sc_audiobuf *buf, uint32_t samples) {
|
|||||||
return samples * buf->sample_size;
|
return samples * buf->sample_size;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline bool
|
bool
|
||||||
sc_audiobuf_init(struct sc_audiobuf *buf, size_t sample_size,
|
sc_audiobuf_init(struct sc_audiobuf *buf, size_t sample_size,
|
||||||
uint32_t capacity) {
|
uint32_t capacity);
|
||||||
buf->sample_size = sample_size;
|
|
||||||
return sc_bytebuf_init(&buf->buf, capacity * sample_size + 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void
|
void
|
||||||
sc_audiobuf_read(struct sc_audiobuf *buf, uint8_t *to, uint32_t samples) {
|
sc_audiobuf_destroy(struct sc_audiobuf *buf);
|
||||||
size_t bytes = sc_audiobuf_to_bytes(buf, samples);
|
|
||||||
sc_bytebuf_read(&buf->buf, to, bytes);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void
|
uint32_t
|
||||||
sc_audiobuf_skip(struct sc_audiobuf *buf, uint32_t samples) {
|
sc_audiobuf_read(struct sc_audiobuf *buf, void *to, uint32_t samples_count);
|
||||||
size_t bytes = sc_audiobuf_to_bytes(buf, samples);
|
|
||||||
sc_bytebuf_skip(&buf->buf, bytes);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void
|
uint32_t
|
||||||
sc_audiobuf_write(struct sc_audiobuf *buf, const uint8_t *from,
|
sc_audiobuf_write(struct sc_audiobuf *buf, const void *from,
|
||||||
uint32_t samples) {
|
uint32_t samples_count);
|
||||||
size_t bytes = sc_audiobuf_to_bytes(buf, samples);
|
|
||||||
sc_bytebuf_write(&buf->buf, from, bytes);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void
|
static inline uint32_t
|
||||||
sc_audiobuf_prepare_write(struct sc_audiobuf *buf, const uint8_t *from,
|
sc_audiobuf_capacity(struct sc_audiobuf *buf) {
|
||||||
uint32_t samples) {
|
assert(buf->alloc_size);
|
||||||
size_t bytes = sc_audiobuf_to_bytes(buf, samples);
|
return buf->alloc_size - 1;
|
||||||
sc_bytebuf_prepare_write(&buf->buf, from, bytes);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void
|
|
||||||
sc_audiobuf_commit_write(struct sc_audiobuf *buf, uint32_t samples) {
|
|
||||||
size_t bytes = sc_audiobuf_to_bytes(buf, samples);
|
|
||||||
sc_bytebuf_commit_write(&buf->buf, bytes);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline uint32_t
|
static inline uint32_t
|
||||||
sc_audiobuf_can_read(struct sc_audiobuf *buf) {
|
sc_audiobuf_can_read(struct sc_audiobuf *buf) {
|
||||||
size_t bytes = sc_bytebuf_can_read(&buf->buf);
|
uint32_t head = atomic_load_explicit(&buf->head, memory_order_acquire);
|
||||||
return sc_audiobuf_to_samples(buf, bytes);
|
uint32_t tail = atomic_load_explicit(&buf->tail, memory_order_acquire);
|
||||||
}
|
return (buf->alloc_size + head - tail) % buf->alloc_size;
|
||||||
|
|
||||||
static inline uint32_t
|
|
||||||
sc_audiobuf_can_write(struct sc_audiobuf *buf) {
|
|
||||||
size_t bytes = sc_bytebuf_can_write(&buf->buf);
|
|
||||||
return sc_audiobuf_to_samples(buf, bytes);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline uint32_t
|
|
||||||
sc_audiobuf_capacity(struct sc_audiobuf *buf) {
|
|
||||||
size_t bytes = sc_bytebuf_capacity(&buf->buf);
|
|
||||||
return sc_audiobuf_to_samples(buf, bytes);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void
|
|
||||||
sc_audiobuf_destroy(struct sc_audiobuf *buf) {
|
|
||||||
sc_bytebuf_destroy(&buf->buf);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -1,104 +0,0 @@
|
|||||||
#include "bytebuf.h"
|
|
||||||
|
|
||||||
#include <assert.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
#include "util/log.h"
|
|
||||||
|
|
||||||
bool
|
|
||||||
sc_bytebuf_init(struct sc_bytebuf *buf, size_t alloc_size) {
|
|
||||||
assert(alloc_size);
|
|
||||||
buf->data = malloc(alloc_size);
|
|
||||||
if (!buf->data) {
|
|
||||||
LOG_OOM();
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
buf->alloc_size = alloc_size;
|
|
||||||
buf->head = 0;
|
|
||||||
buf->tail = 0;
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
sc_bytebuf_destroy(struct sc_bytebuf *buf) {
|
|
||||||
free(buf->data);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
sc_bytebuf_read(struct sc_bytebuf *buf, uint8_t *to, size_t len) {
|
|
||||||
assert(len);
|
|
||||||
assert(len <= sc_bytebuf_can_read(buf));
|
|
||||||
assert(buf->tail != buf->head); // the buffer could not be empty
|
|
||||||
|
|
||||||
size_t right_limit = buf->tail < buf->head ? buf->head : buf->alloc_size;
|
|
||||||
size_t right_len = right_limit - buf->tail;
|
|
||||||
if (len < right_len) {
|
|
||||||
right_len = len;
|
|
||||||
}
|
|
||||||
memcpy(to, buf->data + buf->tail, right_len);
|
|
||||||
|
|
||||||
if (len > right_len) {
|
|
||||||
memcpy(to + right_len, buf->data, len - right_len);
|
|
||||||
}
|
|
||||||
|
|
||||||
buf->tail = (buf->tail + len) % buf->alloc_size;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
sc_bytebuf_skip(struct sc_bytebuf *buf, size_t len) {
|
|
||||||
assert(len);
|
|
||||||
assert(len <= sc_bytebuf_can_read(buf));
|
|
||||||
assert(buf->tail != buf->head); // the buffer could not be empty
|
|
||||||
|
|
||||||
buf->tail = (buf->tail + len) % buf->alloc_size;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void
|
|
||||||
sc_bytebuf_write_step0(struct sc_bytebuf *buf, const uint8_t *from,
|
|
||||||
size_t len) {
|
|
||||||
size_t right_len = buf->alloc_size - buf->head;
|
|
||||||
if (len < right_len) {
|
|
||||||
right_len = len;
|
|
||||||
}
|
|
||||||
memcpy(buf->data + buf->head, from, right_len);
|
|
||||||
|
|
||||||
if (len > right_len) {
|
|
||||||
memcpy(buf->data, from + right_len, len - right_len);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void
|
|
||||||
sc_bytebuf_write_step1(struct sc_bytebuf *buf, size_t len) {
|
|
||||||
buf->head = (buf->head + len) % buf->alloc_size;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
sc_bytebuf_write(struct sc_bytebuf *buf, const uint8_t *from, size_t len) {
|
|
||||||
assert(len);
|
|
||||||
assert(len <= sc_bytebuf_can_write(buf));
|
|
||||||
|
|
||||||
sc_bytebuf_write_step0(buf, from, len);
|
|
||||||
sc_bytebuf_write_step1(buf, len);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
sc_bytebuf_prepare_write(struct sc_bytebuf *buf, const uint8_t *from,
|
|
||||||
size_t len) {
|
|
||||||
// *This function MUST NOT access buf->tail (even in assert()).*
|
|
||||||
// The purpose of this function is to allow a reader and a writer to access
|
|
||||||
// different parts of the buffer in parallel simultaneously. It is intended
|
|
||||||
// to be called without lock (only sc_bytebuf_commit_write() is intended to
|
|
||||||
// be called with lock held).
|
|
||||||
|
|
||||||
assert(len < buf->alloc_size - 1);
|
|
||||||
sc_bytebuf_write_step0(buf, from, len);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
sc_bytebuf_commit_write(struct sc_bytebuf *buf, size_t len) {
|
|
||||||
assert(len <= sc_bytebuf_can_write(buf));
|
|
||||||
sc_bytebuf_write_step1(buf, len);
|
|
||||||
}
|
|
@ -1,114 +0,0 @@
|
|||||||
#ifndef SC_BYTEBUF_H
|
|
||||||
#define SC_BYTEBUF_H
|
|
||||||
|
|
||||||
#include "common.h"
|
|
||||||
|
|
||||||
#include <stdbool.h>
|
|
||||||
#include <stdint.h>
|
|
||||||
|
|
||||||
struct sc_bytebuf {
|
|
||||||
uint8_t *data;
|
|
||||||
// The actual capacity is (allocated - 1) so that head == tail is
|
|
||||||
// non-ambiguous
|
|
||||||
size_t alloc_size;
|
|
||||||
size_t head; // writter cursor
|
|
||||||
size_t tail; // reader cursor
|
|
||||||
// empty: tail == head
|
|
||||||
// full: ((tail + 1) % alloc_size) == head
|
|
||||||
};
|
|
||||||
|
|
||||||
bool
|
|
||||||
sc_bytebuf_init(struct sc_bytebuf *buf, size_t alloc_size);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Copy from the bytebuf to a user-provided array
|
|
||||||
*
|
|
||||||
* The caller must check that len <= sc_bytebuf_read_available() (it is an
|
|
||||||
* error to attempt to read more bytes than available).
|
|
||||||
*
|
|
||||||
* This function is guaranteed not to write to buf->head.
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
sc_bytebuf_read(struct sc_bytebuf *buf, uint8_t *to, size_t len);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Drop len bytes from the buffer
|
|
||||||
*
|
|
||||||
* The caller must check that len <= sc_bytebuf_read_available() (it is an
|
|
||||||
* error to attempt to skip more bytes than available).
|
|
||||||
*
|
|
||||||
* This function is guaranteed not to write to buf->head.
|
|
||||||
*
|
|
||||||
* It is equivalent to call sc_bytebuf_read() to some array and discard the
|
|
||||||
* array (but this function is more efficient since there is no copy).
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
sc_bytebuf_skip(struct sc_bytebuf *buf, size_t len);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Copy the user-provided array to the bytebuf
|
|
||||||
*
|
|
||||||
* The caller must check that len <= sc_bytebuf_write_available() (it is an
|
|
||||||
* error to write more bytes than the remaining available space).
|
|
||||||
*
|
|
||||||
* This function is guaranteed not to write to buf->tail.
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
sc_bytebuf_write(struct sc_bytebuf *buf, const uint8_t *from, size_t len);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Copy the user-provided array to the bytebuf, but do not advance the cursor
|
|
||||||
*
|
|
||||||
* The caller must check that len <= sc_bytebuf_write_available() (it is an
|
|
||||||
* error to write more bytes than the remaining available space).
|
|
||||||
*
|
|
||||||
* After this function is called, the write must be committed with
|
|
||||||
* sc_bytebuf_commit_write().
|
|
||||||
*
|
|
||||||
* The purpose of this mechanism is to acquire a lock only to commit the write,
|
|
||||||
* but not to perform the actual copy.
|
|
||||||
*
|
|
||||||
* This function is guaranteed not to access buf->tail.
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
sc_bytebuf_prepare_write(struct sc_bytebuf *buf, const uint8_t *from,
|
|
||||||
size_t len);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Commit a prepared write
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
sc_bytebuf_commit_write(struct sc_bytebuf *buf, size_t len);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Return the number of bytes which can be read
|
|
||||||
*
|
|
||||||
* It is an error to read more bytes than available.
|
|
||||||
*/
|
|
||||||
static inline size_t
|
|
||||||
sc_bytebuf_can_read(struct sc_bytebuf *buf) {
|
|
||||||
return (buf->alloc_size + buf->head - buf->tail) % buf->alloc_size;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Return the number of bytes which can be written
|
|
||||||
*
|
|
||||||
* It is an error to write more bytes than available.
|
|
||||||
*/
|
|
||||||
static inline size_t
|
|
||||||
sc_bytebuf_can_write(struct sc_bytebuf *buf) {
|
|
||||||
return (buf->alloc_size + buf->tail - buf->head - 1) % buf->alloc_size;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Return the actual capacity of the buffer (can_read() + can_write())
|
|
||||||
*/
|
|
||||||
static inline size_t
|
|
||||||
sc_bytebuf_capacity(struct sc_bytebuf *buf) {
|
|
||||||
return buf->alloc_size - 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
sc_bytebuf_destroy(struct sc_bytebuf *buf);
|
|
||||||
|
|
||||||
#endif
|
|
@ -147,7 +147,7 @@ sc_sdl_log_print(void *userdata, int category, SDL_LogPriority priority,
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
sc_log_configure() {
|
sc_log_configure(void) {
|
||||||
SDL_LogSetOutputFunction(sc_sdl_log_print, NULL);
|
SDL_LogSetOutputFunction(sc_sdl_log_print, NULL);
|
||||||
// Redirect FFmpeg logs to SDL logs
|
// Redirect FFmpeg logs to SDL logs
|
||||||
av_log_set_callback(sc_av_log_callback);
|
av_log_set_callback(sc_av_log_callback);
|
||||||
|
@ -36,6 +36,6 @@ sc_log_windows_error(const char *prefix, int error);
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
void
|
void
|
||||||
sc_log_configure();
|
sc_log_configure(void);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
@ -333,3 +334,22 @@ sc_str_remove_trailing_cr(char *s, size_t len) {
|
|||||||
}
|
}
|
||||||
return len;
|
return len;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
char *
|
||||||
|
sc_str_to_hex_string(const uint8_t *data, size_t size) {
|
||||||
|
size_t buffer_size = size * 3 + 1;
|
||||||
|
char *buffer = malloc(buffer_size);
|
||||||
|
if (!buffer) {
|
||||||
|
LOG_OOM();
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (size_t i = 0; i < size; ++i) {
|
||||||
|
snprintf(buffer + i * 3, 4, "%02X ", data[i]);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Remove the final space
|
||||||
|
buffer[size * 3] = '\0';
|
||||||
|
|
||||||
|
return buffer;
|
||||||
|
}
|
||||||
|
@ -138,4 +138,10 @@ sc_str_index_of_column(const char *s, unsigned col, const char *seps);
|
|||||||
size_t
|
size_t
|
||||||
sc_str_remove_trailing_cr(char *s, size_t len);
|
sc_str_remove_trailing_cr(char *s, size_t len);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Convert binary data to hexadecimal string
|
||||||
|
*/
|
||||||
|
char *
|
||||||
|
sc_str_to_hex_string(const uint8_t *data, size_t len);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -190,10 +190,10 @@ sc_vecdeque_reallocdata_(void *ptr, size_t newcap, size_t item_size,
|
|||||||
|
|
||||||
size_t right_len = MIN(size, oldcap - oldorigin);
|
size_t right_len = MIN(size, oldcap - oldorigin);
|
||||||
assert(right_len);
|
assert(right_len);
|
||||||
memcpy(newptr, ptr + (oldorigin * item_size), right_len * item_size);
|
memcpy(newptr, (char *) ptr + (oldorigin * item_size), right_len * item_size);
|
||||||
|
|
||||||
if (size > right_len) {
|
if (size > right_len) {
|
||||||
memcpy(newptr + (right_len * item_size), ptr,
|
memcpy((char *) newptr + (right_len * item_size), ptr,
|
||||||
(size - right_len) * item_size);
|
(size - right_len) * item_size);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
128
app/tests/test_audiobuf.c
Normal file
128
app/tests/test_audiobuf.c
Normal file
@ -0,0 +1,128 @@
|
|||||||
|
#include "common.h"
|
||||||
|
|
||||||
|
#include <assert.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
#include "util/audiobuf.h"
|
||||||
|
|
||||||
|
static void test_audiobuf_simple(void) {
|
||||||
|
struct sc_audiobuf buf;
|
||||||
|
uint32_t data[20];
|
||||||
|
|
||||||
|
bool ok = sc_audiobuf_init(&buf, 4, 20);
|
||||||
|
assert(ok);
|
||||||
|
|
||||||
|
uint32_t samples[] = {1, 2, 3, 4, 5};
|
||||||
|
uint32_t w = sc_audiobuf_write(&buf, samples, 5);
|
||||||
|
assert(w == 5);
|
||||||
|
|
||||||
|
uint32_t r = sc_audiobuf_read(&buf, data, 4);
|
||||||
|
assert(r == 4);
|
||||||
|
assert(!memcmp(data, samples, 16));
|
||||||
|
|
||||||
|
uint32_t samples2[] = {6, 7, 8};
|
||||||
|
w = sc_audiobuf_write(&buf, samples2, 3);
|
||||||
|
assert(w == 3);
|
||||||
|
|
||||||
|
uint32_t single = 9;
|
||||||
|
w = sc_audiobuf_write(&buf, &single, 1);
|
||||||
|
assert(w == 1);
|
||||||
|
|
||||||
|
r = sc_audiobuf_read(&buf, &data[4], 8);
|
||||||
|
assert(r == 5);
|
||||||
|
|
||||||
|
uint32_t expected[] = {1, 2, 3, 4, 5, 6, 7, 8, 9};
|
||||||
|
assert(!memcmp(data, expected, 36));
|
||||||
|
|
||||||
|
sc_audiobuf_destroy(&buf);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void test_audiobuf_boundaries(void) {
|
||||||
|
struct sc_audiobuf buf;
|
||||||
|
uint32_t data[20];
|
||||||
|
|
||||||
|
bool ok = sc_audiobuf_init(&buf, 4, 20);
|
||||||
|
assert(ok);
|
||||||
|
|
||||||
|
uint32_t samples[] = {1, 2, 3, 4, 5, 6};
|
||||||
|
uint32_t w = sc_audiobuf_write(&buf, samples, 6);
|
||||||
|
assert(w == 6);
|
||||||
|
|
||||||
|
w = sc_audiobuf_write(&buf, samples, 6);
|
||||||
|
assert(w == 6);
|
||||||
|
|
||||||
|
w = sc_audiobuf_write(&buf, samples, 6);
|
||||||
|
assert(w == 6);
|
||||||
|
|
||||||
|
uint32_t r = sc_audiobuf_read(&buf, data, 9);
|
||||||
|
assert(r == 9);
|
||||||
|
|
||||||
|
uint32_t expected[] = {1, 2, 3, 4, 5, 6, 1, 2, 3};
|
||||||
|
assert(!memcmp(data, expected, 36));
|
||||||
|
|
||||||
|
uint32_t samples2[] = {7, 8, 9, 10, 11};
|
||||||
|
w = sc_audiobuf_write(&buf, samples2, 5);
|
||||||
|
assert(w == 5);
|
||||||
|
|
||||||
|
uint32_t single = 12;
|
||||||
|
w = sc_audiobuf_write(&buf, &single, 1);
|
||||||
|
assert(w == 1);
|
||||||
|
|
||||||
|
w = sc_audiobuf_read(&buf, NULL, 3);
|
||||||
|
assert(w == 3);
|
||||||
|
|
||||||
|
assert(sc_audiobuf_can_read(&buf) == 12);
|
||||||
|
|
||||||
|
r = sc_audiobuf_read(&buf, data, 12);
|
||||||
|
assert(r == 12);
|
||||||
|
|
||||||
|
uint32_t expected2[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};
|
||||||
|
assert(!memcmp(data, expected2, 48));
|
||||||
|
|
||||||
|
sc_audiobuf_destroy(&buf);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void test_audiobuf_partial_read_write(void) {
|
||||||
|
struct sc_audiobuf buf;
|
||||||
|
uint32_t data[15];
|
||||||
|
|
||||||
|
bool ok = sc_audiobuf_init(&buf, 4, 10);
|
||||||
|
assert(ok);
|
||||||
|
|
||||||
|
uint32_t samples[] = {1, 2, 3, 4, 5, 6};
|
||||||
|
uint32_t w = sc_audiobuf_write(&buf, samples, 6);
|
||||||
|
assert(w == 6);
|
||||||
|
|
||||||
|
w = sc_audiobuf_write(&buf, samples, 6);
|
||||||
|
assert(w == 4);
|
||||||
|
|
||||||
|
w = sc_audiobuf_write(&buf, samples, 6);
|
||||||
|
assert(w == 0);
|
||||||
|
|
||||||
|
uint32_t r = sc_audiobuf_read(&buf, data, 3);
|
||||||
|
assert(r == 3);
|
||||||
|
|
||||||
|
uint32_t expected[] = {1, 2, 3};
|
||||||
|
assert(!memcmp(data, expected, 12));
|
||||||
|
|
||||||
|
w = sc_audiobuf_write(&buf, samples, 6);
|
||||||
|
assert(w == 3);
|
||||||
|
|
||||||
|
r = sc_audiobuf_read(&buf, data, 15);
|
||||||
|
assert(r == 10);
|
||||||
|
uint32_t expected2[] = {4, 5, 6, 1, 2, 3, 4, 1, 2, 3};
|
||||||
|
assert(!memcmp(data, expected2, 12));
|
||||||
|
|
||||||
|
sc_audiobuf_destroy(&buf);
|
||||||
|
}
|
||||||
|
|
||||||
|
int main(int argc, char *argv[]) {
|
||||||
|
(void) argc;
|
||||||
|
(void) argv;
|
||||||
|
|
||||||
|
test_audiobuf_simple();
|
||||||
|
test_audiobuf_boundaries();
|
||||||
|
test_audiobuf_partial_read_write();
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
@ -1,126 +0,0 @@
|
|||||||
#include "common.h"
|
|
||||||
|
|
||||||
#include <assert.h>
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
#include "util/bytebuf.h"
|
|
||||||
|
|
||||||
void test_bytebuf_simple(void) {
|
|
||||||
struct sc_bytebuf buf;
|
|
||||||
uint8_t data[20];
|
|
||||||
|
|
||||||
bool ok = sc_bytebuf_init(&buf, 20);
|
|
||||||
assert(ok);
|
|
||||||
|
|
||||||
sc_bytebuf_write(&buf, (uint8_t *) "hello", sizeof("hello") - 1);
|
|
||||||
assert(sc_bytebuf_can_read(&buf) == 5);
|
|
||||||
|
|
||||||
sc_bytebuf_read(&buf, data, 4);
|
|
||||||
assert(!strncmp((char *) data, "hell", 4));
|
|
||||||
|
|
||||||
sc_bytebuf_write(&buf, (uint8_t *) " world", sizeof(" world") - 1);
|
|
||||||
assert(sc_bytebuf_can_read(&buf) == 7);
|
|
||||||
|
|
||||||
sc_bytebuf_write(&buf, (uint8_t *) "!", 1);
|
|
||||||
assert(sc_bytebuf_can_read(&buf) == 8);
|
|
||||||
|
|
||||||
sc_bytebuf_read(&buf, &data[4], 8);
|
|
||||||
assert(sc_bytebuf_can_read(&buf) == 0);
|
|
||||||
|
|
||||||
data[12] = '\0';
|
|
||||||
assert(!strcmp((char *) data, "hello world!"));
|
|
||||||
assert(sc_bytebuf_can_read(&buf) == 0);
|
|
||||||
|
|
||||||
sc_bytebuf_destroy(&buf);
|
|
||||||
}
|
|
||||||
|
|
||||||
void test_bytebuf_boundaries(void) {
|
|
||||||
struct sc_bytebuf buf;
|
|
||||||
uint8_t data[20];
|
|
||||||
|
|
||||||
bool ok = sc_bytebuf_init(&buf, 20);
|
|
||||||
assert(ok);
|
|
||||||
|
|
||||||
sc_bytebuf_write(&buf, (uint8_t *) "hello ", sizeof("hello ") - 1);
|
|
||||||
assert(sc_bytebuf_can_read(&buf) == 6);
|
|
||||||
|
|
||||||
sc_bytebuf_write(&buf, (uint8_t *) "hello ", sizeof("hello ") - 1);
|
|
||||||
assert(sc_bytebuf_can_read(&buf) == 12);
|
|
||||||
|
|
||||||
sc_bytebuf_write(&buf, (uint8_t *) "hello ", sizeof("hello ") - 1);
|
|
||||||
assert(sc_bytebuf_can_read(&buf) == 18);
|
|
||||||
|
|
||||||
sc_bytebuf_read(&buf, data, 9);
|
|
||||||
assert(!strncmp((char *) data, "hello hel", 9));
|
|
||||||
assert(sc_bytebuf_can_read(&buf) == 9);
|
|
||||||
|
|
||||||
sc_bytebuf_write(&buf, (uint8_t *) "world", sizeof("world") - 1);
|
|
||||||
assert(sc_bytebuf_can_read(&buf) == 14);
|
|
||||||
|
|
||||||
sc_bytebuf_write(&buf, (uint8_t *) "!", 1);
|
|
||||||
assert(sc_bytebuf_can_read(&buf) == 15);
|
|
||||||
|
|
||||||
sc_bytebuf_skip(&buf, 3);
|
|
||||||
assert(sc_bytebuf_can_read(&buf) == 12);
|
|
||||||
|
|
||||||
sc_bytebuf_read(&buf, data, 12);
|
|
||||||
data[12] = '\0';
|
|
||||||
assert(!strcmp((char *) data, "hello world!"));
|
|
||||||
assert(sc_bytebuf_can_read(&buf) == 0);
|
|
||||||
|
|
||||||
sc_bytebuf_destroy(&buf);
|
|
||||||
}
|
|
||||||
|
|
||||||
void test_bytebuf_two_steps_write(void) {
|
|
||||||
struct sc_bytebuf buf;
|
|
||||||
uint8_t data[20];
|
|
||||||
|
|
||||||
bool ok = sc_bytebuf_init(&buf, 20);
|
|
||||||
assert(ok);
|
|
||||||
|
|
||||||
sc_bytebuf_write(&buf, (uint8_t *) "hello ", sizeof("hello ") - 1);
|
|
||||||
assert(sc_bytebuf_can_read(&buf) == 6);
|
|
||||||
|
|
||||||
sc_bytebuf_write(&buf, (uint8_t *) "hello ", sizeof("hello ") - 1);
|
|
||||||
assert(sc_bytebuf_can_read(&buf) == 12);
|
|
||||||
|
|
||||||
sc_bytebuf_prepare_write(&buf, (uint8_t *) "hello ", sizeof("hello ") - 1);
|
|
||||||
assert(sc_bytebuf_can_read(&buf) == 12); // write not committed yet
|
|
||||||
|
|
||||||
sc_bytebuf_read(&buf, data, 9);
|
|
||||||
assert(!strncmp((char *) data, "hello hel", 3));
|
|
||||||
assert(sc_bytebuf_can_read(&buf) == 3);
|
|
||||||
|
|
||||||
sc_bytebuf_commit_write(&buf, sizeof("hello ") - 1);
|
|
||||||
assert(sc_bytebuf_can_read(&buf) == 9);
|
|
||||||
|
|
||||||
sc_bytebuf_prepare_write(&buf, (uint8_t *) "world", sizeof("world") - 1);
|
|
||||||
assert(sc_bytebuf_can_read(&buf) == 9); // write not committed yet
|
|
||||||
|
|
||||||
sc_bytebuf_commit_write(&buf, sizeof("world") - 1);
|
|
||||||
assert(sc_bytebuf_can_read(&buf) == 14);
|
|
||||||
|
|
||||||
sc_bytebuf_write(&buf, (uint8_t *) "!", 1);
|
|
||||||
assert(sc_bytebuf_can_read(&buf) == 15);
|
|
||||||
|
|
||||||
sc_bytebuf_skip(&buf, 3);
|
|
||||||
assert(sc_bytebuf_can_read(&buf) == 12);
|
|
||||||
|
|
||||||
sc_bytebuf_read(&buf, data, 12);
|
|
||||||
data[12] = '\0';
|
|
||||||
assert(!strcmp((char *) data, "hello world!"));
|
|
||||||
assert(sc_bytebuf_can_read(&buf) == 0);
|
|
||||||
|
|
||||||
sc_bytebuf_destroy(&buf);
|
|
||||||
}
|
|
||||||
|
|
||||||
int main(int argc, char *argv[]) {
|
|
||||||
(void) argc;
|
|
||||||
(void) argv;
|
|
||||||
|
|
||||||
test_bytebuf_simple();
|
|
||||||
test_bytebuf_boundaries();
|
|
||||||
test_bytebuf_two_steps_write();
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
@ -1,6 +1,7 @@
|
|||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
#include <stdint.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "control_msg.h"
|
#include "control_msg.h"
|
||||||
@ -16,11 +17,11 @@ static void test_serialize_inject_keycode(void) {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
unsigned char buf[SC_CONTROL_MSG_MAX_SIZE];
|
uint8_t buf[SC_CONTROL_MSG_MAX_SIZE];
|
||||||
size_t size = sc_control_msg_serialize(&msg, buf);
|
size_t size = sc_control_msg_serialize(&msg, buf);
|
||||||
assert(size == 14);
|
assert(size == 14);
|
||||||
|
|
||||||
const unsigned char expected[] = {
|
const uint8_t expected[] = {
|
||||||
SC_CONTROL_MSG_TYPE_INJECT_KEYCODE,
|
SC_CONTROL_MSG_TYPE_INJECT_KEYCODE,
|
||||||
0x01, // AKEY_EVENT_ACTION_UP
|
0x01, // AKEY_EVENT_ACTION_UP
|
||||||
0x00, 0x00, 0x00, 0x42, // AKEYCODE_ENTER
|
0x00, 0x00, 0x00, 0x42, // AKEYCODE_ENTER
|
||||||
@ -38,11 +39,11 @@ static void test_serialize_inject_text(void) {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
unsigned char buf[SC_CONTROL_MSG_MAX_SIZE];
|
uint8_t buf[SC_CONTROL_MSG_MAX_SIZE];
|
||||||
size_t size = sc_control_msg_serialize(&msg, buf);
|
size_t size = sc_control_msg_serialize(&msg, buf);
|
||||||
assert(size == 18);
|
assert(size == 18);
|
||||||
|
|
||||||
const unsigned char expected[] = {
|
const uint8_t expected[] = {
|
||||||
SC_CONTROL_MSG_TYPE_INJECT_TEXT,
|
SC_CONTROL_MSG_TYPE_INJECT_TEXT,
|
||||||
0x00, 0x00, 0x00, 0x0d, // text length
|
0x00, 0x00, 0x00, 0x0d, // text length
|
||||||
'h', 'e', 'l', 'l', 'o', ',', ' ', 'w', 'o', 'r', 'l', 'd', '!', // text
|
'h', 'e', 'l', 'l', 'o', ',', ' ', 'w', 'o', 'r', 'l', 'd', '!', // text
|
||||||
@ -58,11 +59,11 @@ static void test_serialize_inject_text_long(void) {
|
|||||||
text[SC_CONTROL_MSG_INJECT_TEXT_MAX_LENGTH] = '\0';
|
text[SC_CONTROL_MSG_INJECT_TEXT_MAX_LENGTH] = '\0';
|
||||||
msg.inject_text.text = text;
|
msg.inject_text.text = text;
|
||||||
|
|
||||||
unsigned char buf[SC_CONTROL_MSG_MAX_SIZE];
|
uint8_t buf[SC_CONTROL_MSG_MAX_SIZE];
|
||||||
size_t size = sc_control_msg_serialize(&msg, buf);
|
size_t size = sc_control_msg_serialize(&msg, buf);
|
||||||
assert(size == 5 + SC_CONTROL_MSG_INJECT_TEXT_MAX_LENGTH);
|
assert(size == 5 + SC_CONTROL_MSG_INJECT_TEXT_MAX_LENGTH);
|
||||||
|
|
||||||
unsigned char expected[5 + SC_CONTROL_MSG_INJECT_TEXT_MAX_LENGTH];
|
uint8_t expected[5 + SC_CONTROL_MSG_INJECT_TEXT_MAX_LENGTH];
|
||||||
expected[0] = SC_CONTROL_MSG_TYPE_INJECT_TEXT;
|
expected[0] = SC_CONTROL_MSG_TYPE_INJECT_TEXT;
|
||||||
expected[1] = 0x00;
|
expected[1] = 0x00;
|
||||||
expected[2] = 0x00;
|
expected[2] = 0x00;
|
||||||
@ -95,11 +96,11 @@ static void test_serialize_inject_touch_event(void) {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
unsigned char buf[SC_CONTROL_MSG_MAX_SIZE];
|
uint8_t buf[SC_CONTROL_MSG_MAX_SIZE];
|
||||||
size_t size = sc_control_msg_serialize(&msg, buf);
|
size_t size = sc_control_msg_serialize(&msg, buf);
|
||||||
assert(size == 32);
|
assert(size == 32);
|
||||||
|
|
||||||
const unsigned char expected[] = {
|
const uint8_t expected[] = {
|
||||||
SC_CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT,
|
SC_CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT,
|
||||||
0x00, // AKEY_EVENT_ACTION_DOWN
|
0x00, // AKEY_EVENT_ACTION_DOWN
|
||||||
0x12, 0x34, 0x56, 0x78, 0x87, 0x65, 0x43, 0x21, // pointer id
|
0x12, 0x34, 0x56, 0x78, 0x87, 0x65, 0x43, 0x21, // pointer id
|
||||||
@ -132,11 +133,11 @@ static void test_serialize_inject_scroll_event(void) {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
unsigned char buf[SC_CONTROL_MSG_MAX_SIZE];
|
uint8_t buf[SC_CONTROL_MSG_MAX_SIZE];
|
||||||
size_t size = sc_control_msg_serialize(&msg, buf);
|
size_t size = sc_control_msg_serialize(&msg, buf);
|
||||||
assert(size == 21);
|
assert(size == 21);
|
||||||
|
|
||||||
const unsigned char expected[] = {
|
const uint8_t expected[] = {
|
||||||
SC_CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT,
|
SC_CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT,
|
||||||
0x00, 0x00, 0x01, 0x04, 0x00, 0x00, 0x04, 0x02, // 260 1026
|
0x00, 0x00, 0x01, 0x04, 0x00, 0x00, 0x04, 0x02, // 260 1026
|
||||||
0x04, 0x38, 0x07, 0x80, // 1080 1920
|
0x04, 0x38, 0x07, 0x80, // 1080 1920
|
||||||
@ -155,11 +156,11 @@ static void test_serialize_back_or_screen_on(void) {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
unsigned char buf[SC_CONTROL_MSG_MAX_SIZE];
|
uint8_t buf[SC_CONTROL_MSG_MAX_SIZE];
|
||||||
size_t size = sc_control_msg_serialize(&msg, buf);
|
size_t size = sc_control_msg_serialize(&msg, buf);
|
||||||
assert(size == 2);
|
assert(size == 2);
|
||||||
|
|
||||||
const unsigned char expected[] = {
|
const uint8_t expected[] = {
|
||||||
SC_CONTROL_MSG_TYPE_BACK_OR_SCREEN_ON,
|
SC_CONTROL_MSG_TYPE_BACK_OR_SCREEN_ON,
|
||||||
0x01, // AKEY_EVENT_ACTION_UP
|
0x01, // AKEY_EVENT_ACTION_UP
|
||||||
};
|
};
|
||||||
@ -171,11 +172,11 @@ static void test_serialize_expand_notification_panel(void) {
|
|||||||
.type = SC_CONTROL_MSG_TYPE_EXPAND_NOTIFICATION_PANEL,
|
.type = SC_CONTROL_MSG_TYPE_EXPAND_NOTIFICATION_PANEL,
|
||||||
};
|
};
|
||||||
|
|
||||||
unsigned char buf[SC_CONTROL_MSG_MAX_SIZE];
|
uint8_t buf[SC_CONTROL_MSG_MAX_SIZE];
|
||||||
size_t size = sc_control_msg_serialize(&msg, buf);
|
size_t size = sc_control_msg_serialize(&msg, buf);
|
||||||
assert(size == 1);
|
assert(size == 1);
|
||||||
|
|
||||||
const unsigned char expected[] = {
|
const uint8_t expected[] = {
|
||||||
SC_CONTROL_MSG_TYPE_EXPAND_NOTIFICATION_PANEL,
|
SC_CONTROL_MSG_TYPE_EXPAND_NOTIFICATION_PANEL,
|
||||||
};
|
};
|
||||||
assert(!memcmp(buf, expected, sizeof(expected)));
|
assert(!memcmp(buf, expected, sizeof(expected)));
|
||||||
@ -186,11 +187,11 @@ static void test_serialize_expand_settings_panel(void) {
|
|||||||
.type = SC_CONTROL_MSG_TYPE_EXPAND_SETTINGS_PANEL,
|
.type = SC_CONTROL_MSG_TYPE_EXPAND_SETTINGS_PANEL,
|
||||||
};
|
};
|
||||||
|
|
||||||
unsigned char buf[SC_CONTROL_MSG_MAX_SIZE];
|
uint8_t buf[SC_CONTROL_MSG_MAX_SIZE];
|
||||||
size_t size = sc_control_msg_serialize(&msg, buf);
|
size_t size = sc_control_msg_serialize(&msg, buf);
|
||||||
assert(size == 1);
|
assert(size == 1);
|
||||||
|
|
||||||
const unsigned char expected[] = {
|
const uint8_t expected[] = {
|
||||||
SC_CONTROL_MSG_TYPE_EXPAND_SETTINGS_PANEL,
|
SC_CONTROL_MSG_TYPE_EXPAND_SETTINGS_PANEL,
|
||||||
};
|
};
|
||||||
assert(!memcmp(buf, expected, sizeof(expected)));
|
assert(!memcmp(buf, expected, sizeof(expected)));
|
||||||
@ -201,11 +202,11 @@ static void test_serialize_collapse_panels(void) {
|
|||||||
.type = SC_CONTROL_MSG_TYPE_COLLAPSE_PANELS,
|
.type = SC_CONTROL_MSG_TYPE_COLLAPSE_PANELS,
|
||||||
};
|
};
|
||||||
|
|
||||||
unsigned char buf[SC_CONTROL_MSG_MAX_SIZE];
|
uint8_t buf[SC_CONTROL_MSG_MAX_SIZE];
|
||||||
size_t size = sc_control_msg_serialize(&msg, buf);
|
size_t size = sc_control_msg_serialize(&msg, buf);
|
||||||
assert(size == 1);
|
assert(size == 1);
|
||||||
|
|
||||||
const unsigned char expected[] = {
|
const uint8_t expected[] = {
|
||||||
SC_CONTROL_MSG_TYPE_COLLAPSE_PANELS,
|
SC_CONTROL_MSG_TYPE_COLLAPSE_PANELS,
|
||||||
};
|
};
|
||||||
assert(!memcmp(buf, expected, sizeof(expected)));
|
assert(!memcmp(buf, expected, sizeof(expected)));
|
||||||
@ -219,11 +220,11 @@ static void test_serialize_get_clipboard(void) {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
unsigned char buf[SC_CONTROL_MSG_MAX_SIZE];
|
uint8_t buf[SC_CONTROL_MSG_MAX_SIZE];
|
||||||
size_t size = sc_control_msg_serialize(&msg, buf);
|
size_t size = sc_control_msg_serialize(&msg, buf);
|
||||||
assert(size == 2);
|
assert(size == 2);
|
||||||
|
|
||||||
const unsigned char expected[] = {
|
const uint8_t expected[] = {
|
||||||
SC_CONTROL_MSG_TYPE_GET_CLIPBOARD,
|
SC_CONTROL_MSG_TYPE_GET_CLIPBOARD,
|
||||||
SC_COPY_KEY_COPY,
|
SC_COPY_KEY_COPY,
|
||||||
};
|
};
|
||||||
@ -240,11 +241,11 @@ static void test_serialize_set_clipboard(void) {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
unsigned char buf[SC_CONTROL_MSG_MAX_SIZE];
|
uint8_t buf[SC_CONTROL_MSG_MAX_SIZE];
|
||||||
size_t size = sc_control_msg_serialize(&msg, buf);
|
size_t size = sc_control_msg_serialize(&msg, buf);
|
||||||
assert(size == 27);
|
assert(size == 27);
|
||||||
|
|
||||||
const unsigned char expected[] = {
|
const uint8_t expected[] = {
|
||||||
SC_CONTROL_MSG_TYPE_SET_CLIPBOARD,
|
SC_CONTROL_MSG_TYPE_SET_CLIPBOARD,
|
||||||
0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, // sequence
|
0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, // sequence
|
||||||
1, // paste
|
1, // paste
|
||||||
@ -269,11 +270,11 @@ static void test_serialize_set_clipboard_long(void) {
|
|||||||
text[SC_CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH] = '\0';
|
text[SC_CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH] = '\0';
|
||||||
msg.set_clipboard.text = text;
|
msg.set_clipboard.text = text;
|
||||||
|
|
||||||
unsigned char buf[SC_CONTROL_MSG_MAX_SIZE];
|
uint8_t buf[SC_CONTROL_MSG_MAX_SIZE];
|
||||||
size_t size = sc_control_msg_serialize(&msg, buf);
|
size_t size = sc_control_msg_serialize(&msg, buf);
|
||||||
assert(size == SC_CONTROL_MSG_MAX_SIZE);
|
assert(size == SC_CONTROL_MSG_MAX_SIZE);
|
||||||
|
|
||||||
unsigned char expected[SC_CONTROL_MSG_MAX_SIZE] = {
|
uint8_t expected[SC_CONTROL_MSG_MAX_SIZE] = {
|
||||||
SC_CONTROL_MSG_TYPE_SET_CLIPBOARD,
|
SC_CONTROL_MSG_TYPE_SET_CLIPBOARD,
|
||||||
0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, // sequence
|
0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, // sequence
|
||||||
1, // paste
|
1, // paste
|
||||||
@ -296,11 +297,11 @@ static void test_serialize_set_screen_power_mode(void) {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
unsigned char buf[SC_CONTROL_MSG_MAX_SIZE];
|
uint8_t buf[SC_CONTROL_MSG_MAX_SIZE];
|
||||||
size_t size = sc_control_msg_serialize(&msg, buf);
|
size_t size = sc_control_msg_serialize(&msg, buf);
|
||||||
assert(size == 2);
|
assert(size == 2);
|
||||||
|
|
||||||
const unsigned char expected[] = {
|
const uint8_t expected[] = {
|
||||||
SC_CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE,
|
SC_CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE,
|
||||||
0x02, // SC_SCREEN_POWER_MODE_NORMAL
|
0x02, // SC_SCREEN_POWER_MODE_NORMAL
|
||||||
};
|
};
|
||||||
@ -312,16 +313,78 @@ static void test_serialize_rotate_device(void) {
|
|||||||
.type = SC_CONTROL_MSG_TYPE_ROTATE_DEVICE,
|
.type = SC_CONTROL_MSG_TYPE_ROTATE_DEVICE,
|
||||||
};
|
};
|
||||||
|
|
||||||
unsigned char buf[SC_CONTROL_MSG_MAX_SIZE];
|
uint8_t buf[SC_CONTROL_MSG_MAX_SIZE];
|
||||||
size_t size = sc_control_msg_serialize(&msg, buf);
|
size_t size = sc_control_msg_serialize(&msg, buf);
|
||||||
assert(size == 1);
|
assert(size == 1);
|
||||||
|
|
||||||
const unsigned char expected[] = {
|
const uint8_t expected[] = {
|
||||||
SC_CONTROL_MSG_TYPE_ROTATE_DEVICE,
|
SC_CONTROL_MSG_TYPE_ROTATE_DEVICE,
|
||||||
};
|
};
|
||||||
assert(!memcmp(buf, expected, sizeof(expected)));
|
assert(!memcmp(buf, expected, sizeof(expected)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void test_serialize_uhid_create(void) {
|
||||||
|
const uint8_t report_desc[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11};
|
||||||
|
struct sc_control_msg msg = {
|
||||||
|
.type = SC_CONTROL_MSG_TYPE_UHID_CREATE,
|
||||||
|
.uhid_create = {
|
||||||
|
.id = 42,
|
||||||
|
.report_desc_size = sizeof(report_desc),
|
||||||
|
.report_desc = report_desc,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
uint8_t buf[SC_CONTROL_MSG_MAX_SIZE];
|
||||||
|
size_t size = sc_control_msg_serialize(&msg, buf);
|
||||||
|
assert(size == 16);
|
||||||
|
|
||||||
|
const uint8_t expected[] = {
|
||||||
|
SC_CONTROL_MSG_TYPE_UHID_CREATE,
|
||||||
|
0, 42, // id
|
||||||
|
0, 11, // size
|
||||||
|
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
|
||||||
|
};
|
||||||
|
assert(!memcmp(buf, expected, sizeof(expected)));
|
||||||
|
}
|
||||||
|
|
||||||
|
static void test_serialize_uhid_input(void) {
|
||||||
|
struct sc_control_msg msg = {
|
||||||
|
.type = SC_CONTROL_MSG_TYPE_UHID_INPUT,
|
||||||
|
.uhid_input = {
|
||||||
|
.id = 42,
|
||||||
|
.size = 5,
|
||||||
|
.data = {1, 2, 3, 4, 5},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
uint8_t buf[SC_CONTROL_MSG_MAX_SIZE];
|
||||||
|
size_t size = sc_control_msg_serialize(&msg, buf);
|
||||||
|
assert(size == 10);
|
||||||
|
|
||||||
|
const uint8_t expected[] = {
|
||||||
|
SC_CONTROL_MSG_TYPE_UHID_INPUT,
|
||||||
|
0, 42, // id
|
||||||
|
0, 5, // size
|
||||||
|
1, 2, 3, 4, 5,
|
||||||
|
};
|
||||||
|
assert(!memcmp(buf, expected, sizeof(expected)));
|
||||||
|
}
|
||||||
|
|
||||||
|
static void test_serialize_open_hard_keyboard(void) {
|
||||||
|
struct sc_control_msg msg = {
|
||||||
|
.type = SC_CONTROL_MSG_TYPE_OPEN_HARD_KEYBOARD_SETTINGS,
|
||||||
|
};
|
||||||
|
|
||||||
|
uint8_t buf[SC_CONTROL_MSG_MAX_SIZE];
|
||||||
|
size_t size = sc_control_msg_serialize(&msg, buf);
|
||||||
|
assert(size == 1);
|
||||||
|
|
||||||
|
const uint8_t expected[] = {
|
||||||
|
SC_CONTROL_MSG_TYPE_OPEN_HARD_KEYBOARD_SETTINGS,
|
||||||
|
};
|
||||||
|
assert(!memcmp(buf, expected, sizeof(expected)));
|
||||||
|
}
|
||||||
|
|
||||||
int main(int argc, char *argv[]) {
|
int main(int argc, char *argv[]) {
|
||||||
(void) argc;
|
(void) argc;
|
||||||
(void) argv;
|
(void) argv;
|
||||||
@ -340,5 +403,8 @@ int main(int argc, char *argv[]) {
|
|||||||
test_serialize_set_clipboard_long();
|
test_serialize_set_clipboard_long();
|
||||||
test_serialize_set_screen_power_mode();
|
test_serialize_set_screen_power_mode();
|
||||||
test_serialize_rotate_device();
|
test_serialize_rotate_device();
|
||||||
|
test_serialize_uhid_create();
|
||||||
|
test_serialize_uhid_input();
|
||||||
|
test_serialize_open_hard_keyboard();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -1,32 +1,32 @@
|
|||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "device_msg.h"
|
#include "device_msg.h"
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
|
|
||||||
static void test_deserialize_clipboard(void) {
|
static void test_deserialize_clipboard(void) {
|
||||||
const unsigned char input[] = {
|
const uint8_t input[] = {
|
||||||
DEVICE_MSG_TYPE_CLIPBOARD,
|
DEVICE_MSG_TYPE_CLIPBOARD,
|
||||||
0x00, 0x00, 0x00, 0x03, // text length
|
0x00, 0x00, 0x00, 0x03, // text length
|
||||||
0x41, 0x42, 0x43, // "ABC"
|
0x41, 0x42, 0x43, // "ABC"
|
||||||
};
|
};
|
||||||
|
|
||||||
struct device_msg msg;
|
struct sc_device_msg msg;
|
||||||
ssize_t r = device_msg_deserialize(input, sizeof(input), &msg);
|
ssize_t r = sc_device_msg_deserialize(input, sizeof(input), &msg);
|
||||||
assert(r == 8);
|
assert(r == 8);
|
||||||
|
|
||||||
assert(msg.type == DEVICE_MSG_TYPE_CLIPBOARD);
|
assert(msg.type == DEVICE_MSG_TYPE_CLIPBOARD);
|
||||||
assert(msg.clipboard.text);
|
assert(msg.clipboard.text);
|
||||||
assert(!strcmp("ABC", msg.clipboard.text));
|
assert(!strcmp("ABC", msg.clipboard.text));
|
||||||
|
|
||||||
device_msg_destroy(&msg);
|
sc_device_msg_destroy(&msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void test_deserialize_clipboard_big(void) {
|
static void test_deserialize_clipboard_big(void) {
|
||||||
unsigned char input[DEVICE_MSG_MAX_SIZE];
|
uint8_t input[DEVICE_MSG_MAX_SIZE];
|
||||||
input[0] = DEVICE_MSG_TYPE_CLIPBOARD;
|
input[0] = DEVICE_MSG_TYPE_CLIPBOARD;
|
||||||
input[1] = (DEVICE_MSG_TEXT_MAX_LENGTH & 0xff000000u) >> 24;
|
input[1] = (DEVICE_MSG_TEXT_MAX_LENGTH & 0xff000000u) >> 24;
|
||||||
input[2] = (DEVICE_MSG_TEXT_MAX_LENGTH & 0x00ff0000u) >> 16;
|
input[2] = (DEVICE_MSG_TEXT_MAX_LENGTH & 0x00ff0000u) >> 16;
|
||||||
@ -35,8 +35,8 @@ static void test_deserialize_clipboard_big(void) {
|
|||||||
|
|
||||||
memset(input + 5, 'a', DEVICE_MSG_TEXT_MAX_LENGTH);
|
memset(input + 5, 'a', DEVICE_MSG_TEXT_MAX_LENGTH);
|
||||||
|
|
||||||
struct device_msg msg;
|
struct sc_device_msg msg;
|
||||||
ssize_t r = device_msg_deserialize(input, sizeof(input), &msg);
|
ssize_t r = sc_device_msg_deserialize(input, sizeof(input), &msg);
|
||||||
assert(r == DEVICE_MSG_MAX_SIZE);
|
assert(r == DEVICE_MSG_MAX_SIZE);
|
||||||
|
|
||||||
assert(msg.type == DEVICE_MSG_TYPE_CLIPBOARD);
|
assert(msg.type == DEVICE_MSG_TYPE_CLIPBOARD);
|
||||||
@ -44,23 +44,45 @@ static void test_deserialize_clipboard_big(void) {
|
|||||||
assert(strlen(msg.clipboard.text) == DEVICE_MSG_TEXT_MAX_LENGTH);
|
assert(strlen(msg.clipboard.text) == DEVICE_MSG_TEXT_MAX_LENGTH);
|
||||||
assert(msg.clipboard.text[0] == 'a');
|
assert(msg.clipboard.text[0] == 'a');
|
||||||
|
|
||||||
device_msg_destroy(&msg);
|
sc_device_msg_destroy(&msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void test_deserialize_ack_set_clipboard(void) {
|
static void test_deserialize_ack_set_clipboard(void) {
|
||||||
const unsigned char input[] = {
|
const uint8_t input[] = {
|
||||||
DEVICE_MSG_TYPE_ACK_CLIPBOARD,
|
DEVICE_MSG_TYPE_ACK_CLIPBOARD,
|
||||||
0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, // sequence
|
0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, // sequence
|
||||||
};
|
};
|
||||||
|
|
||||||
struct device_msg msg;
|
struct sc_device_msg msg;
|
||||||
ssize_t r = device_msg_deserialize(input, sizeof(input), &msg);
|
ssize_t r = sc_device_msg_deserialize(input, sizeof(input), &msg);
|
||||||
assert(r == 9);
|
assert(r == 9);
|
||||||
|
|
||||||
assert(msg.type == DEVICE_MSG_TYPE_ACK_CLIPBOARD);
|
assert(msg.type == DEVICE_MSG_TYPE_ACK_CLIPBOARD);
|
||||||
assert(msg.ack_clipboard.sequence == UINT64_C(0x0102030405060708));
|
assert(msg.ack_clipboard.sequence == UINT64_C(0x0102030405060708));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void test_deserialize_uhid_output(void) {
|
||||||
|
const uint8_t input[] = {
|
||||||
|
DEVICE_MSG_TYPE_UHID_OUTPUT,
|
||||||
|
0, 42, // id
|
||||||
|
0, 5, // size
|
||||||
|
0x01, 0x02, 0x03, 0x04, 0x05, // data
|
||||||
|
};
|
||||||
|
|
||||||
|
struct sc_device_msg msg;
|
||||||
|
ssize_t r = sc_device_msg_deserialize(input, sizeof(input), &msg);
|
||||||
|
assert(r == 10);
|
||||||
|
|
||||||
|
assert(msg.type == DEVICE_MSG_TYPE_UHID_OUTPUT);
|
||||||
|
assert(msg.uhid_output.id == 42);
|
||||||
|
assert(msg.uhid_output.size == 5);
|
||||||
|
|
||||||
|
uint8_t expected[] = {1, 2, 3, 4, 5};
|
||||||
|
assert(!memcmp(msg.uhid_output.data, expected, sizeof(expected)));
|
||||||
|
|
||||||
|
sc_device_msg_destroy(&msg);
|
||||||
|
}
|
||||||
|
|
||||||
int main(int argc, char *argv[]) {
|
int main(int argc, char *argv[]) {
|
||||||
(void) argc;
|
(void) argc;
|
||||||
(void) argv;
|
(void) argv;
|
||||||
@ -68,5 +90,6 @@ int main(int argc, char *argv[]) {
|
|||||||
test_deserialize_clipboard();
|
test_deserialize_clipboard();
|
||||||
test_deserialize_clipboard_big();
|
test_deserialize_clipboard_big();
|
||||||
test_deserialize_ack_set_clipboard();
|
test_deserialize_ack_set_clipboard();
|
||||||
|
test_deserialize_uhid_output();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
91
app/tests/test_orientation.c
Normal file
91
app/tests/test_orientation.c
Normal file
@ -0,0 +1,91 @@
|
|||||||
|
#include "common.h"
|
||||||
|
|
||||||
|
#include <assert.h>
|
||||||
|
|
||||||
|
#include "options.h"
|
||||||
|
|
||||||
|
static void test_transforms(void) {
|
||||||
|
#define O(X) SC_ORIENTATION_ ## X
|
||||||
|
#define ASSERT_TRANSFORM(SRC, TR, RES) \
|
||||||
|
assert(sc_orientation_apply(O(SRC), O(TR)) == O(RES));
|
||||||
|
|
||||||
|
ASSERT_TRANSFORM(0, 0, 0);
|
||||||
|
ASSERT_TRANSFORM(0, 90, 90);
|
||||||
|
ASSERT_TRANSFORM(0, 180, 180);
|
||||||
|
ASSERT_TRANSFORM(0, 270, 270);
|
||||||
|
ASSERT_TRANSFORM(0, FLIP_0, FLIP_0);
|
||||||
|
ASSERT_TRANSFORM(0, FLIP_90, FLIP_90);
|
||||||
|
ASSERT_TRANSFORM(0, FLIP_180, FLIP_180);
|
||||||
|
ASSERT_TRANSFORM(0, FLIP_270, FLIP_270);
|
||||||
|
|
||||||
|
ASSERT_TRANSFORM(90, 0, 90);
|
||||||
|
ASSERT_TRANSFORM(90, 90, 180);
|
||||||
|
ASSERT_TRANSFORM(90, 180, 270);
|
||||||
|
ASSERT_TRANSFORM(90, 270, 0);
|
||||||
|
ASSERT_TRANSFORM(90, FLIP_0, FLIP_270);
|
||||||
|
ASSERT_TRANSFORM(90, FLIP_90, FLIP_0);
|
||||||
|
ASSERT_TRANSFORM(90, FLIP_180, FLIP_90);
|
||||||
|
ASSERT_TRANSFORM(90, FLIP_270, FLIP_180);
|
||||||
|
|
||||||
|
ASSERT_TRANSFORM(180, 0, 180);
|
||||||
|
ASSERT_TRANSFORM(180, 90, 270);
|
||||||
|
ASSERT_TRANSFORM(180, 180, 0);
|
||||||
|
ASSERT_TRANSFORM(180, 270, 90);
|
||||||
|
ASSERT_TRANSFORM(180, FLIP_0, FLIP_180);
|
||||||
|
ASSERT_TRANSFORM(180, FLIP_90, FLIP_270);
|
||||||
|
ASSERT_TRANSFORM(180, FLIP_180, FLIP_0);
|
||||||
|
ASSERT_TRANSFORM(180, FLIP_270, FLIP_90);
|
||||||
|
|
||||||
|
ASSERT_TRANSFORM(270, 0, 270);
|
||||||
|
ASSERT_TRANSFORM(270, 90, 0);
|
||||||
|
ASSERT_TRANSFORM(270, 180, 90);
|
||||||
|
ASSERT_TRANSFORM(270, 270, 180);
|
||||||
|
ASSERT_TRANSFORM(270, FLIP_0, FLIP_90);
|
||||||
|
ASSERT_TRANSFORM(270, FLIP_90, FLIP_180);
|
||||||
|
ASSERT_TRANSFORM(270, FLIP_180, FLIP_270);
|
||||||
|
ASSERT_TRANSFORM(270, FLIP_270, FLIP_0);
|
||||||
|
|
||||||
|
ASSERT_TRANSFORM(FLIP_0, 0, FLIP_0);
|
||||||
|
ASSERT_TRANSFORM(FLIP_0, 90, FLIP_90);
|
||||||
|
ASSERT_TRANSFORM(FLIP_0, 180, FLIP_180);
|
||||||
|
ASSERT_TRANSFORM(FLIP_0, 270, FLIP_270);
|
||||||
|
ASSERT_TRANSFORM(FLIP_0, FLIP_0, 0);
|
||||||
|
ASSERT_TRANSFORM(FLIP_0, FLIP_90, 90);
|
||||||
|
ASSERT_TRANSFORM(FLIP_0, FLIP_180, 180);
|
||||||
|
ASSERT_TRANSFORM(FLIP_0, FLIP_270, 270);
|
||||||
|
|
||||||
|
ASSERT_TRANSFORM(FLIP_90, 0, FLIP_90);
|
||||||
|
ASSERT_TRANSFORM(FLIP_90, 90, FLIP_180);
|
||||||
|
ASSERT_TRANSFORM(FLIP_90, 180, FLIP_270);
|
||||||
|
ASSERT_TRANSFORM(FLIP_90, 270, FLIP_0);
|
||||||
|
ASSERT_TRANSFORM(FLIP_90, FLIP_0, 270);
|
||||||
|
ASSERT_TRANSFORM(FLIP_90, FLIP_90, 0);
|
||||||
|
ASSERT_TRANSFORM(FLIP_90, FLIP_180, 90);
|
||||||
|
ASSERT_TRANSFORM(FLIP_90, FLIP_270, 180);
|
||||||
|
|
||||||
|
ASSERT_TRANSFORM(FLIP_180, 0, FLIP_180);
|
||||||
|
ASSERT_TRANSFORM(FLIP_180, 90, FLIP_270);
|
||||||
|
ASSERT_TRANSFORM(FLIP_180, 180, FLIP_0);
|
||||||
|
ASSERT_TRANSFORM(FLIP_180, 270, FLIP_90);
|
||||||
|
ASSERT_TRANSFORM(FLIP_180, FLIP_0, 180);
|
||||||
|
ASSERT_TRANSFORM(FLIP_180, FLIP_90, 270);
|
||||||
|
ASSERT_TRANSFORM(FLIP_180, FLIP_180, 0);
|
||||||
|
ASSERT_TRANSFORM(FLIP_180, FLIP_270, 90);
|
||||||
|
|
||||||
|
ASSERT_TRANSFORM(FLIP_270, 0, FLIP_270);
|
||||||
|
ASSERT_TRANSFORM(FLIP_270, 90, FLIP_0);
|
||||||
|
ASSERT_TRANSFORM(FLIP_270, 180, FLIP_90);
|
||||||
|
ASSERT_TRANSFORM(FLIP_270, 270, FLIP_180);
|
||||||
|
ASSERT_TRANSFORM(FLIP_270, FLIP_0, 90);
|
||||||
|
ASSERT_TRANSFORM(FLIP_270, FLIP_90, 180);
|
||||||
|
ASSERT_TRANSFORM(FLIP_270, FLIP_180, 270);
|
||||||
|
ASSERT_TRANSFORM(FLIP_270, FLIP_270, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
int main(int argc, char *argv[]) {
|
||||||
|
(void) argc;
|
||||||
|
(void) argv;
|
||||||
|
|
||||||
|
test_transforms();
|
||||||
|
return 0;
|
||||||
|
}
|
@ -269,21 +269,25 @@ static void test_parse_integer_with_suffix(void) {
|
|||||||
|
|
||||||
char buf[32];
|
char buf[32];
|
||||||
|
|
||||||
sprintf(buf, "%ldk", LONG_MAX / 2000);
|
int r = snprintf(buf, sizeof(buf), "%ldk", LONG_MAX / 2000);
|
||||||
|
assert(r >= 0 && (size_t) r < sizeof(buf));
|
||||||
ok = sc_str_parse_integer_with_suffix(buf, &value);
|
ok = sc_str_parse_integer_with_suffix(buf, &value);
|
||||||
assert(ok);
|
assert(ok);
|
||||||
assert(value == LONG_MAX / 2000 * 1000);
|
assert(value == LONG_MAX / 2000 * 1000);
|
||||||
|
|
||||||
sprintf(buf, "%ldm", LONG_MAX / 2000);
|
r = snprintf(buf, sizeof(buf), "%ldm", LONG_MAX / 2000);
|
||||||
|
assert(r >= 0 && (size_t) r < sizeof(buf));
|
||||||
ok = sc_str_parse_integer_with_suffix(buf, &value);
|
ok = sc_str_parse_integer_with_suffix(buf, &value);
|
||||||
assert(!ok);
|
assert(!ok);
|
||||||
|
|
||||||
sprintf(buf, "%ldk", LONG_MIN / 2000);
|
r = snprintf(buf, sizeof(buf), "%ldk", LONG_MIN / 2000);
|
||||||
|
assert(r >= 0 && (size_t) r < sizeof(buf));
|
||||||
ok = sc_str_parse_integer_with_suffix(buf, &value);
|
ok = sc_str_parse_integer_with_suffix(buf, &value);
|
||||||
assert(ok);
|
assert(ok);
|
||||||
assert(value == LONG_MIN / 2000 * 1000);
|
assert(value == LONG_MIN / 2000 * 1000);
|
||||||
|
|
||||||
sprintf(buf, "%ldm", LONG_MIN / 2000);
|
r = snprintf(buf, sizeof(buf), "%ldm", LONG_MIN / 2000);
|
||||||
|
assert(r >= 0 && (size_t) r < sizeof(buf));
|
||||||
ok = sc_str_parse_integer_with_suffix(buf, &value);
|
ok = sc_str_parse_integer_with_suffix(buf, &value);
|
||||||
assert(!ok);
|
assert(!ok);
|
||||||
}
|
}
|
||||||
@ -358,7 +362,7 @@ static void test_index_of_column(void) {
|
|||||||
assert(sc_str_index_of_column(" a bc d", 1, " ") == 2);
|
assert(sc_str_index_of_column(" a bc d", 1, " ") == 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void test_remove_trailing_cr() {
|
static void test_remove_trailing_cr(void) {
|
||||||
char s[] = "abc\r";
|
char s[] = "abc\r";
|
||||||
sc_str_remove_trailing_cr(s, sizeof(s) - 1);
|
sc_str_remove_trailing_cr(s, sizeof(s) - 1);
|
||||||
assert(!strcmp(s, "abc"));
|
assert(!strcmp(s, "abc"));
|
||||||
|
@ -102,7 +102,7 @@ static void test_vecdeque_reserve(void) {
|
|||||||
sc_vecdeque_destroy(&vdq);
|
sc_vecdeque_destroy(&vdq);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void test_vecdeque_grow() {
|
static void test_vecdeque_grow(void) {
|
||||||
struct SC_VECDEQUE(int) vdq = SC_VECDEQUE_INITIALIZER;
|
struct SC_VECDEQUE(int) vdq = SC_VECDEQUE_INITIALIZER;
|
||||||
|
|
||||||
bool ok = sc_vecdeque_reserve(&vdq, 20);
|
bool ok = sc_vecdeque_reserve(&vdq, 20);
|
||||||
@ -142,7 +142,7 @@ static void test_vecdeque_grow() {
|
|||||||
sc_vecdeque_destroy(&vdq);
|
sc_vecdeque_destroy(&vdq);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void test_vecdeque_push_hole() {
|
static void test_vecdeque_push_hole(void) {
|
||||||
struct SC_VECDEQUE(int) vdq = SC_VECDEQUE_INITIALIZER;
|
struct SC_VECDEQUE(int) vdq = SC_VECDEQUE_INITIALIZER;
|
||||||
|
|
||||||
bool ok = sc_vecdeque_reserve(&vdq, 20);
|
bool ok = sc_vecdeque_reserve(&vdq, 20);
|
||||||
|
@ -187,7 +187,7 @@ static void test_vector_index_of(void) {
|
|||||||
sc_vector_destroy(&vec);
|
sc_vector_destroy(&vec);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void test_vector_grow() {
|
static void test_vector_grow(void) {
|
||||||
struct SC_VECTOR(int) vec = SC_VECTOR_INITIALIZER;
|
struct SC_VECTOR(int) vec = SC_VECTOR_INITIALIZER;
|
||||||
|
|
||||||
bool ok;
|
bool ok;
|
||||||
|
@ -7,7 +7,7 @@ buildscript {
|
|||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:7.4.0'
|
classpath 'com.android.tools.build:gradle:8.1.3'
|
||||||
|
|
||||||
// NOTE: Do not place your application dependencies here; they belong
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
// in the individual module build.gradle files
|
// in the individual module build.gradle files
|
||||||
@ -23,7 +23,3 @@ allprojects {
|
|||||||
options.compilerArgs << "-Xlint:deprecation"
|
options.compilerArgs << "-Xlint:deprecation"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
task clean(type: Delete) {
|
|
||||||
delete rootProject.buildDir
|
|
||||||
}
|
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user