Archives/scrcpy
2
0
Fork 0
mirror of https://github.com/Genymobile/scrcpy synced 2024-11-17 03:25:38 +00:00
Code Issues Projects Releases Wiki Activity
2,298 Commits 529 Branches 50 Tags 29 MiB
9df92ebe37
Commit Graph

193 Commits

Author SHA1 Message Date
Romain Vimont
0801cf0627 Fix options alphabetical order 
Renaming --display to --display-id broke the alphabetical order.

Refs 23e116064d
 2023-11-20 14:03:51 +01:00
Romain Vimont
4658c0e5d2 Update record format error message 
Recording now supports formats other than mp4 and mkv.

Refs e637feba51
 2023-11-16 10:02:25 +01:00
Romain Vimont
200488111e Add support for RAW audio (WAV) recording 
RAW audio forwarding was supported but not for recording.

Add support for recording a raw audio stream to a `.wav` file (and
`.mkv`).
 2023-11-15 21:05:38 +01:00
Romain Vimont
258eaaae2a Increase default audio buffer for FLAC 
FLAC is not low latency: the default encoder produces blocks of 4096
samples, which represent ~85.333ms.

Increase the audio buffer by default so that audio playback works.
 2023-11-15 12:02:57 +01:00
megapro17
4857c5dd59 Add support for FLAC audio codec 
PR #4410 <#https://github.com/Genymobile/scrcpy/pull/4410>

Co-authored-by: Romain Vimont <rom@rom1v.com>
Signed-off-by: Romain Vimont <rom@rom1v.com>
 2023-11-15 12:02:57 +01:00
Romain Vimont
e637feba51 Update muxers documentation 
Recording now supports formats other than mp4 and mkv.
 2023-11-14 09:08:24 +01:00
Romain Vimont
3c45625324 Log recording RAW audio codec as error 
It is not possible to record with a RAW audio codec, so the log before
exiting should be an error rather than a warning.
 2023-11-11 11:24:47 +01:00
Andrew Gunnerson
6af4bd601f Add support for high frame rate camera capture 
Add --camera-high-speed to enable high frame rate camera capture. If
the option is enabled, then --camera-fps is mandatory.

PR #4213 <https://github.com/Genymobile/scrcpy/pull/4213>

Co-authored-by: Romain Vimont <rom@rom1v.com>
Signed-off-by: Andrew Gunnerson <accounts+github@chiller3.com>
Signed-off-by: Romain Vimont <rom@rom1v.com>
 2023-10-31 15:57:06 +01:00
Andrew Gunnerson
4722bff423 Add --camera-fps 
Add a new option for specifying the camera frame rate.

By default, Android's default frame rate (30 fps) is used.

PR #4213 <https://github.com/Genymobile/scrcpy/pull/4213>

Signed-off-by: Andrew Gunnerson <accounts+github@chiller3.com>
Signed-off-by: Romain Vimont <rom@rom1v.com>
 2023-10-31 15:57:06 +01:00
Romain Vimont
928f8b8eb3 Do not arbitrary limit --max-fps to 1000 
Limit to the variable type size, for consistency.

PR #4213 <https://github.com/Genymobile/scrcpy/pull/4213>
 2023-10-31 15:57:06 +01:00
Romain Vimont
dd36d6135f Support camera size selection using -m/--camera-ar 
In addition to --camera-size to specify an explicit size, make it
possible to select the camera size automatically, respecting the maximum
size (already used for display mirroring) and an aspect ratio.

For example, "scrcpy --video-source=camera" followed by:
 - (no additional arguments)
    : mirrors at the maximum size, any a-r
 - -m1920
    : only consider valid sizes having both dimensions not above 1920
 - --camera-ar=4:3
    : only consider valid sizes having an aspect ratio of 4:3 (+/- 10%)
 - -m2048 --camera-ar=1.6
    : only consider valid sizes having both dimensions not above 2048
      and an aspect ratio of 1.6 (+/- 10%)

PR #4213 <https://github.com/Genymobile/scrcpy/pull/4213>

Co-authored-by: Simon Chan <1330321+yume-chan@users.noreply.github.com>
 2023-10-31 15:57:06 +01:00
Simon Chan
faebb7d70a Add --camera-facing 
Add an option to select the camera by its lens facing (front, back or
external).

PR #4213 <https://github.com/Genymobile/scrcpy/pull/4213>

Co-authored-by: Romain Vimont <rom@rom1v.com>
Signed-off-by: Romain Vimont <rom@rom1v.com>
 2023-10-31 15:57:06 +01:00
Romain Vimont
7f8d079c8c Make camera id optional 
If no camera id is provided, use the first camera available.

PR #4213 <https://github.com/Genymobile/scrcpy/pull/4213>
 2023-10-31 15:57:06 +01:00
Romain Vimont
d544e577c0 Automatically select audio source 
If --audio-source is not specified, select the default value
according to the video source:
 - for display mirroring, use device audio by default;
 - for camera mirroring, use microphone by default.

PR #4213 <https://github.com/Genymobile/scrcpy/pull/4213>
 2023-10-31 15:57:06 +01:00
Simon Chan
bfeecc0131 Add camera mirroring 
Add --video-source=camera, and related options:
 - --camera-id=<id>: select the camera by its id (see --list-cameras);
 - --camera-size=<width>x<height>: select the capture size.

Fixed #241 <https://github.com/Genymobile/scrcpy/issues/241>
PR #4213 <https://github.com/Genymobile/scrcpy/pull/4213>

Co-authored-by: Romain Vimont <rom@rom1v.com>
Signed-off-by: Romain Vimont <rom@rom1v.com>
 2023-10-31 15:57:06 +01:00
Romain Vimont
f032262cd7 Add --list-camera-sizes 
Add an option to list the device camera declared sizes.

PR #4213 <https://github.com/Genymobile/scrcpy/pull/4213>
 2023-10-31 15:57:06 +01:00
Simon Chan
cd63896d63 Add --list-cameras 
Add an option to list the device cameras.

PR #4213 <https://github.com/Genymobile/scrcpy/pull/4213>

Co-authored-by: Romain Vimont <rom@rom1v.com>
Signed-off-by: Romain Vimont <rom@rom1v.com>
 2023-10-31 15:56:25 +01:00
Romain Vimont
f085765e04 Factorize --list- options handling 
This will limit code duplication as more list options will be added.

PR #4213 <https://github.com/Genymobile/scrcpy/pull/4213>
 2023-10-31 12:45:40 +01:00
Romain Vimont
23e116064d Rename --display to --display-id 
The option is named "display id" everywhere.

This will be consistent with --camera-id (there will be many camera
options, so an option --camera would be confusing).

PR #4213 <https://github.com/Genymobile/scrcpy/pull/4213>
 2023-10-31 12:45:40 +01:00
Romain Vimont
3432029a3d Make separator configurable for parsing integers 
The separator was hardcoded to ':'. This will allow to reuse the
function to parse sizes as WIDTHxHEIGHT.

PR #4213 <https://github.com/Genymobile/scrcpy/pull/4213>
 2023-10-31 12:45:31 +01:00
Romain Vimont
9fdb882509 Fix --pause-on-exit parsing 
The function incorrectly returned `false` instead of a valid (and
expected) enum value.
 2023-10-24 22:53:41 +02:00
Avinash Sonawane
90ba885547 Remove redundant ; 
PR #4371 <https://github.com/Genymobile/scrcpy/pull/4371>

Signed-off-by: Romain Vimont <rom@rom1v.com>
 2023-10-23 15:09:26 +02:00
Romain Vimont
1650b7c058 Add --pause-on-exit 
Add an option to make scrcpy pause on exit.

Three behaviors are possible:
 - always pause on exit:
    --pause-on-exit
    --pause-on-exit=true
 - never pause on exit:
    (no option)
    --pause-on-exit=false
 - pause when scrcpy returns with an error (a non-zero exit code):
    --pause-on-exit=if-error

This is useful to prevent the terminal window from automatically
closing, so that error messages can be read.

Refs #3817 <https://github.com/Genymobile/scrcpy/pull/3817>
Refs #3822 <https://github.com/Genymobile/scrcpy/pull/3822>
PR #4130 <https://github.com/Genymobile/scrcpy/pull/4130>
 2023-10-11 09:43:44 +02:00
Romain Vimont
110b3a16f6 Do not disable controls without video playback 
Some control messages can still be used even when video playback is
disabled (i.e. there is no window), for example to turn the screen off.

This reverts commit 92483fe11b
(semantically).

Fixes #4175 <https://github.com/Genymobile/scrcpy/issues/4175>
 2023-07-28 14:45:33 +02:00
Romain Vimont
744312ec64 Merge branch 'master' into release 2023-06-22 01:15:39 +02:00
Romain Vimont
d3c2955fb9 Add --time-limit 
Add an option to stop scrcpy automatically after a given delay.

PR #4052 <https://github.com/Genymobile/scrcpy/pull/4052>
Fixes #3752 <https://github.com/Genymobile/scrcpy/issues/3752>
 2023-06-10 16:04:51 +02:00
Romain Vimont
a3cdf1a6b8 Add option to kill adb on close 
Killing adb on close by default would be incorrect, since it would break
any other usage of adb in parallel.

It could be easily done manually by calling "adb kill-server" once
scrcpy terminates, but add an option --kill-adb-on-close for
convenience.

Fixes #205 <https://github.com/Genymobile/scrcpy/issues/205>
Fixes #2580 <https://github.com/Genymobile/scrcpy/issues/2580>
Fixes #4049 <https://github.com/Genymobile/scrcpy/issues/4049>
 2023-06-05 19:48:21 +02:00
Romain Vimont
b8d43866d2 Fix options alphabetical order 
Commit fc52b24503 missed this one.
 2023-06-05 19:44:15 +02:00
Romain Vimont
fc52b24503 Reorder options in alphabetical order 
Fix the options order, using the short option as key first (if any) in
all cases for consistency.
 2023-06-01 12:52:48 +02:00
Romain Vimont
ff5ffc892f Add option to select audio source 
Pass --audio-source=mic to capture the microphone instead of the device
audio output.
 2023-06-01 09:21:09 +02:00
Romain Vimont
4c4a03ebe1 Reorder options to maintain alphabetical order 2023-05-30 21:36:48 +02:00
Romain Vimont
1efbfe1175 Add separate video and audio playback options 
Add --no-video-playback and --no-audio-playback. The option
--no-playback is now an alias for both.

PR #4033 <https://github.com/Genymobile/scrcpy/pull/4033>
 2023-05-27 10:08:10 +02:00
Romain Vimont
751c09f47a Simplify V4L2/USB ifdefs 
Define local variables whose value depends on ifdefs, to avoid
cluttering all conditions with ifdefs.
 2023-05-27 09:55:49 +02:00
Romain Vimont
f46758d1c5 Fix V4L2 error message when disabled 
For consistency, use the same error message for --v4l2-sink and
--v4l2-buffer.
 2023-05-27 09:55:49 +02:00
Romain Vimont
e71f5358b3 Reorder command line options checks 
Perform checks that impact the options first.
 2023-05-27 09:55:49 +02:00
Romain Vimont
a2c8910006 Rename --no-mirror to --no-playback 
This option impacts video and audio _playback_. For example, if we use
V4L2, the device is still "mirrored" (via V4L2), even if playback is
disabled. Therefore, "playback" is more approriate than "mirror".

The initial option --no-display option was renamed to --no-mirror by
commit 6928acdeac, but this has never been
released, so it is ok to rename it one more time.

Refs #3978 <https://github.com/Genymobile/scrcpy/pull/3978#issuecomment-1549420103>
PR #4033 <https://github.com/Genymobile/scrcpy/pull/4033>
 2023-05-27 09:55:38 +02:00
Romain Vimont
b11b363e8e Add recording to aac file 
It is just an alias for mp4.

PR #3978 <https://github.com/Genymobile/scrcpy/pull/3978>
 2023-05-08 17:11:34 +02:00
Romain Vimont
7321db6f28 Add recording to opus file 
Use the FFmpeg opus muxer to record an opus file.

PR #3978 <https://github.com/Genymobile/scrcpy/pull/3978>
 2023-05-08 17:11:34 +02:00
Romain Vimont
d6bcde565f Accept .m4a and .mka 
These are just aliases for mp4 and mkv when there is no video stream.

PR #3978 <https://github.com/Genymobile/scrcpy/pull/3978>
 2023-05-08 17:11:34 +02:00
Romain Vimont
98f4f4e68a Refactor command line checks 
Several checks are performed when opts->record_filename is not NULL.
Group them in a single block.

PR #3978 <https://github.com/Genymobile/scrcpy/pull/3978>
 2023-05-08 17:11:34 +02:00
Romain Vimont
be86e14e05 Factorize record format parsing 
Convert either the filename extension or the explicit record format
to a sc_record_format using the same function.

PR #3978 <https://github.com/Genymobile/scrcpy/pull/3978>
 2023-05-08 17:11:34 +02:00
Romain Vimont
8c650e53cd Add --no-video 
Similar to --no-audio, add --no-video to play audio only.

Fixes #3842 <https://github.com/Genymobile/scrcpy/issues/3842>
PR #3978 <https://github.com/Genymobile/scrcpy/pull/3978>
 2023-05-08 17:11:34 +02:00
Romain Vimont
92483fe11b Disable controls on --no-mirror 
If mirroring is disabled, control must also be disabled.

PR #3978 <https://github.com/Genymobile/scrcpy/pull/3978>
 2023-05-08 16:41:01 +02:00
Romain Vimont
6928acdeac Rename --no-display to --no-mirror 
The option impacts both video and audio playback, so "no display" is not
an appropriate name.

PR #3978 <https://github.com/Genymobile/scrcpy/pull/3978>
 2023-05-08 16:40:58 +02:00
Romain Vimont
478aece68f Replace "bit-rate" with "bit rate" 2023-03-20 08:35:13 +01:00
Romain Vimont
39544f34b4 Add --audio-output-buffer 
On some systems, the SDL audio callback is not called frequently enough
(for example it requests 5ms of samples every 10ms), because the output
buffer is too small.

By default, we want to use a small value (5ms) to minimize latency and
buffer underrun, but if it does not work well, users need a way to
increase it.

Refs #3793 <https://github.com/Genymobile/scrcpy/issues/3793>
 2023-03-14 23:54:07 +01:00
Romain Vimont
c22c87eded Fail on deprecated options 
Suggest the video and audio specific options instead.
 2023-03-12 02:04:58 +01:00
Romain Vimont
426dfbf21d Remove dead code about the deprecated -F option 
The -F option was already removed.
 2023-03-12 02:04:58 +01:00
Romain Vimont
5512777404 Remove deprecated option --render-expired-frames 
This option did nothing since it was deprecated. Totally remove it.
 2023-03-12 02:04:58 +01:00
Romain Vimont
7da45c246e Warn on ignored audio options 
For raw audio codec, some audio options are ignored.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-10 22:22:15 +01:00