mirrors/scrcpy
1
0
Fork 0
mirror of https://github.com/Genymobile/scrcpy.git synced 2025-04-20 19:45:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added help and parsing of the codec-profile option

Browse source 
(cherry picked from commit e15824304434d1721cf928fde35c870c1fc01698)
(cherry picked from commit a4ef318ae3)
(cherry picked from commit a5b83c19081d04346ef580dfff09ec4076822302)
(cherry picked from commit 1e3321cf58)
This commit is contained in:
Tzah Mazuz 2020-03-16 15:03:43 +02:00
parent fd5489dce0
commit bc70f566be
2 changed files with 52 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/scrcpy.1
View file

@ -151,6 +151,14 @@ Set the initial window height.
Default is 0 (automatic).\n
.TP
.BI "\-\-\codec\-options " 'options'
'options' is a list of key=value pairs seperated by comma\n
for the device encoder.\n
For a list of possible codec options:\n
https://developer.android.com/reference/android/media/MediaCodecInfo\n
Currently supported keys: [profile, level].\n
.SH SHORTCUTS
.TP

44
app/src/cli.c
View file

@ -130,6 +130,12 @@ scrcpy_print_usage(const char *arg0) {
" Set the initial window width.\n"
" Default is 0 (automatic).\n"
"\n"
" -P, --codec-profile value\n"
" Request specific encoding codec profile, see AVC profiles at:\n"
" https://developer.android.com/reference/android/media/MediaCodecInfo.CodecProfileLevel\n"
" for valid codec profile values.\n"
" Default is 0 (automatic).\n"
"\n"
"Shortcuts:\n"
"\n"
" " CTRL_OR_CMD "+f\n"
@ -368,6 +374,35 @@ parse_record_format(const char *optarg, enum recorder_format *format) {
return false;
}
static bool
parse_codec_profile(const char *optarg, uint32_t *codec_profile) {
long value;
// long may be 32 bits (it is the case on mingw), so do not use more than
// 31 bits (long is signed)
bool ok = parse_integer_arg(optarg, &value, true, 0, 0x7FFFFFFF, "codec-profile");
if (!ok) {
return false;
}
switch (value) {
case 0: // Automatic
case 0x01: // AVCProfileBaseline
case 0x02: // AVCProfileMain
case 0x04: // AVCProfileExtended
case 0x08: // AVCProfileHigh
case 0x10: // AVCProfileHigh10
case 0x20: // AVCProfileHigh422
case 0x40: // AVCProfileHigh444
case 0x10000: // AVCProfileConstrainedBaseline
case 0x80000: // AVCProfileConstrainedHigh
*codec_profile = (uint32_t) value;
return true;
default:
LOGE("Invalid codec-profile, Use -h for help");
return false;
}
}
static enum recorder_format
guess_record_format(const char *filename) {
size_t len = strlen(filename);
@ -440,7 +475,11 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
optind = 0; // reset to start from the first argument in tests
int c;
<<<<<<< HEAD
while ((c = getopt_long(argc, argv, "b:c:fF:hm:nNp:r:s:StTv:P:", long_options,
=======
while ((c = getopt_long(argc, argv, "b:c:fF:hm:nNp:r:s:StTv", long_options,
>>>>>>> 1b12204... fixup! Added help and parsing of the codec-profile option
NULL)) != -1) {
switch (c) {
case 'b':
@ -550,6 +589,11 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
case OPT_PREFER_TEXT:
opts->prefer_text = true;
break;
case 'P':
if (!parse_codec_profile(optarg, &opts->codec_profile)) {
return false;
}
break;
default:
// getopt prints the error message on stderr
return false;