Display and control your Android device
Group server params in a struct
Romain Vimontca767ba36410
diff --git a/app/src/scrcpy.c b/app/src/scrcpy.cindex 7a067134..c7b78fee 100644--- a/app/src/scrcpy.c+++ b/app/src/scrcpy.c@@ -271,9 +271,14 @@ av_log_callback(void *avcl, int level, const char *fmt, va_list vl) {boolscrcpy(const struct scrcpy_options *options) {bool record = !!options->record_filename;- if (!server_start(&server, options->serial, options->port,- options->max_size, options->bit_rate, options->crop,- record)) {+ struct server_params params = {+ .crop = options->crop,+ .local_port = options->port,+ .max_size = options->max_size,+ .bit_rate = options->bit_rate,+ .send_frame_meta = record,+ };+ if (!server_start(&server, options->serial, ¶ms)) {return false;}diff --git a/app/src/server.c b/app/src/server.cindex 3f76e5c7..5b586b93 100644--- a/app/src/server.c+++ b/app/src/server.c@@ -79,14 +79,11 @@ disable_tunnel(struct server *server) {}static process_t-execute_server(const char *serial,- uint16_t max_size, uint32_t bit_rate,- bool tunnel_forward, const char *crop,- bool send_frame_meta) {+execute_server(struct server *server, const struct server_params *params) {char max_size_string[6];char bit_rate_string[11];- sprintf(max_size_string, "%"PRIu16, max_size);- sprintf(bit_rate_string, "%"PRIu32, bit_rate);+ sprintf(max_size_string, "%"PRIu16, params->max_size);+ sprintf(bit_rate_string, "%"PRIu32, params->bit_rate);const char *const cmd[] = {"shell","CLASSPATH=/data/local/tmp/scrcpy-server.jar",@@ -95,11 +92,11 @@ execute_server(const char *serial,"com.genymobile.scrcpy.Server",max_size_string,bit_rate_string,- tunnel_forward ? "true" : "false",- crop ? crop : "-",- send_frame_meta ? "true" : "false",+ server->tunnel_forward ? "true" : "false",+ params->crop ? params->crop : "-",+ params->send_frame_meta ? "true" : "false",};- return adb_execute(serial, cmd, sizeof(cmd) / sizeof(cmd[0]));+ return adb_execute(server->serial, cmd, sizeof(cmd) / sizeof(cmd[0]));}#define IPV4_LOCALHOST 0x7F000001@@ -160,9 +157,8 @@ server_init(struct server *server) {boolserver_start(struct server *server, const char *serial,- uint16_t local_port, uint16_t max_size, uint32_t bit_rate,- const char *crop, bool send_frame_meta) {- server->local_port = local_port;+ const struct server_params *params) {+ server->local_port = params->local_port;if (serial) {server->serial = SDL_strdup(serial);@@ -191,9 +187,9 @@ server_start(struct server *server, const char *serial,// need to try to connect until the server socket is listening on the// device.- server->server_socket = listen_on_port(local_port);+ server->server_socket = listen_on_port(params->local_port);if (server->server_socket == INVALID_SOCKET) {- LOGE("Could not listen on port %" PRIu16, local_port);+ LOGE("Could not listen on port %" PRIu16, params->local_port);disable_tunnel(server);SDL_free(server->serial);return false;@@ -201,9 +197,7 @@ server_start(struct server *server, const char *serial,}// server will connect to our server socket- server->process = execute_server(serial, max_size, bit_rate,- server->tunnel_forward, crop,- send_frame_meta);+ server->process = execute_server(server, params);if (server->process == PROCESS_NONE) {if (!server->tunnel_forward) {diff --git a/app/src/server.h b/app/src/server.hindex 843258be..de0d14b8 100644--- a/app/src/server.h+++ b/app/src/server.h@@ -29,6 +29,14 @@ struct server {.tunnel_forward = false, \}+struct server_params {+ const char *crop;+ uint16_t local_port;+ uint16_t max_size;+ uint32_t bit_rate;+ bool send_frame_meta;+};+// init default valuesvoidserver_init(struct server *server);@@ -36,8 +44,7 @@ server_init(struct server *server);// push, enable tunnel et start the serverboolserver_start(struct server *server, const char *serial,- uint16_t local_port, uint16_t max_size, uint32_t bit_rate,- const char *crop, bool send_frame_meta);+ const struct server_params *params);// block until the communication with the server is establishedbool