linux/scrcpy
0
0
Fork 0
mirror of https://github.com/Genymobile/scrcpy.git synced 2024-09-19 05:31:21 +02:00
Code Issues Projects Releases Wiki Activity
scrcpy/app/src/server.h

62 lines
1.4 KiB
C
Raw Normal View History

Add missing include guards In practice, these headers are included only once, but it's a good practice to always use include guards.
2018-02-08 13:47:31 +01:00
#ifndef SERVER_H
#define SERVER_H
Replace SDL types by C99 standard types Scrcpy is a C11 project. Use the C99 standard types instead of the SDL-specific types: SDL_bool -> bool SintXX -> intXX_t UintXX -> uintXX_t
2019-03-02 23:52:22 +01:00
#include <stdbool.h>
#include <stdint.h>
Extract server-related functions To lighten screen.c, move start_server() and stop_server() to a separate file.
2018-01-22 11:22:31 +01:00
#include "command.h"
Replace SDL_net by custom implementation SDL_net is not very suitable for scrcpy. For example, SDLNet_TCP_Accept() is non-blocking, so we have to wrap it by calling many SDL_Net-specific functions to make it blocking. But above all, SDLNet_TCP_Open() is a server socket only when no IP is provided; otherwise, it's a client socket. Therefore, it is not possible to create a server socket bound to localhost, so it accepts connections from anywhere. This is a problem for scrcpy, because on start, the application listens for nearly 1 second until it accepts the first connection, supposedly from the device. If someone on the local network manages to connect to the server socket first, then they can stream arbitrary H.264 video. This may be troublesome, for example during a public presentation ;-) Provide our own simplified API (net.h) instead, implemented for the different platforms.
2018-02-15 22:59:21 +01:00
#include "net.h"
Extract server-related functions To lighten screen.c, move start_server() and stop_server() to a separate file.
2018-01-22 11:22:31 +01:00
Move server-related code to server.c The file server.c already existed, but exposed a low-level API. Make it higher-level, so that scrcpy.c does not handle server details directly.
2018-02-08 15:16:27 +01:00
struct server {
Make owned serial a pointer-to-non-const The server owns the serial, so it needs to free it. Therefore, it should not be a pointer-to-const.
2019-03-03 00:01:16 +01:00
char *serial;
Move server-related code to server.c The file server.c already existed, but exposed a low-level API. Make it higher-level, so that scrcpy.c does not handle server details directly.
2018-02-08 15:16:27 +01:00
process_t process;
Make it work over tcpip "adb reverse" currently does not work over tcpip (i.e. on a device connected by "adb connect"): <https://issuetracker.google.com/issues/37066218> To work around the problem, if the call to "adb reverse" fails, then fallback to "adb forward", and reverse the client/server roles. Keep the "adb reverse" mode as the default because it does not involve connection retries: when using "adb forward", the client must try to connect successively until the server listens. Due to the tunnel, every connect() will succeed, so the client must attempt to read() to detect a connection failure. For this purpose, when using the "adb forward" mode, the server initially writes a dummy byte, read by the client. Fixes <https://github.com/Genymobile/scrcpy/issues/5>.
2018-03-12 08:35:51 +01:00
socket_t server_socket; // only used if !tunnel_forward
Use two sockets for video and control The socket used the device-to-computer direction to stream the video and the computer-to-device direction to send control events. Some features, like copy-paste from device to computer, require to send non-video data from the device to the computer. To make them possible, use two sockets: - one for streaming the video from the device to the client; - one for control/events in both directions.
2019-05-28 21:03:54 +02:00
socket_t video_socket;
socket_t control_socket;
Replace SDL types by C99 standard types Scrcpy is a C11 project. Use the C99 standard types instead of the SDL-specific types: SDL_bool -> bool SintXX -> intXX_t UintXX -> uintXX_t
2019-03-02 23:52:22 +01:00
uint16_t local_port;
bool tunnel_enabled;
bool tunnel_forward; // use "adb forward" instead of "adb reverse"
Move server-related code to server.c The file server.c already existed, but exposed a low-level API. Make it higher-level, so that scrcpy.c does not handle server details directly.
2018-02-08 15:16:27 +01:00
};
Move server-related functions to server.c In addition to the functions to start/stop the server, move the functions to push the jar and enable/disable the "adb reverse" tunnel.
2018-01-23 15:46:34 +01:00
Fix indentation Previous refactorings broke indentation.
2019-05-28 13:37:27 +02:00
#define SERVER_INITIALIZER { \
.serial = NULL, \
.process = PROCESS_NONE, \
.server_socket = INVALID_SOCKET, \
Use two sockets for video and control The socket used the device-to-computer direction to stream the video and the computer-to-device direction to send control events. Some features, like copy-paste from device to computer, require to send non-video data from the device to the computer. To make them possible, use two sockets: - one for streaming the video from the device to the client; - one for control/events in both directions.
2019-05-28 21:03:54 +02:00
.video_socket = INVALID_SOCKET, \
.control_socket = INVALID_SOCKET, \
Fix indentation Previous refactorings broke indentation.
2019-05-28 13:37:27 +02:00
.local_port = 0, \
Replace SDL types by C99 standard types Scrcpy is a C11 project. Use the C99 standard types instead of the SDL-specific types: SDL_bool -> bool SintXX -> intXX_t UintXX -> uintXX_t
2019-03-02 23:52:22 +01:00
.tunnel_enabled = false, \
.tunnel_forward = false, \
Move server-related code to server.c The file server.c already existed, but exposed a low-level API. Make it higher-level, so that scrcpy.c does not handle server details directly.
2018-02-08 15:16:27 +01:00
}
Group server params in a struct Starting the server requires more and more parameters. For clarity, group them in a struct.
2019-06-04 23:59:55 +02:00
struct server_params {
const char *crop;
uint16_t local_port;
uint16_t max_size;
uint32_t bit_rate;
bool send_frame_meta;
};
Move server-related code to server.c The file server.c already existed, but exposed a low-level API. Make it higher-level, so that scrcpy.c does not handle server details directly.
2018-02-08 15:16:27 +01:00
// init default values
Update code style Limit source code to 80 chars, and declare functions return type and modifiers on a separate line. This allows to avoid very long lines, and all function names are aligned. (We do this on VLC, and I like it.)
2019-03-02 20:09:56 +01:00
void
server_init(struct server *server);
Move server-related code to server.c The file server.c already existed, but exposed a low-level API. Make it higher-level, so that scrcpy.c does not handle server details directly.
2018-02-08 15:16:27 +01:00
// push, enable tunnel et start the server
Replace SDL types by C99 standard types Scrcpy is a C11 project. Use the C99 standard types instead of the SDL-specific types: SDL_bool -> bool SintXX -> intXX_t UintXX -> uintXX_t
2019-03-02 23:52:22 +01:00
bool
Update code style Limit source code to 80 chars, and declare functions return type and modifiers on a separate line. This allows to avoid very long lines, and all function names are aligned. (We do this on VLC, and I like it.)
2019-03-02 20:09:56 +01:00
server_start(struct server *server, const char *serial,
Group server params in a struct Starting the server requires more and more parameters. For clarity, group them in a struct.
2019-06-04 23:59:55 +02:00
const struct server_params *params);
Move server-related code to server.c The file server.c already existed, but exposed a low-level API. Make it higher-level, so that scrcpy.c does not handle server details directly.
2018-02-08 15:16:27 +01:00
// block until the communication with the server is established
Make server_connect_to() return a bool The resulting socket is accessible from the server instance, there is no need to return it. This paves the way to use several sockets in parallel.
2019-05-28 13:41:19 +02:00
bool
Update code style Limit source code to 80 chars, and declare functions return type and modifiers on a separate line. This allows to avoid very long lines, and all function names are aligned. (We do this on VLC, and I like it.)
2019-03-02 20:09:56 +01:00
server_connect_to(struct server *server);
Move server-related code to server.c The file server.c already existed, but exposed a low-level API. Make it higher-level, so that scrcpy.c does not handle server details directly.
2018-02-08 15:16:27 +01:00
// disconnect and kill the server process
Update code style Limit source code to 80 chars, and declare functions return type and modifiers on a separate line. This allows to avoid very long lines, and all function names are aligned. (We do this on VLC, and I like it.)
2019-03-02 20:09:56 +01:00
void
server_stop(struct server *server);
Add missing include guards In practice, these headers are included only once, but it's a good practice to always use include guards.
2018-02-08 13:47:31 +01:00
Do not release TCP sockets while still in use SDLNet_TCP_Close() not only closes, but also release the resources. Therefore, we must not close the socket if another thread attempts to read it. For that purpose, move socket closing from server_stop() to server_destroy().
2018-02-09 12:59:36 +01:00
// close and release sockets
Update code style Limit source code to 80 chars, and declare functions return type and modifiers on a separate line. This allows to avoid very long lines, and all function names are aligned. (We do this on VLC, and I like it.)
2019-03-02 20:09:56 +01:00
void
server_destroy(struct server *server);
Do not release TCP sockets while still in use SDLNet_TCP_Close() not only closes, but also release the resources. Therefore, we must not close the socket if another thread attempts to read it. For that purpose, move socket closing from server_stop() to server_destroy().
2018-02-09 12:59:36 +01:00
Add missing include guards In practice, these headers are included only once, but it's a good practice to always use include guards.
2018-02-08 13:47:31 +01:00
#endif
Reference in a new issue Copy permalink