Compare commits
9 Commits
Author | SHA1 | Date | |
---|---|---|---|
3638e8ea17 | |||
88f4a035ab | |||
92e0898661 | |||
3e65b587ae | |||
06a3f13bd0 | |||
79309f8fd5 | |||
6145ad2f12 | |||
1d7c74d0f3 | |||
e4ac021da4 |
@ -23,6 +23,8 @@ _scrcpy() {
|
|||||||
--kill-adb-on-close
|
--kill-adb-on-close
|
||||||
-K --hid-keyboard
|
-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
|
||||||
|
@ -30,6 +30,8 @@ arguments=(
|
|||||||
'--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]'
|
{-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 1 2 3)'
|
||||||
|
@ -155,6 +155,12 @@ 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.
|
||||||
|
|
||||||
|
.B \-\-list\-camera\-sizes
|
||||||
|
List the valid camera capture sizes.
|
||||||
|
|
||||||
|
.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.
|
||||||
|
117
app/src/cli.c
117
app/src/cli.c
@ -76,10 +76,15 @@ enum {
|
|||||||
OPT_NO_VIDEO,
|
OPT_NO_VIDEO,
|
||||||
OPT_NO_AUDIO_PLAYBACK,
|
OPT_NO_AUDIO_PLAYBACK,
|
||||||
OPT_NO_VIDEO_PLAYBACK,
|
OPT_NO_VIDEO_PLAYBACK,
|
||||||
|
OPT_VIDEO_SOURCE,
|
||||||
OPT_AUDIO_SOURCE,
|
OPT_AUDIO_SOURCE,
|
||||||
OPT_KILL_ADB_ON_CLOSE,
|
OPT_KILL_ADB_ON_CLOSE,
|
||||||
OPT_TIME_LIMIT,
|
OPT_TIME_LIMIT,
|
||||||
OPT_PAUSE_ON_EXIT,
|
OPT_PAUSE_ON_EXIT,
|
||||||
|
OPT_LIST_CAMERAS,
|
||||||
|
OPT_LIST_CAMERA_SIZES,
|
||||||
|
OPT_CAMERA_ID,
|
||||||
|
OPT_CAMERA_SIZE,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct sc_option {
|
struct sc_option {
|
||||||
@ -196,6 +201,22 @@ static const struct sc_option options[] = {
|
|||||||
.longopt = "bit-rate",
|
.longopt = "bit-rate",
|
||||||
.argdesc = "value",
|
.argdesc = "value",
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
.longopt_id = OPT_CAMERA_ID,
|
||||||
|
.longopt = "camera",
|
||||||
|
.argdesc = "id",
|
||||||
|
.text = "Specify the device camera id to mirror when using "
|
||||||
|
"--video-source=camera.\n"
|
||||||
|
"The available camera ids can be listed by:\n"
|
||||||
|
" scrcpy --list-cameras\n"
|
||||||
|
"Default is \"auto\" (the first one)",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.longopt_id = OPT_CAMERA_SIZE,
|
||||||
|
.longopt = "camera-size",
|
||||||
|
.argdesc = "<width>x<height>",
|
||||||
|
.text = "Specify an explicit camera capture size.",
|
||||||
|
},
|
||||||
{
|
{
|
||||||
// Not really deprecated (--codec has never been released), but without
|
// Not really deprecated (--codec has never been released), but without
|
||||||
// declaring an explicit --codec option, getopt_long() partial matching
|
// declaring an explicit --codec option, getopt_long() partial matching
|
||||||
@ -313,6 +334,16 @@ static const struct sc_option options[] = {
|
|||||||
"This is a workaround for some devices not behaving as "
|
"This is a workaround for some devices not behaving as "
|
||||||
"expected when setting the device clipboard programmatically.",
|
"expected when setting the device clipboard programmatically.",
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
.longopt_id = OPT_LIST_CAMERAS,
|
||||||
|
.longopt = "list-cameras",
|
||||||
|
.text = "List device cameras.",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.longopt_id = OPT_LIST_CAMERA_SIZES,
|
||||||
|
.longopt = "list-camera-sizes",
|
||||||
|
.text = "List the valid camera capture sizes.",
|
||||||
|
},
|
||||||
{
|
{
|
||||||
.longopt_id = OPT_LIST_DISPLAYS,
|
.longopt_id = OPT_LIST_DISPLAYS,
|
||||||
.longopt = "list-displays",
|
.longopt = "list-displays",
|
||||||
@ -684,6 +715,13 @@ static const struct sc_option options[] = {
|
|||||||
"codec provided by --video-codec).\n"
|
"codec provided by --video-codec).\n"
|
||||||
"The available encoders can be listed by --list-encoders.",
|
"The available encoders can be listed by --list-encoders.",
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
.longopt_id = OPT_VIDEO_SOURCE,
|
||||||
|
.longopt = "video-source",
|
||||||
|
.argdesc = "source",
|
||||||
|
.text = "Select the video source (display or camera).\n"
|
||||||
|
"Default is display.",
|
||||||
|
},
|
||||||
{
|
{
|
||||||
.shortopt = 'w',
|
.shortopt = 'w',
|
||||||
.longopt = "stay-awake",
|
.longopt = "stay-awake",
|
||||||
@ -1204,9 +1242,9 @@ parse_integer_arg(const char *s, long *out, bool accept_suffix, long min,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static size_t
|
static size_t
|
||||||
parse_integers_arg(const char *s, size_t max_items, long *out, long min,
|
parse_integers_arg(const char *s, const char sep, size_t max_items, long *out,
|
||||||
long max, const char *name) {
|
long min, long max, const char *name) {
|
||||||
size_t count = sc_str_parse_integers(s, ':', max_items, out);
|
size_t count = sc_str_parse_integers(s, sep, max_items, out);
|
||||||
if (!count) {
|
if (!count) {
|
||||||
LOGE("Could not parse %s: %s", name, s);
|
LOGE("Could not parse %s: %s", name, s);
|
||||||
return 0;
|
return 0;
|
||||||
@ -1362,7 +1400,7 @@ parse_window_dimension(const char *s, uint16_t *dimension) {
|
|||||||
static bool
|
static bool
|
||||||
parse_port_range(const char *s, struct sc_port_range *port_range) {
|
parse_port_range(const char *s, struct sc_port_range *port_range) {
|
||||||
long values[2];
|
long values[2];
|
||||||
size_t count = parse_integers_arg(s, 2, values, 0, 0xFFFF, "port");
|
size_t count = parse_integers_arg(s, ':', 2, values, 0, 0xFFFF, "port");
|
||||||
if (!count) {
|
if (!count) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -1624,6 +1662,22 @@ parse_audio_codec(const char *optarg, enum sc_codec *codec) {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool
|
||||||
|
parse_video_source(const char *optarg, enum sc_video_source *source) {
|
||||||
|
if (!strcmp(optarg, "display")) {
|
||||||
|
*source = SC_VIDEO_SOURCE_DISPLAY;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!strcmp(optarg, "camera")) {
|
||||||
|
*source = SC_VIDEO_SOURCE_CAMERA;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
LOGE("Unsupported video source: %s (expected display or camera)", optarg);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
static bool
|
static bool
|
||||||
parse_audio_source(const char *optarg, enum sc_audio_source *source) {
|
parse_audio_source(const char *optarg, enum sc_audio_source *source) {
|
||||||
if (!strcmp(optarg, "mic")) {
|
if (!strcmp(optarg, "mic")) {
|
||||||
@ -1983,10 +2037,16 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
|
|||||||
return false;
|
return false;
|
||||||
#endif
|
#endif
|
||||||
case OPT_LIST_ENCODERS:
|
case OPT_LIST_ENCODERS:
|
||||||
opts->list_encoders = true;
|
opts->list |= SC_OPTION_LIST_ENCODERS;
|
||||||
break;
|
break;
|
||||||
case OPT_LIST_DISPLAYS:
|
case OPT_LIST_DISPLAYS:
|
||||||
opts->list_displays = true;
|
opts->list |= SC_OPTION_LIST_DISPLAYS;
|
||||||
|
break;
|
||||||
|
case OPT_LIST_CAMERAS:
|
||||||
|
opts->list |= SC_OPTION_LIST_CAMERAS;
|
||||||
|
break;
|
||||||
|
case OPT_LIST_CAMERA_SIZES:
|
||||||
|
opts->list |= SC_OPTION_LIST_CAMERA_SIZES;
|
||||||
break;
|
break;
|
||||||
case OPT_REQUIRE_AUDIO:
|
case OPT_REQUIRE_AUDIO:
|
||||||
opts->require_audio = true;
|
opts->require_audio = true;
|
||||||
@ -2002,6 +2062,11 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case OPT_VIDEO_SOURCE:
|
||||||
|
if (!parse_video_source(optarg, &opts->video_source)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
break;
|
||||||
case OPT_AUDIO_SOURCE:
|
case OPT_AUDIO_SOURCE:
|
||||||
if (!parse_audio_source(optarg, &opts->audio_source)) {
|
if (!parse_audio_source(optarg, &opts->audio_source)) {
|
||||||
return false;
|
return false;
|
||||||
@ -2020,6 +2085,12 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case OPT_CAMERA_ID:
|
||||||
|
opts->camera_id = optarg;
|
||||||
|
break;
|
||||||
|
case OPT_CAMERA_SIZE:
|
||||||
|
opts->camera_size = optarg;
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
// getopt prints the error message on stderr
|
// getopt prints the error message on stderr
|
||||||
return false;
|
return false;
|
||||||
@ -2113,6 +2184,40 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
|
|||||||
opts->force_adb_forward = true;
|
opts->force_adb_forward = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (opts->video_source == SC_VIDEO_SOURCE_CAMERA) {
|
||||||
|
if (opts->lock_video_orientation !=
|
||||||
|
SC_LOCK_VIDEO_ORIENTATION_UNLOCKED) {
|
||||||
|
LOGE("--lock-video-orientation is not supported for camera");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!opts->camera_id) {
|
||||||
|
LOGE("Camera id must be specified by --camera=ID "
|
||||||
|
"(list the available ids with --list-cameras)");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!opts->camera_size) {
|
||||||
|
LOGE("Camera size must be specified by --camera-size=WIDTHxHEIGHT");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (opts->control) {
|
||||||
|
LOGI("Camera video source: control disabled");
|
||||||
|
opts->control = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (opts->audio && opts->audio_source == SC_AUDIO_SOURCE_AUTO) {
|
||||||
|
// Select the audio source according to the video source
|
||||||
|
if (opts->video_source == SC_VIDEO_SOURCE_DISPLAY) {
|
||||||
|
opts->audio_source = SC_AUDIO_SOURCE_OUTPUT;
|
||||||
|
} else {
|
||||||
|
opts->audio_source = SC_AUDIO_SOURCE_MIC;
|
||||||
|
LOGI("Camera video source: microphone audio source selected");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (opts->record_format && !opts->record_filename) {
|
if (opts->record_format && !opts->record_filename) {
|
||||||
LOGE("Record format specified without recording");
|
LOGE("Record format specified without recording");
|
||||||
return false;
|
return false;
|
||||||
|
@ -11,10 +11,13 @@ 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,
|
||||||
.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_INJECT,
|
||||||
.mouse_input_mode = SC_MOUSE_INPUT_MODE_INJECT,
|
.mouse_input_mode = SC_MOUSE_INPUT_MODE_INJECT,
|
||||||
@ -79,7 +82,6 @@ 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,
|
||||||
|
.list = 0,
|
||||||
};
|
};
|
||||||
|
@ -44,7 +44,13 @@ enum sc_codec {
|
|||||||
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,
|
||||||
};
|
};
|
||||||
@ -117,9 +123,12 @@ 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;
|
||||||
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;
|
||||||
@ -179,9 +188,12 @@ 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;
|
||||||
|
#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;
|
||||||
};
|
};
|
||||||
|
|
||||||
extern const struct scrcpy_options scrcpy_options_default;
|
extern const struct scrcpy_options scrcpy_options_default;
|
||||||
|
@ -351,6 +351,7 @@ 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,
|
||||||
.crop = options->crop,
|
.crop = options->crop,
|
||||||
.port_range = options->port_range,
|
.port_range = options->port_range,
|
||||||
@ -371,6 +372,8 @@ 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,
|
||||||
.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 +382,8 @@ 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,
|
||||||
|
.list = options->list,
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct sc_server_callbacks cbs = {
|
static const struct sc_server_callbacks cbs = {
|
||||||
@ -399,7 +401,7 @@ scrcpy(struct scrcpy_options *options) {
|
|||||||
|
|
||||||
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;
|
||||||
|
@ -76,6 +76,7 @@ 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);
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool
|
static bool
|
||||||
@ -103,6 +104,7 @@ 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);
|
||||||
#undef COPY
|
#undef COPY
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
@ -247,8 +249,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) {
|
||||||
@ -274,6 +279,12 @@ 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->show_touches) {
|
if (params->show_touches) {
|
||||||
ADD_PARAM("show_touches=true");
|
ADD_PARAM("show_touches=true");
|
||||||
}
|
}
|
||||||
@ -311,12 +322,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
|
||||||
|
|
||||||
@ -896,7 +913,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,15 @@ 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;
|
||||||
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;
|
||||||
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 +59,8 @@ 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;
|
||||||
|
uint8_t list;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct sc_server {
|
struct sc_server {
|
||||||
|
198
server/src/main/java/com/genymobile/scrcpy/CameraCapture.java
Normal file
198
server/src/main/java/com/genymobile/scrcpy/CameraCapture.java
Normal file
@ -0,0 +1,198 @@
|
|||||||
|
package com.genymobile.scrcpy;
|
||||||
|
|
||||||
|
import com.genymobile.scrcpy.wrappers.ServiceManager;
|
||||||
|
|
||||||
|
import android.annotation.SuppressLint;
|
||||||
|
import android.annotation.TargetApi;
|
||||||
|
import android.hardware.camera2.CameraAccessException;
|
||||||
|
import android.hardware.camera2.CameraCaptureSession;
|
||||||
|
import android.hardware.camera2.CameraDevice;
|
||||||
|
import android.hardware.camera2.CaptureFailure;
|
||||||
|
import android.hardware.camera2.CaptureRequest;
|
||||||
|
import android.hardware.camera2.params.OutputConfiguration;
|
||||||
|
import android.hardware.camera2.params.SessionConfiguration;
|
||||||
|
import android.os.Build;
|
||||||
|
import android.os.Handler;
|
||||||
|
import android.os.HandlerThread;
|
||||||
|
import android.view.Surface;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
import java.util.concurrent.ExecutionException;
|
||||||
|
import java.util.concurrent.Executor;
|
||||||
|
import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
|
|
||||||
|
public class CameraCapture extends SurfaceCapture {
|
||||||
|
|
||||||
|
private final String cameraId;
|
||||||
|
private final Size explicitSize;
|
||||||
|
|
||||||
|
private HandlerThread cameraThread;
|
||||||
|
private Handler cameraHandler;
|
||||||
|
private CameraDevice cameraDevice;
|
||||||
|
private Executor cameraExecutor;
|
||||||
|
|
||||||
|
private final AtomicBoolean disconnected = new AtomicBoolean();
|
||||||
|
|
||||||
|
public CameraCapture(String cameraId, Size explicitSize) {
|
||||||
|
this.cameraId = cameraId;
|
||||||
|
this.explicitSize = explicitSize;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void init() throws IOException {
|
||||||
|
cameraThread = new HandlerThread("camera");
|
||||||
|
cameraThread.start();
|
||||||
|
cameraHandler = new Handler(cameraThread.getLooper());
|
||||||
|
cameraExecutor = new HandlerExecutor(cameraHandler);
|
||||||
|
|
||||||
|
try {
|
||||||
|
cameraDevice = openCamera(cameraId);
|
||||||
|
} catch (CameraAccessException | InterruptedException e) {
|
||||||
|
throw new IOException(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void start(Surface surface) throws IOException {
|
||||||
|
try {
|
||||||
|
CameraCaptureSession session = createCaptureSession(cameraDevice, surface);
|
||||||
|
CaptureRequest.Builder requestBuilder = cameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_RECORD);
|
||||||
|
requestBuilder.addTarget(surface);
|
||||||
|
CaptureRequest request = requestBuilder.build();
|
||||||
|
setRepeatingRequest(session, request);
|
||||||
|
} catch (CameraAccessException | InterruptedException e) {
|
||||||
|
throw new IOException(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void release() {
|
||||||
|
if (cameraDevice != null) {
|
||||||
|
cameraDevice.close();
|
||||||
|
}
|
||||||
|
if (cameraThread != null) {
|
||||||
|
cameraThread.quitSafely();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Size getSize() {
|
||||||
|
return explicitSize;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean setMaxSize(int size) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressLint("MissingPermission")
|
||||||
|
@TargetApi(Build.VERSION_CODES.S)
|
||||||
|
private CameraDevice openCamera(String id) throws CameraAccessException, InterruptedException {
|
||||||
|
Ln.v("Open Camera: " + id);
|
||||||
|
|
||||||
|
CompletableFuture<CameraDevice> future = new CompletableFuture<>();
|
||||||
|
ServiceManager.getCameraManager().openCamera(id, new CameraDevice.StateCallback() {
|
||||||
|
@Override
|
||||||
|
public void onOpened(CameraDevice camera) {
|
||||||
|
Ln.v("Open Camera Success");
|
||||||
|
future.complete(camera);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onDisconnected(CameraDevice camera) {
|
||||||
|
Ln.w("Camera disconnected");
|
||||||
|
disconnected.set(true);
|
||||||
|
requestReset();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onError(CameraDevice camera, int error) {
|
||||||
|
int cameraAccessExceptionErrorCode;
|
||||||
|
switch (error) {
|
||||||
|
case CameraDevice.StateCallback.ERROR_CAMERA_IN_USE:
|
||||||
|
cameraAccessExceptionErrorCode = CameraAccessException.CAMERA_IN_USE;
|
||||||
|
break;
|
||||||
|
case CameraDevice.StateCallback.ERROR_MAX_CAMERAS_IN_USE:
|
||||||
|
cameraAccessExceptionErrorCode = CameraAccessException.MAX_CAMERAS_IN_USE;
|
||||||
|
break;
|
||||||
|
case CameraDevice.StateCallback.ERROR_CAMERA_DISABLED:
|
||||||
|
cameraAccessExceptionErrorCode = CameraAccessException.CAMERA_DISABLED;
|
||||||
|
break;
|
||||||
|
case CameraDevice.StateCallback.ERROR_CAMERA_DEVICE:
|
||||||
|
case CameraDevice.StateCallback.ERROR_CAMERA_SERVICE:
|
||||||
|
default:
|
||||||
|
cameraAccessExceptionErrorCode = CameraAccessException.CAMERA_ERROR;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
future.completeExceptionally(new CameraAccessException(cameraAccessExceptionErrorCode));
|
||||||
|
}
|
||||||
|
}, cameraHandler);
|
||||||
|
|
||||||
|
try {
|
||||||
|
return future.get();
|
||||||
|
} catch (ExecutionException e) {
|
||||||
|
throw (CameraAccessException) e.getCause();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@TargetApi(Build.VERSION_CODES.S)
|
||||||
|
private CameraCaptureSession createCaptureSession(CameraDevice camera, Surface surface) throws CameraAccessException, InterruptedException {
|
||||||
|
Ln.d("Create Capture Session");
|
||||||
|
|
||||||
|
CompletableFuture<CameraCaptureSession> future = new CompletableFuture<>();
|
||||||
|
// replace by createCaptureSession(SessionConfiguration)
|
||||||
|
OutputConfiguration outputConfig = new OutputConfiguration(surface);
|
||||||
|
List<OutputConfiguration> outputs = Arrays.asList(outputConfig);
|
||||||
|
SessionConfiguration sessionConfig = new SessionConfiguration(SessionConfiguration.SESSION_REGULAR, outputs, cameraExecutor,
|
||||||
|
new CameraCaptureSession.StateCallback() {
|
||||||
|
@Override
|
||||||
|
public void onConfigured(CameraCaptureSession session) {
|
||||||
|
Ln.d("Create Capture Session Success");
|
||||||
|
future.complete(session);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onConfigureFailed(CameraCaptureSession session) {
|
||||||
|
future.completeExceptionally(new CameraAccessException(CameraAccessException.CAMERA_ERROR));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
camera.createCaptureSession(sessionConfig);
|
||||||
|
|
||||||
|
try {
|
||||||
|
return future.get();
|
||||||
|
} catch (ExecutionException e) {
|
||||||
|
throw (CameraAccessException) e.getCause();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@TargetApi(Build.VERSION_CODES.S)
|
||||||
|
private void setRepeatingRequest(CameraCaptureSession session, CaptureRequest request) throws CameraAccessException, InterruptedException {
|
||||||
|
CompletableFuture<Void> future = new CompletableFuture<>();
|
||||||
|
session.setRepeatingRequest(request, new CameraCaptureSession.CaptureCallback() {
|
||||||
|
@Override
|
||||||
|
public void onCaptureStarted(CameraCaptureSession session, CaptureRequest request, long timestamp, long frameNumber) {
|
||||||
|
future.complete(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCaptureFailed(CameraCaptureSession session, CaptureRequest request, CaptureFailure failure) {
|
||||||
|
future.completeExceptionally(new CameraAccessException(CameraAccessException.CAMERA_ERROR));
|
||||||
|
}
|
||||||
|
}, cameraHandler);
|
||||||
|
|
||||||
|
try {
|
||||||
|
future.get();
|
||||||
|
} catch (ExecutionException e) {
|
||||||
|
throw (CameraAccessException) e.getCause();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isClosed() {
|
||||||
|
return disconnected.get();
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,23 @@
|
|||||||
|
package com.genymobile.scrcpy;
|
||||||
|
|
||||||
|
import android.os.Handler;
|
||||||
|
|
||||||
|
import java.util.concurrent.Executor;
|
||||||
|
import java.util.concurrent.RejectedExecutionException;
|
||||||
|
|
||||||
|
// Inspired from hidden android.os.HandlerExecutor
|
||||||
|
|
||||||
|
public class HandlerExecutor implements Executor {
|
||||||
|
private final Handler handler;
|
||||||
|
|
||||||
|
public HandlerExecutor(Handler handler) {
|
||||||
|
this.handler = handler;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void execute(Runnable command) {
|
||||||
|
if (!handler.post(command)) {
|
||||||
|
throw new RejectedExecutionException(handler + " is shutting down");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -3,6 +3,13 @@ package com.genymobile.scrcpy;
|
|||||||
import com.genymobile.scrcpy.wrappers.DisplayManager;
|
import com.genymobile.scrcpy.wrappers.DisplayManager;
|
||||||
import com.genymobile.scrcpy.wrappers.ServiceManager;
|
import com.genymobile.scrcpy.wrappers.ServiceManager;
|
||||||
|
|
||||||
|
import android.graphics.Rect;
|
||||||
|
import android.hardware.camera2.CameraAccessException;
|
||||||
|
import android.hardware.camera2.CameraCharacteristics;
|
||||||
|
import android.hardware.camera2.CameraManager;
|
||||||
|
import android.hardware.camera2.params.StreamConfigurationMap;
|
||||||
|
import android.media.MediaCodec;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public final class LogUtils {
|
public final class LogUtils {
|
||||||
@ -60,4 +67,50 @@ public final class LogUtils {
|
|||||||
}
|
}
|
||||||
return builder.toString();
|
return builder.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static String getCameraFacingName(int facing) {
|
||||||
|
switch (facing) {
|
||||||
|
case CameraCharacteristics.LENS_FACING_FRONT:
|
||||||
|
return "front";
|
||||||
|
case CameraCharacteristics.LENS_FACING_BACK:
|
||||||
|
return "back";
|
||||||
|
case CameraCharacteristics.LENS_FACING_EXTERNAL:
|
||||||
|
return "external";
|
||||||
|
default:
|
||||||
|
return "unknown";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String buildCameraListMessage(boolean includeSizes) {
|
||||||
|
StringBuilder builder = new StringBuilder("List of cameras:");
|
||||||
|
CameraManager cameraManager = ServiceManager.getCameraManager();
|
||||||
|
try {
|
||||||
|
String[] cameraIds = cameraManager.getCameraIdList();
|
||||||
|
if (cameraIds == null || cameraIds.length == 0) {
|
||||||
|
builder.append("\n (none)");
|
||||||
|
} else {
|
||||||
|
for (String id : cameraIds) {
|
||||||
|
builder.append("\n --video-source=camera --camera=").append(id);
|
||||||
|
CameraCharacteristics characteristics = cameraManager.getCameraCharacteristics(id);
|
||||||
|
int facing = characteristics.get(CameraCharacteristics.LENS_FACING);
|
||||||
|
builder.append(" (").append(getCameraFacingName(facing)).append(", ");
|
||||||
|
|
||||||
|
Rect activeSize = characteristics.get(CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE);
|
||||||
|
builder.append(activeSize.width()).append("x").append(activeSize.height());
|
||||||
|
builder.append(')');
|
||||||
|
|
||||||
|
if (includeSizes) {
|
||||||
|
StreamConfigurationMap configs = characteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
|
||||||
|
android.util.Size[] sizes = configs.getOutputSizes(MediaCodec.class);
|
||||||
|
for (android.util.Size size : sizes) {
|
||||||
|
builder.append("\n - ").append(size.getWidth()).append('x').append(size.getHeight());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (CameraAccessException e) {
|
||||||
|
builder.append("\n (access denied)");
|
||||||
|
}
|
||||||
|
return builder.toString();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -14,6 +14,7 @@ public class Options {
|
|||||||
private int maxSize;
|
private int maxSize;
|
||||||
private VideoCodec videoCodec = VideoCodec.H264;
|
private VideoCodec videoCodec = VideoCodec.H264;
|
||||||
private AudioCodec audioCodec = AudioCodec.OPUS;
|
private AudioCodec audioCodec = AudioCodec.OPUS;
|
||||||
|
private VideoSource videoSource = VideoSource.DISPLAY;
|
||||||
private AudioSource audioSource = AudioSource.OUTPUT;
|
private AudioSource audioSource = AudioSource.OUTPUT;
|
||||||
private int videoBitRate = 8000000;
|
private int videoBitRate = 8000000;
|
||||||
private int audioBitRate = 128000;
|
private int audioBitRate = 128000;
|
||||||
@ -23,6 +24,8 @@ public class Options {
|
|||||||
private Rect crop;
|
private Rect crop;
|
||||||
private boolean control = true;
|
private boolean control = true;
|
||||||
private int displayId;
|
private int displayId;
|
||||||
|
private String cameraId;
|
||||||
|
private Size cameraSize;
|
||||||
private boolean showTouches;
|
private boolean showTouches;
|
||||||
private boolean stayAwake;
|
private boolean stayAwake;
|
||||||
private List<CodecOption> videoCodecOptions;
|
private List<CodecOption> videoCodecOptions;
|
||||||
@ -38,6 +41,8 @@ public class Options {
|
|||||||
|
|
||||||
private boolean listEncoders;
|
private boolean listEncoders;
|
||||||
private boolean listDisplays;
|
private boolean listDisplays;
|
||||||
|
private boolean listCameras;
|
||||||
|
private boolean listCameraSizes;
|
||||||
|
|
||||||
// Options not used by the scrcpy client, but useful to use scrcpy-server directly
|
// Options not used by the scrcpy client, but useful to use scrcpy-server directly
|
||||||
private boolean sendDeviceMeta = true; // send device name and size
|
private boolean sendDeviceMeta = true; // send device name and size
|
||||||
@ -73,6 +78,10 @@ public class Options {
|
|||||||
return audioCodec;
|
return audioCodec;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public VideoSource getVideoSource() {
|
||||||
|
return videoSource;
|
||||||
|
}
|
||||||
|
|
||||||
public AudioSource getAudioSource() {
|
public AudioSource getAudioSource() {
|
||||||
return audioSource;
|
return audioSource;
|
||||||
}
|
}
|
||||||
@ -109,6 +118,14 @@ public class Options {
|
|||||||
return displayId;
|
return displayId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getCameraId() {
|
||||||
|
return cameraId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Size getCameraSize() {
|
||||||
|
return cameraSize;
|
||||||
|
}
|
||||||
|
|
||||||
public boolean getShowTouches() {
|
public boolean getShowTouches() {
|
||||||
return showTouches;
|
return showTouches;
|
||||||
}
|
}
|
||||||
@ -153,6 +170,10 @@ public class Options {
|
|||||||
return powerOn;
|
return powerOn;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean getList() {
|
||||||
|
return listEncoders || listDisplays || listCameras || listCameraSizes;
|
||||||
|
}
|
||||||
|
|
||||||
public boolean getListEncoders() {
|
public boolean getListEncoders() {
|
||||||
return listEncoders;
|
return listEncoders;
|
||||||
}
|
}
|
||||||
@ -161,6 +182,14 @@ public class Options {
|
|||||||
return listDisplays;
|
return listDisplays;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean getListCameras() {
|
||||||
|
return listCameras;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean getListCameraSizes() {
|
||||||
|
return listCameraSizes;
|
||||||
|
}
|
||||||
|
|
||||||
public boolean getSendDeviceMeta() {
|
public boolean getSendDeviceMeta() {
|
||||||
return sendDeviceMeta;
|
return sendDeviceMeta;
|
||||||
}
|
}
|
||||||
@ -230,6 +259,13 @@ public class Options {
|
|||||||
}
|
}
|
||||||
options.audioCodec = audioCodec;
|
options.audioCodec = audioCodec;
|
||||||
break;
|
break;
|
||||||
|
case "video_source":
|
||||||
|
VideoSource videoSource = VideoSource.findByName(value);
|
||||||
|
if (videoSource == null) {
|
||||||
|
throw new IllegalArgumentException("Video source " + value + " not supported");
|
||||||
|
}
|
||||||
|
options.videoSource = videoSource;
|
||||||
|
break;
|
||||||
case "audio_source":
|
case "audio_source":
|
||||||
AudioSource audioSource = AudioSource.findByName(value);
|
AudioSource audioSource = AudioSource.findByName(value);
|
||||||
if (audioSource == null) {
|
if (audioSource == null) {
|
||||||
@ -306,6 +342,18 @@ public class Options {
|
|||||||
case "list_displays":
|
case "list_displays":
|
||||||
options.listDisplays = Boolean.parseBoolean(value);
|
options.listDisplays = Boolean.parseBoolean(value);
|
||||||
break;
|
break;
|
||||||
|
case "list_cameras":
|
||||||
|
options.listCameras = Boolean.parseBoolean(value);
|
||||||
|
break;
|
||||||
|
case "list_camera_sizes":
|
||||||
|
options.listCameraSizes = Boolean.parseBoolean(value);
|
||||||
|
break;
|
||||||
|
case "camera_id":
|
||||||
|
options.cameraId = value;
|
||||||
|
break;
|
||||||
|
case "camera_size":
|
||||||
|
options.cameraSize = parseSize(value);
|
||||||
|
break;
|
||||||
case "send_device_meta":
|
case "send_device_meta":
|
||||||
options.sendDeviceMeta = Boolean.parseBoolean(value);
|
options.sendDeviceMeta = Boolean.parseBoolean(value);
|
||||||
break;
|
break;
|
||||||
@ -351,4 +399,18 @@ public class Options {
|
|||||||
int y = Integer.parseInt(tokens[3]);
|
int y = Integer.parseInt(tokens[3]);
|
||||||
return new Rect(x, y, x + width, y + height);
|
return new Rect(x, y, x + width, y + height);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static Size parseSize(String size) {
|
||||||
|
if (size.isEmpty()) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
// input format: "<width>x<height>"
|
||||||
|
String[] tokens = size.split("x");
|
||||||
|
if (tokens.length != 2) {
|
||||||
|
throw new IllegalArgumentException("Invalid size format (expected <width>x<height>): \"" + size + "\"");
|
||||||
|
}
|
||||||
|
int width = Integer.parseInt(tokens[0]);
|
||||||
|
int height = Integer.parseInt(tokens[1]);
|
||||||
|
return new Size(width, height);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,84 @@
|
|||||||
|
package com.genymobile.scrcpy;
|
||||||
|
|
||||||
|
import com.genymobile.scrcpy.wrappers.SurfaceControl;
|
||||||
|
|
||||||
|
import android.graphics.Rect;
|
||||||
|
import android.os.Build;
|
||||||
|
import android.os.IBinder;
|
||||||
|
import android.view.Surface;
|
||||||
|
|
||||||
|
public class ScreenCapture extends SurfaceCapture implements Device.RotationListener, Device.FoldListener {
|
||||||
|
|
||||||
|
private final Device device;
|
||||||
|
private IBinder display;
|
||||||
|
|
||||||
|
public ScreenCapture(Device device) {
|
||||||
|
this.device = device;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void init() {
|
||||||
|
display = createDisplay();
|
||||||
|
device.setRotationListener(this);
|
||||||
|
device.setFoldListener(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void start(Surface surface) {
|
||||||
|
ScreenInfo screenInfo = device.getScreenInfo();
|
||||||
|
Rect contentRect = screenInfo.getContentRect();
|
||||||
|
|
||||||
|
// does not include the locked video orientation
|
||||||
|
Rect unlockedVideoRect = screenInfo.getUnlockedVideoSize().toRect();
|
||||||
|
int videoRotation = screenInfo.getVideoRotation();
|
||||||
|
int layerStack = device.getLayerStack();
|
||||||
|
setDisplaySurface(display, surface, videoRotation, contentRect, unlockedVideoRect, layerStack);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void release() {
|
||||||
|
device.setRotationListener(null);
|
||||||
|
device.setFoldListener(null);
|
||||||
|
SurfaceControl.destroyDisplay(display);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Size getSize() {
|
||||||
|
return device.getScreenInfo().getVideoSize();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean setMaxSize(int size) {
|
||||||
|
device.setMaxSize(size);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onFoldChanged(int displayId, boolean folded) {
|
||||||
|
requestReset();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onRotationChanged(int rotation) {
|
||||||
|
requestReset();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static IBinder createDisplay() {
|
||||||
|
// Since Android 12 (preview), secure displays could not be created with shell permissions anymore.
|
||||||
|
// On Android 12 preview, SDK_INT is still R (not S), but CODENAME is "S".
|
||||||
|
boolean secure = Build.VERSION.SDK_INT < Build.VERSION_CODES.R || (Build.VERSION.SDK_INT == Build.VERSION_CODES.R && !"S".equals(
|
||||||
|
Build.VERSION.CODENAME));
|
||||||
|
return SurfaceControl.createDisplay("scrcpy", secure);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void setDisplaySurface(IBinder display, Surface surface, int orientation, Rect deviceRect, Rect displayRect, int layerStack) {
|
||||||
|
SurfaceControl.openTransaction();
|
||||||
|
try {
|
||||||
|
SurfaceControl.setDisplaySurface(display, surface);
|
||||||
|
SurfaceControl.setDisplayProjection(display, orientation, deviceRect, displayRect);
|
||||||
|
SurfaceControl.setDisplayLayerStack(display, layerStack);
|
||||||
|
} finally {
|
||||||
|
SurfaceControl.closeTransaction();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -2,6 +2,7 @@ package com.genymobile.scrcpy;
|
|||||||
|
|
||||||
import android.os.BatteryManager;
|
import android.os.BatteryManager;
|
||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
|
import android.os.Looper;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
@ -99,7 +100,8 @@ public final class Server {
|
|||||||
boolean audio = options.getAudio();
|
boolean audio = options.getAudio();
|
||||||
boolean sendDummyByte = options.getSendDummyByte();
|
boolean sendDummyByte = options.getSendDummyByte();
|
||||||
|
|
||||||
Workarounds.apply(audio);
|
boolean camera = true;
|
||||||
|
Workarounds.apply(audio, camera);
|
||||||
|
|
||||||
List<AsyncProcessor> asyncProcessors = new ArrayList<>();
|
List<AsyncProcessor> asyncProcessors = new ArrayList<>();
|
||||||
|
|
||||||
@ -132,9 +134,15 @@ public final class Server {
|
|||||||
if (video) {
|
if (video) {
|
||||||
Streamer videoStreamer = new Streamer(connection.getVideoFd(), options.getVideoCodec(), options.getSendCodecMeta(),
|
Streamer videoStreamer = new Streamer(connection.getVideoFd(), options.getVideoCodec(), options.getSendCodecMeta(),
|
||||||
options.getSendFrameMeta());
|
options.getSendFrameMeta());
|
||||||
ScreenEncoder screenEncoder = new ScreenEncoder(device, videoStreamer, options.getVideoBitRate(), options.getMaxFps(),
|
SurfaceCapture surfaceCapture;
|
||||||
|
if (options.getVideoSource() == VideoSource.DISPLAY) {
|
||||||
|
surfaceCapture = new ScreenCapture(device);
|
||||||
|
} else {
|
||||||
|
surfaceCapture = new CameraCapture(options.getCameraId(), options.getCameraSize());
|
||||||
|
}
|
||||||
|
SurfaceEncoder surfaceEncoder = new SurfaceEncoder(surfaceCapture, videoStreamer, options.getVideoBitRate(), options.getMaxFps(),
|
||||||
options.getVideoCodecOptions(), options.getVideoEncoder(), options.getDownsizeOnError());
|
options.getVideoCodecOptions(), options.getVideoEncoder(), options.getDownsizeOnError());
|
||||||
asyncProcessors.add(screenEncoder);
|
asyncProcessors.add(surfaceEncoder);
|
||||||
}
|
}
|
||||||
|
|
||||||
Completion completion = new Completion(asyncProcessors.size());
|
Completion completion = new Completion(asyncProcessors.size());
|
||||||
@ -179,7 +187,7 @@ public final class Server {
|
|||||||
|
|
||||||
Ln.initLogLevel(options.getLogLevel());
|
Ln.initLogLevel(options.getLogLevel());
|
||||||
|
|
||||||
if (options.getListEncoders() || options.getListDisplays()) {
|
if (options.getList()) {
|
||||||
if (options.getCleanup()) {
|
if (options.getCleanup()) {
|
||||||
CleanUp.unlinkSelf();
|
CleanUp.unlinkSelf();
|
||||||
}
|
}
|
||||||
@ -191,6 +199,10 @@ public final class Server {
|
|||||||
if (options.getListDisplays()) {
|
if (options.getListDisplays()) {
|
||||||
Ln.i(LogUtils.buildDisplayListMessage());
|
Ln.i(LogUtils.buildDisplayListMessage());
|
||||||
}
|
}
|
||||||
|
if (options.getListCameras() || options.getListCameraSizes()) {
|
||||||
|
Workarounds.apply(false, true);
|
||||||
|
Ln.i(LogUtils.buildCameraListMessage(options.getListCameraSizes()));
|
||||||
|
}
|
||||||
// Just print the requested data, do not mirror
|
// Just print the requested data, do not mirror
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,71 @@
|
|||||||
|
package com.genymobile.scrcpy;
|
||||||
|
|
||||||
|
import android.view.Surface;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A video source which can be rendered on a Surface for encoding.
|
||||||
|
*/
|
||||||
|
public abstract class SurfaceCapture {
|
||||||
|
|
||||||
|
private final AtomicBoolean resetCapture = new AtomicBoolean();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Request the encoding session to be restarted, for example if the capture implementation detects that the video source size has changed (on
|
||||||
|
* device rotation for example).
|
||||||
|
*/
|
||||||
|
protected void requestReset() {
|
||||||
|
resetCapture.set(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Consume the reset request (intended to be called by the encoder).
|
||||||
|
*
|
||||||
|
* @return {@code true} if a reset request was pending, {@code false} otherwise.
|
||||||
|
*/
|
||||||
|
public boolean consumeReset() {
|
||||||
|
return resetCapture.getAndSet(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Called once before the capture starts.
|
||||||
|
*/
|
||||||
|
public abstract void init() throws IOException;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Called after the capture ends (if and only if {@link #init()} has been called).
|
||||||
|
*/
|
||||||
|
public abstract void release();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Start the capture to the target surface.
|
||||||
|
*
|
||||||
|
* @param surface the surface which will be encoded
|
||||||
|
*/
|
||||||
|
public abstract void start(Surface surface) throws IOException;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return the video size
|
||||||
|
*
|
||||||
|
* @return the video size
|
||||||
|
*/
|
||||||
|
public abstract Size getSize();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the maximum capture size (set by the encoder if it does not support the current size).
|
||||||
|
*
|
||||||
|
* @param size Maximum size
|
||||||
|
*/
|
||||||
|
public abstract boolean setMaxSize(int size);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Indicate if the capture has been closed internally.
|
||||||
|
*
|
||||||
|
* @return {@code true} is the capture is closed, {@code false} otherwise.
|
||||||
|
*/
|
||||||
|
public boolean isClosed() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
@ -1,13 +1,8 @@
|
|||||||
package com.genymobile.scrcpy;
|
package com.genymobile.scrcpy;
|
||||||
|
|
||||||
import com.genymobile.scrcpy.wrappers.SurfaceControl;
|
|
||||||
|
|
||||||
import android.graphics.Rect;
|
|
||||||
import android.media.MediaCodec;
|
import android.media.MediaCodec;
|
||||||
import android.media.MediaCodecInfo;
|
import android.media.MediaCodecInfo;
|
||||||
import android.media.MediaFormat;
|
import android.media.MediaFormat;
|
||||||
import android.os.Build;
|
|
||||||
import android.os.IBinder;
|
|
||||||
import android.os.Looper;
|
import android.os.Looper;
|
||||||
import android.os.SystemClock;
|
import android.os.SystemClock;
|
||||||
import android.view.Surface;
|
import android.view.Surface;
|
||||||
@ -17,7 +12,7 @@ import java.nio.ByteBuffer;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.concurrent.atomic.AtomicBoolean;
|
import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
|
|
||||||
public class ScreenEncoder implements Device.RotationListener, Device.FoldListener, AsyncProcessor {
|
public class SurfaceEncoder implements AsyncProcessor {
|
||||||
|
|
||||||
private static final int DEFAULT_I_FRAME_INTERVAL = 10; // seconds
|
private static final int DEFAULT_I_FRAME_INTERVAL = 10; // seconds
|
||||||
private static final int REPEAT_FRAME_DELAY_US = 100_000; // repeat after 100ms
|
private static final int REPEAT_FRAME_DELAY_US = 100_000; // repeat after 100ms
|
||||||
@ -27,9 +22,7 @@ public class ScreenEncoder implements Device.RotationListener, Device.FoldListen
|
|||||||
private static final int[] MAX_SIZE_FALLBACK = {2560, 1920, 1600, 1280, 1024, 800};
|
private static final int[] MAX_SIZE_FALLBACK = {2560, 1920, 1600, 1280, 1024, 800};
|
||||||
private static final int MAX_CONSECUTIVE_ERRORS = 3;
|
private static final int MAX_CONSECUTIVE_ERRORS = 3;
|
||||||
|
|
||||||
private final AtomicBoolean resetCapture = new AtomicBoolean();
|
private final SurfaceCapture capture;
|
||||||
|
|
||||||
private final Device device;
|
|
||||||
private final Streamer streamer;
|
private final Streamer streamer;
|
||||||
private final String encoderName;
|
private final String encoderName;
|
||||||
private final List<CodecOption> codecOptions;
|
private final List<CodecOption> codecOptions;
|
||||||
@ -43,9 +36,9 @@ public class ScreenEncoder implements Device.RotationListener, Device.FoldListen
|
|||||||
private Thread thread;
|
private Thread thread;
|
||||||
private final AtomicBoolean stopped = new AtomicBoolean();
|
private final AtomicBoolean stopped = new AtomicBoolean();
|
||||||
|
|
||||||
public ScreenEncoder(Device device, Streamer streamer, int videoBitRate, int maxFps, List<CodecOption> codecOptions, String encoderName,
|
public SurfaceEncoder(SurfaceCapture capture, Streamer streamer, int videoBitRate, int maxFps, List<CodecOption> codecOptions, String encoderName,
|
||||||
boolean downsizeOnError) {
|
boolean downsizeOnError) {
|
||||||
this.device = device;
|
this.capture = capture;
|
||||||
this.streamer = streamer;
|
this.streamer = streamer;
|
||||||
this.videoBitRate = videoBitRate;
|
this.videoBitRate = videoBitRate;
|
||||||
this.maxFps = maxFps;
|
this.maxFps = maxFps;
|
||||||
@ -54,51 +47,29 @@ public class ScreenEncoder implements Device.RotationListener, Device.FoldListen
|
|||||||
this.downsizeOnError = downsizeOnError;
|
this.downsizeOnError = downsizeOnError;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onFoldChanged(int displayId, boolean folded) {
|
|
||||||
resetCapture.set(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onRotationChanged(int rotation) {
|
|
||||||
resetCapture.set(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean consumeResetCapture() {
|
|
||||||
return resetCapture.getAndSet(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void streamScreen() throws IOException, ConfigurationException {
|
private void streamScreen() throws IOException, ConfigurationException {
|
||||||
Codec codec = streamer.getCodec();
|
Codec codec = streamer.getCodec();
|
||||||
MediaCodec mediaCodec = createMediaCodec(codec, encoderName);
|
MediaCodec mediaCodec = createMediaCodec(codec, encoderName);
|
||||||
MediaFormat format = createFormat(codec.getMimeType(), videoBitRate, maxFps, codecOptions);
|
MediaFormat format = createFormat(codec.getMimeType(), videoBitRate, maxFps, codecOptions);
|
||||||
IBinder display = createDisplay();
|
|
||||||
device.setRotationListener(this);
|
|
||||||
device.setFoldListener(this);
|
|
||||||
|
|
||||||
streamer.writeVideoHeader(device.getScreenInfo().getVideoSize());
|
capture.init();
|
||||||
|
|
||||||
boolean alive;
|
|
||||||
try {
|
try {
|
||||||
do {
|
streamer.writeVideoHeader(capture.getSize());
|
||||||
ScreenInfo screenInfo = device.getScreenInfo();
|
|
||||||
Rect contentRect = screenInfo.getContentRect();
|
|
||||||
|
|
||||||
// include the locked video orientation
|
boolean alive;
|
||||||
Rect videoRect = screenInfo.getVideoSize().toRect();
|
|
||||||
format.setInteger(MediaFormat.KEY_WIDTH, videoRect.width());
|
do {
|
||||||
format.setInteger(MediaFormat.KEY_HEIGHT, videoRect.height());
|
Size size = capture.getSize();
|
||||||
|
format.setInteger(MediaFormat.KEY_WIDTH, size.getWidth());
|
||||||
|
format.setInteger(MediaFormat.KEY_HEIGHT, size.getHeight());
|
||||||
|
|
||||||
Surface surface = null;
|
Surface surface = null;
|
||||||
try {
|
try {
|
||||||
mediaCodec.configure(format, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
|
mediaCodec.configure(format, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
|
||||||
surface = mediaCodec.createInputSurface();
|
surface = mediaCodec.createInputSurface();
|
||||||
|
|
||||||
// does not include the locked video orientation
|
capture.start(surface);
|
||||||
Rect unlockedVideoRect = screenInfo.getUnlockedVideoSize().toRect();
|
|
||||||
int videoRotation = screenInfo.getVideoRotation();
|
|
||||||
int layerStack = device.getLayerStack();
|
|
||||||
setDisplaySurface(display, surface, videoRotation, contentRect, unlockedVideoRect, layerStack);
|
|
||||||
|
|
||||||
mediaCodec.start();
|
mediaCodec.start();
|
||||||
|
|
||||||
@ -107,7 +78,7 @@ public class ScreenEncoder implements Device.RotationListener, Device.FoldListen
|
|||||||
mediaCodec.stop();
|
mediaCodec.stop();
|
||||||
} catch (IllegalStateException | IllegalArgumentException e) {
|
} catch (IllegalStateException | IllegalArgumentException e) {
|
||||||
Ln.e("Encoding error: " + e.getClass().getName() + ": " + e.getMessage());
|
Ln.e("Encoding error: " + e.getClass().getName() + ": " + e.getMessage());
|
||||||
if (!prepareRetry(device, screenInfo)) {
|
if (!prepareRetry(size)) {
|
||||||
throw e;
|
throw e;
|
||||||
}
|
}
|
||||||
Ln.i("Retrying...");
|
Ln.i("Retrying...");
|
||||||
@ -121,13 +92,11 @@ public class ScreenEncoder implements Device.RotationListener, Device.FoldListen
|
|||||||
} while (alive);
|
} while (alive);
|
||||||
} finally {
|
} finally {
|
||||||
mediaCodec.release();
|
mediaCodec.release();
|
||||||
device.setRotationListener(null);
|
capture.release();
|
||||||
device.setFoldListener(null);
|
|
||||||
SurfaceControl.destroyDisplay(display);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean prepareRetry(Device device, ScreenInfo screenInfo) {
|
private boolean prepareRetry(Size currentSize) {
|
||||||
if (firstFrameSent) {
|
if (firstFrameSent) {
|
||||||
++consecutiveErrors;
|
++consecutiveErrors;
|
||||||
if (consecutiveErrors >= MAX_CONSECUTIVE_ERRORS) {
|
if (consecutiveErrors >= MAX_CONSECUTIVE_ERRORS) {
|
||||||
@ -147,15 +116,19 @@ public class ScreenEncoder implements Device.RotationListener, Device.FoldListen
|
|||||||
|
|
||||||
// Downsizing on error is only enabled if an encoding failure occurs before the first frame (downsizing later could be surprising)
|
// Downsizing on error is only enabled if an encoding failure occurs before the first frame (downsizing later could be surprising)
|
||||||
|
|
||||||
int newMaxSize = chooseMaxSizeFallback(screenInfo.getVideoSize());
|
int newMaxSize = chooseMaxSizeFallback(currentSize);
|
||||||
if (newMaxSize == 0) {
|
if (newMaxSize == 0) {
|
||||||
// Must definitively fail
|
// Must definitively fail
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Retry with a smaller device size
|
boolean accepted = capture.setMaxSize(newMaxSize);
|
||||||
|
if (!accepted) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Retry with a smaller size
|
||||||
Ln.i("Retrying with -m" + newMaxSize + "...");
|
Ln.i("Retrying with -m" + newMaxSize + "...");
|
||||||
device.setMaxSize(newMaxSize);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -176,14 +149,14 @@ public class ScreenEncoder implements Device.RotationListener, Device.FoldListen
|
|||||||
boolean alive = true;
|
boolean alive = true;
|
||||||
MediaCodec.BufferInfo bufferInfo = new MediaCodec.BufferInfo();
|
MediaCodec.BufferInfo bufferInfo = new MediaCodec.BufferInfo();
|
||||||
|
|
||||||
while (!consumeResetCapture() && !eof) {
|
while (!capture.consumeReset() && !eof) {
|
||||||
if (stopped.get()) {
|
if (stopped.get()) {
|
||||||
alive = false;
|
alive = false;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
int outputBufferId = codec.dequeueOutputBuffer(bufferInfo, -1);
|
int outputBufferId = codec.dequeueOutputBuffer(bufferInfo, -1);
|
||||||
try {
|
try {
|
||||||
if (consumeResetCapture()) {
|
if (capture.consumeReset()) {
|
||||||
// must restart encoding with new size
|
// must restart encoding with new size
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -208,6 +181,11 @@ public class ScreenEncoder implements Device.RotationListener, Device.FoldListen
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (capture.isClosed()) {
|
||||||
|
// The capture might have been closed internally (for example if the camera is disconnected)
|
||||||
|
alive = false;
|
||||||
|
}
|
||||||
|
|
||||||
return !eof && alive;
|
return !eof && alive;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -264,25 +242,6 @@ public class ScreenEncoder implements Device.RotationListener, Device.FoldListen
|
|||||||
return format;
|
return format;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static IBinder createDisplay() {
|
|
||||||
// Since Android 12 (preview), secure displays could not be created with shell permissions anymore.
|
|
||||||
// On Android 12 preview, SDK_INT is still R (not S), but CODENAME is "S".
|
|
||||||
boolean secure = Build.VERSION.SDK_INT < Build.VERSION_CODES.R || (Build.VERSION.SDK_INT == Build.VERSION_CODES.R && !"S"
|
|
||||||
.equals(Build.VERSION.CODENAME));
|
|
||||||
return SurfaceControl.createDisplay("scrcpy", secure);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void setDisplaySurface(IBinder display, Surface surface, int orientation, Rect deviceRect, Rect displayRect, int layerStack) {
|
|
||||||
SurfaceControl.openTransaction();
|
|
||||||
try {
|
|
||||||
SurfaceControl.setDisplaySurface(display, surface);
|
|
||||||
SurfaceControl.setDisplayProjection(display, orientation, deviceRect, displayRect);
|
|
||||||
SurfaceControl.setDisplayLayerStack(display, layerStack);
|
|
||||||
} finally {
|
|
||||||
SurfaceControl.closeTransaction();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void start(TerminationListener listener) {
|
public void start(TerminationListener listener) {
|
||||||
thread = new Thread(() -> {
|
thread = new Thread(() -> {
|
24
server/src/main/java/com/genymobile/scrcpy/VideoSource.java
Normal file
24
server/src/main/java/com/genymobile/scrcpy/VideoSource.java
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
package com.genymobile.scrcpy;
|
||||||
|
|
||||||
|
import android.media.MediaRecorder;
|
||||||
|
|
||||||
|
public enum VideoSource {
|
||||||
|
DISPLAY("display"),
|
||||||
|
CAMERA("camera");
|
||||||
|
|
||||||
|
private final String name;
|
||||||
|
|
||||||
|
VideoSource(String name) {
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
static VideoSource findByName(String name) {
|
||||||
|
for (VideoSource videoSource : VideoSource.values()) {
|
||||||
|
if (name.equals(videoSource.name)) {
|
||||||
|
return videoSource;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
@ -28,14 +28,13 @@ public final class Workarounds {
|
|||||||
// not instantiable
|
// not instantiable
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void apply(boolean audio) {
|
public static void apply(boolean audio, boolean camera) {
|
||||||
Workarounds.prepareMainLooper();
|
Workarounds.prepareMainLooper();
|
||||||
|
|
||||||
boolean mustFillAppInfo = false;
|
boolean mustFillAppInfo = false;
|
||||||
boolean mustFillBaseContext = false;
|
boolean mustFillBaseContext = true;
|
||||||
boolean mustFillAppContext = false;
|
boolean mustFillAppContext = false;
|
||||||
|
|
||||||
|
|
||||||
if (Build.BRAND.equalsIgnoreCase("meizu")) {
|
if (Build.BRAND.equalsIgnoreCase("meizu")) {
|
||||||
// Workarounds must be applied for Meizu phones:
|
// Workarounds must be applied for Meizu phones:
|
||||||
// - <https://github.com/Genymobile/scrcpy/issues/240>
|
// - <https://github.com/Genymobile/scrcpy/issues/240>
|
||||||
@ -65,6 +64,10 @@ public final class Workarounds {
|
|||||||
mustFillAppContext = true;
|
mustFillAppContext = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (camera) {
|
||||||
|
mustFillAppInfo = true;
|
||||||
|
}
|
||||||
|
|
||||||
if (mustFillAppInfo) {
|
if (mustFillAppInfo) {
|
||||||
Workarounds.fillAppInfo();
|
Workarounds.fillAppInfo();
|
||||||
}
|
}
|
||||||
|
@ -1,9 +1,15 @@
|
|||||||
package com.genymobile.scrcpy.wrappers;
|
package com.genymobile.scrcpy.wrappers;
|
||||||
|
|
||||||
|
import com.genymobile.scrcpy.FakeContext;
|
||||||
|
import com.genymobile.scrcpy.Workarounds;
|
||||||
|
|
||||||
import android.annotation.SuppressLint;
|
import android.annotation.SuppressLint;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.hardware.camera2.CameraManager;
|
||||||
import android.os.IBinder;
|
import android.os.IBinder;
|
||||||
import android.os.IInterface;
|
import android.os.IInterface;
|
||||||
|
|
||||||
|
import java.lang.reflect.Constructor;
|
||||||
import java.lang.reflect.InvocationTargetException;
|
import java.lang.reflect.InvocationTargetException;
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
|
|
||||||
@ -26,6 +32,7 @@ public final class ServiceManager {
|
|||||||
private static StatusBarManager statusBarManager;
|
private static StatusBarManager statusBarManager;
|
||||||
private static ClipboardManager clipboardManager;
|
private static ClipboardManager clipboardManager;
|
||||||
private static ActivityManager activityManager;
|
private static ActivityManager activityManager;
|
||||||
|
private static CameraManager cameraManager;
|
||||||
|
|
||||||
private ServiceManager() {
|
private ServiceManager() {
|
||||||
/* not instantiable */
|
/* not instantiable */
|
||||||
@ -129,4 +136,16 @@ public final class ServiceManager {
|
|||||||
|
|
||||||
return activityManager;
|
return activityManager;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static CameraManager getCameraManager() {
|
||||||
|
if (cameraManager == null) {
|
||||||
|
try {
|
||||||
|
Constructor<CameraManager> ctor = CameraManager.class.getDeclaredConstructor(Context.class);
|
||||||
|
cameraManager = ctor.newInstance(FakeContext.get());
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw new AssertionError(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return cameraManager;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user