Skip to content

Commit 744312e

Browse files
committed
Merge branch 'master' into release
2 parents b931562 + 4ad7479 commit 744312e

File tree

10 files changed

+39
-17
lines changed

10 files changed

+39
-17
lines changed

FAQ.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,8 @@ In developer options, enable:
159159
> **USB debugging (Security settings)**
160160
> _Allow granting permissions and simulating input via USB debugging_
161161
162+
Rebooting the device is necessary once this option is set.
163+
162164
[simulating input]: https://github.com/Genymobile/scrcpy/issues/70#issuecomment-373286323
163165

164166

@@ -168,12 +170,12 @@ The default text injection method is [limited to ASCII characters][text-input].
168170
A trick allows to also inject some [accented characters][accented-characters],
169171
but that's all. See [#37].
170172

171-
Since scrcpy v1.20, it is possible to simulate a [physical keyboard][hid] (HID).
173+
It is also possible to simulate a [physical keyboard][hid] (HID).
172174

173175
[text-input]: https://github.com/Genymobile/scrcpy/issues?q=is%3Aopen+is%3Aissue+label%3Aunicode
174176
[accented-characters]: https://blog.rom1v.com/2018/03/introducing-scrcpy/#handle-accented-characters
175177
[#37]: https://github.com/Genymobile/scrcpy/issues/37
176-
[hid]: README.md#physical-keyboard-simulation-hid
178+
[hid]: doc/hid-otg.md
177179

178180

179181
## Client issues
@@ -229,4 +231,4 @@ Translations of this FAQ in other languages are available in the [wiki].
229231

230232
[wiki]: https://github.com/Genymobile/scrcpy/wiki
231233

232-
Only this README file is guaranteed to be up-to-date.
234+
Only this FAQ file is guaranteed to be up-to-date.

README.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Its features include:
3030
- mirroring with [Android device screen off](doc/device.md#turn-screen-off)
3131
- [copy-paste](doc/control.md#copy-paste) in both directions
3232
- [configurable quality](doc/video.md)
33-
- Android device [as a webcam (V4L2)](doc/v4l2.md) (Linux-only)
33+
- Android device screen [as a webcam (V4L2)](doc/v4l2.md) (Linux-only)
3434
- [physical keyboard/mouse simulation (HID)](doc/hid-otg.md)
3535
- [OTG mode](doc/hid-otg.md#otg)
3636
- and more…
@@ -39,18 +39,22 @@ Its features include:
3939

4040
The Android device requires at least API 21 (Android 5.0).
4141

42-
[Audio forwarding](doc/audio.md) is supported from API 30 (Android 11).
42+
[Audio forwarding](doc/audio.md) is supported for API >= 30 (Android 11+).
4343

4444
Make sure you [enabled USB debugging][enable-adb] on your device(s).
4545

4646
[enable-adb]: https://developer.android.com/studio/debug/dev-options#enable
4747

4848
On some devices, you also need to enable [an additional option][control] `USB
4949
debugging (Security Settings)` (this is an item different from `USB debugging`)
50-
to control it using a keyboard and mouse.
50+
to control it using a keyboard and mouse. Rebooting the device is necessary once
51+
this option is set.
5152

5253
[control]: https://github.com/Genymobile/scrcpy/issues/70#issuecomment-373286323
5354

55+
Note that USB debugging is not required to run scrcpy in [OTG
56+
mode](doc/hid-otg.md#otg).
57+
5458

5559
## Get the app
5660

app/scrcpy.1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Make scrcpy window always on top (above other windows).
2121

2222
.TP
2323
.BI "\-\-audio\-bit\-rate " value
24-
Encode the audio at the given bit\-rate, expressed in bits/s. Unit suffixes are supported: '\fBK\fR' (x1000) and '\fBM\fR' (x1000000).
24+
Encode the audio at the given bit rate, expressed in bits/s. Unit suffixes are supported: '\fBK\fR' (x1000) and '\fBM\fR' (x1000000).
2525

2626
Default is 128K (128000).
2727

@@ -71,7 +71,7 @@ Default is 5.
7171

7272
.TP
7373
.BI "\-b, \-\-video\-bit\-rate " value
74-
Encode the video at the given bit\-rate, expressed in bits/s. Unit suffixes are supported: '\fBK\fR' (x1000) and '\fBM\fR' (x1000000).
74+
Encode the video at the given bit rate, expressed in bits/s. Unit suffixes are supported: '\fBK\fR' (x1000) and '\fBM\fR' (x1000000).
7575

7676
Default is 8M (8000000).
7777

app/src/cli.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ static const struct sc_option options[] = {
124124
.longopt_id = OPT_AUDIO_BIT_RATE,
125125
.longopt = "audio-bit-rate",
126126
.argdesc = "value",
127-
.text = "Encode the audio at the given bit-rate, expressed in bits/s. "
127+
.text = "Encode the audio at the given bit rate, expressed in bits/s. "
128128
"Unit suffixes are supported: 'K' (x1000) and 'M' (x1000000).\n"
129129
"Default is 128K (128000).",
130130
},
@@ -185,7 +185,7 @@ static const struct sc_option options[] = {
185185
.shortopt = 'b',
186186
.longopt = "video-bit-rate",
187187
.argdesc = "value",
188-
.text = "Encode the video at the given bit-rate, expressed in bits/s. "
188+
.text = "Encode the video at the given bit rate, expressed in bits/s. "
189189
"Unit suffixes are supported: 'K' (x1000) and 'M' (x1000000).\n"
190190
"Default is 8M (8000000).",
191191
},

doc/audio.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,13 @@ scrcpy --audio-codec=aac
7171
scrcpy --audio-codec=raw
7272
```
7373

74+
In particular, if you get the following error:
75+
76+
> Failed to initialize audio/opus, error 0xfffffffe
77+
78+
then your device has no Opus encoder: try `scrcpy --audio-codec=aac`.
79+
80+
7481
Several encoders may be available on the device. They can be listed by:
7582

7683
```bash
@@ -91,7 +98,7 @@ check `--audio-codec-options` in the manpage or in `scrcpy --help`.
9198

9299
## Bit rate
93100

94-
The default video bit-rate is 128Kbps. To change it:
101+
The default audio bit rate is 128Kbps. To change it:
95102

96103
```bash
97104
scrcpy --audio-bit-rate=64K

doc/hid-otg.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,3 +106,7 @@ scrcpy --otg # keyboard and mouse
106106

107107
Like `--hid-keyboard` and `--hid-mouse`, it only works if the device is
108108
connected over USB.
109+
110+
## HID/OTG issues on Windows
111+
112+
See [FAQ](/FAQ.md#hidotg-issues-on-windows).

doc/linux.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@ Scrcpy is packaged in several distributions and package managers:
99
- Debian/Ubuntu: `apt install scrcpy`
1010
- Arch Linux: `pacman -S scrcpy`
1111
- Fedora: `dnf copr enable zeno/scrcpy && dnf install scrcpy`
12-
- Gentoo: [ebuild][ebuild-link] file
12+
- Gentoo: `emerge scrcpy`
1313
- Snap: `snap install scrcpy`
1414
- … (see [repology](https://repology.org/project/scrcpy/versions))
1515

16-
[ebuild-link]: https://github.com/maggu2810/maggu2810-overlay/tree/master/app-mobilephone/scrcpy
17-
1816
### Latest version
1917

2018
However, the packaged version is not always the latest release. To install the

doc/shortcuts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ _<kbd>[Super]</kbd> is typically the <kbd>Windows</kbd> or <kbd>Cmd</kbd> key._
2929
| Resize window to 1:1 (pixel-perfect) | <kbd>MOD</kbd>+<kbd>g</kbd>
3030
| Resize window to remove black borders | <kbd>MOD</kbd>+<kbd>w</kbd> \| _Double-left-click¹_
3131
| Click on `HOME` | <kbd>MOD</kbd>+<kbd>h</kbd> \| _Middle-click_
32-
| Click on `BACK` | <kbd>MOD</kbd>+<kbd>b</kbd> \| _Right-click²_
32+
| Click on `BACK` | <kbd>MOD</kbd>+<kbd>b</kbd> \| <kbd>MOD</kbd>+<kbd>Backspace</kbd> \| _Right-click²_
3333
| Click on `APP_SWITCH` | <kbd>MOD</kbd>+<kbd>s</kbd> \| _4th-click³_
3434
| Click on `MENU` (unlock screen)⁴ | <kbd>MOD</kbd>+<kbd>m</kbd>
3535
| Click on `VOLUME_UP` | <kbd>MOD</kbd>+<kbd>↑</kbd> _(up)_

doc/video.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ If encoding fails, scrcpy automatically tries again with a lower definition
2121

2222
## Bit rate
2323

24-
The default video bit-rate is 8 Mbps. To change it:
24+
The default video bit rate is 8 Mbps. To change it:
2525

2626
```bash
2727
scrcpy --video-bit-rate=2M

doc/windows.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,13 @@ Download the [latest release]:
1515

1616
and extract it.
1717

18-
Alternatively, you could install it from packages manager, like [Chocolatey]:
18+
Alternatively, you could install it from packages manager, like [Winget]:
19+
20+
```bash
21+
winget install scrcpy
22+
```
23+
24+
or [Chocolatey]:
1925

2026
```bash
2127
choco install scrcpy
@@ -30,6 +36,7 @@ scoop install scrcpy
3036
scoop install adb # if you don't have it yet
3137
```
3238

39+
[Winget]: https://github.com/microsoft/winget-cli
3340
[Chocolatey]: https://chocolatey.org/
3441
[Scoop]: https://scoop.sh
3542

0 commit comments

Comments
 (0)