Compare commits
2 Commits
install.2
...
build-deps
Author | SHA1 | Date | |
---|---|---|---|
652e210bfb | |||
a1117c58ac |
2
app/deps/.gitignore
vendored
Normal file
2
app/deps/.gitignore
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
/data
|
||||
/target-*
|
64
app/deps/src/build-ffmpeg.sh
Executable file
64
app/deps/src/build-ffmpeg.sh
Executable file
@ -0,0 +1,64 @@
|
||||
#!/usr/bin/env bash
|
||||
. init_deps
|
||||
|
||||
VERSION=5.0.1
|
||||
FILENAME=ffmpeg-$VERSION.tar.xz
|
||||
|
||||
URL=http://ffmpeg.org/releases/ffmpeg-$VERSION.tar.xz
|
||||
SHA256SUM=ef2efae259ce80a240de48ec85ecb062cecca26e4352ffb3fda562c21a93007b
|
||||
|
||||
DEP_DIR="$DATA_DIR/ffmpeg-$VERSION-$SHA256SUM"
|
||||
|
||||
if [[ ! -d "$DEP_DIR" ]]
|
||||
then
|
||||
get_file "$URL" "$FILENAME" "$SHA256SUM"
|
||||
|
||||
mkdir "$DEP_DIR"
|
||||
cd "$DEP_DIR"
|
||||
|
||||
tar xvf "../$FILENAME"
|
||||
else
|
||||
echo "$DEP_DIR found"
|
||||
cd "$DEP_DIR"
|
||||
fi
|
||||
|
||||
cd "ffmpeg-$VERSION"
|
||||
rm -rf "build-$HOST"
|
||||
mkdir "build-$HOST"
|
||||
cd "build-$HOST"
|
||||
|
||||
params=(
|
||||
--prefix="$INSTALL_DIR"
|
||||
--arch="$ARCH"
|
||||
--disable-autodetect
|
||||
--disable-programs
|
||||
--disable-everything
|
||||
--disable-doc
|
||||
--disable-swresample
|
||||
--disable-swscale
|
||||
--disable-avfilter
|
||||
--disable-postproc
|
||||
--disable-static
|
||||
--enable-shared
|
||||
--enable-decoder=h264
|
||||
--enable-decoder=png
|
||||
--enable-muxer=mp4
|
||||
--enable-muxer=matroska
|
||||
)
|
||||
|
||||
case "$HOST_SYSTEM" in
|
||||
linux)
|
||||
params+=(--enable-libv4l2)
|
||||
;;
|
||||
windows)
|
||||
params+=(--target-os=mingw32)
|
||||
params+=(--cross-prefix="$HOST-")
|
||||
;;
|
||||
*)
|
||||
fail "Unsupported platform: $HOST"
|
||||
;;
|
||||
esac
|
||||
|
||||
../configure "${params[@]}"
|
||||
make -j $NJOBS
|
||||
make install
|
56
app/deps/src/init_deps
Normal file
56
app/deps/src/init_deps
Normal file
@ -0,0 +1,56 @@
|
||||
set -e
|
||||
|
||||
# The caller must set the following environment variable
|
||||
# - $HOST (e.g. "x86_64-linux-gnu")
|
||||
# - $HOST_SYSTEM ("linux", "windows", "apple"), for scripts convenience
|
||||
|
||||
fail() {
|
||||
echo "$1" >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
[[ -z "$HOST" ]] && fail '$HOST not defined'
|
||||
|
||||
if [[ "$HOST" == *linux* ]]
|
||||
then
|
||||
HOST_SYSTEM='linux'
|
||||
elif [[ "$HOST" == *mingw* ]]
|
||||
then
|
||||
HOST_SYSTEM='windows'
|
||||
else
|
||||
fail "Host system could not be deduced from '$HOST'"
|
||||
fi
|
||||
|
||||
ARCH="${HOST%%-*}"
|
||||
[[ -z "$ARCH" ]] && fail "Arch could not be deduced from '$HOST'"
|
||||
|
||||
DIR=$(dirname ${BASH_SOURCE[0]})
|
||||
cd "$DIR"
|
||||
|
||||
DATA_DIR=$(realpath ../data)
|
||||
INSTALL_DIR=$(realpath ../target-"$HOST")
|
||||
NJOBS=$(grep -c ^processor /proc/cpuinfo)
|
||||
|
||||
mkdir -p "$DATA_DIR"
|
||||
cd "$DATA_DIR"
|
||||
|
||||
checksum() {
|
||||
local file="$1"
|
||||
local sum="$2"
|
||||
echo "$file: verifying checksum..."
|
||||
echo "$sum $file" | sha256sum -c
|
||||
}
|
||||
|
||||
get_file() {
|
||||
local url="$1"
|
||||
local file="$2"
|
||||
local sum="$3"
|
||||
if [[ -f "$file" ]]
|
||||
then
|
||||
echo "$file: found"
|
||||
else
|
||||
echo "$file: not found, downloading..."
|
||||
wget "$url" -O "$file"
|
||||
fi
|
||||
checksum "$file" "$sum"
|
||||
}
|
@ -710,50 +710,5 @@ sc_adb_get_device_ip(struct sc_intr *intr, const char *serial, unsigned flags) {
|
||||
// It is parsed as a NUL-terminated string
|
||||
buf[r] = '\0';
|
||||
|
||||
return sc_adb_parse_device_ip(buf);
|
||||
}
|
||||
|
||||
char *
|
||||
sc_adb_get_installed_apk_path(struct sc_intr *intr, const char *serial,
|
||||
unsigned flags) {
|
||||
assert(serial);
|
||||
const char *const argv[] =
|
||||
SC_ADB_COMMAND("-s", serial, "shell", "pm", "list", "package", "-f",
|
||||
SC_ANDROID_PACKAGE);
|
||||
|
||||
sc_pipe pout;
|
||||
sc_pid pid = sc_adb_execute_p(argv, flags, &pout);
|
||||
if (pid == SC_PROCESS_NONE) {
|
||||
LOGD("Could not execute \"pm list packages\"");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// "pm list packages -f <package>" output should contain only one line, so
|
||||
// the output should be short
|
||||
char buf[1024];
|
||||
ssize_t r = sc_pipe_read_all_intr(intr, pid, pout, buf, sizeof(buf) - 1);
|
||||
sc_pipe_close(pout);
|
||||
|
||||
bool ok = process_check_success_intr(intr, pid, "pm list packages", flags);
|
||||
if (!ok) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (r == -1) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
assert((size_t) r < sizeof(buf));
|
||||
if (r == sizeof(buf) - 1) {
|
||||
// The implementation assumes that the output of "ip route" fits in the
|
||||
// buffer in a single pass
|
||||
LOGW("Result of \"pm list package\" does not fit in 1Kb. "
|
||||
"Please report an issue.");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// It is parsed as a NUL-terminated string
|
||||
buf[r] = '\0';
|
||||
|
||||
return sc_adb_parse_installed_apk_path(buf);
|
||||
return sc_adb_parse_device_ip_from_output(buf);
|
||||
}
|
||||
|
@ -15,8 +15,6 @@
|
||||
|
||||
#define SC_ADB_SILENT (SC_ADB_NO_STDOUT | SC_ADB_NO_STDERR | SC_ADB_NO_LOGERR)
|
||||
|
||||
#define SC_ANDROID_PACKAGE "com.genymobile.scrcpy"
|
||||
|
||||
const char *
|
||||
sc_adb_get_executable(void);
|
||||
|
||||
@ -116,11 +114,4 @@ sc_adb_getprop(struct sc_intr *intr, const char *serial, const char *prop,
|
||||
char *
|
||||
sc_adb_get_device_ip(struct sc_intr *intr, const char *serial, unsigned flags);
|
||||
|
||||
/**
|
||||
* Return the path of the installed APK for com.genymobile.scrcpy (if any)
|
||||
*/
|
||||
char *
|
||||
sc_adb_get_installed_apk_path(struct sc_intr *intr, const char *serial,
|
||||
unsigned flags);
|
||||
|
||||
#endif
|
||||
|
@ -199,7 +199,7 @@ sc_adb_parse_device_ip_from_line(char *line) {
|
||||
}
|
||||
|
||||
char *
|
||||
sc_adb_parse_device_ip(char *str) {
|
||||
sc_adb_parse_device_ip_from_output(char *str) {
|
||||
size_t idx_line = 0;
|
||||
while (str[idx_line] != '\0') {
|
||||
char *line = &str[idx_line];
|
||||
@ -225,31 +225,3 @@ sc_adb_parse_device_ip(char *str) {
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
char *
|
||||
sc_adb_parse_installed_apk_path(char *str) {
|
||||
// str is expected to look like:
|
||||
// "package:/data/app/.../base.apk=com.genymobile.scrcpy"
|
||||
// ^^^^^^^^^^^^^^^^^^^^^^
|
||||
// We want to extract the path (which may contain '=', even in practice)
|
||||
|
||||
if (strncmp(str, "package:", 8)) {
|
||||
// Does not start with "package:"
|
||||
return NULL;
|
||||
}
|
||||
|
||||
char *s = str + 8;
|
||||
size_t len = strcspn(s, " \r\n");
|
||||
s[len] = '\0';
|
||||
|
||||
char *p = strrchr(s, '=');
|
||||
if (!p) {
|
||||
// No '=' found
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// Truncate at the last '='
|
||||
*p = '\0';
|
||||
|
||||
return strdup(s);
|
||||
}
|
||||
|
@ -25,17 +25,6 @@ sc_adb_parse_devices(char *str, struct sc_vec_adb_devices *out_vec);
|
||||
* Warning: this function modifies the buffer for optimization purposes.
|
||||
*/
|
||||
char *
|
||||
sc_adb_parse_device_ip(char *str);
|
||||
|
||||
/**
|
||||
* Parse the package path from the output of
|
||||
* `adb shell pm list packages -f <package>`
|
||||
*
|
||||
* The parameter must be a NUL-terminated string.
|
||||
*
|
||||
* Warning: this function modifies the buffer for optimization purposes.
|
||||
*/
|
||||
char *
|
||||
sc_adb_parse_installed_apk_path(char *str);
|
||||
sc_adb_parse_device_ip_from_output(char *str);
|
||||
|
||||
#endif
|
||||
|
@ -5,7 +5,7 @@
|
||||
#include "adb/adb_device.h"
|
||||
#include "adb/adb_parser.h"
|
||||
|
||||
static void test_adb_devices(void) {
|
||||
static void test_adb_devices() {
|
||||
char output[] =
|
||||
"List of devices attached\n"
|
||||
"0123456789abcdef device usb:2-1 product:MyProduct model:MyModel "
|
||||
@ -31,7 +31,7 @@ static void test_adb_devices(void) {
|
||||
sc_adb_devices_destroy(&vec);
|
||||
}
|
||||
|
||||
static void test_adb_devices_cr(void) {
|
||||
static void test_adb_devices_cr() {
|
||||
char output[] =
|
||||
"List of devices attached\r\n"
|
||||
"0123456789abcdef device usb:2-1 product:MyProduct model:MyModel "
|
||||
@ -57,7 +57,7 @@ static void test_adb_devices_cr(void) {
|
||||
sc_adb_devices_destroy(&vec);
|
||||
}
|
||||
|
||||
static void test_adb_devices_daemon_start(void) {
|
||||
static void test_adb_devices_daemon_start() {
|
||||
char output[] =
|
||||
"* daemon not running; starting now at tcp:5037\n"
|
||||
"* daemon started successfully\n"
|
||||
@ -78,7 +78,7 @@ static void test_adb_devices_daemon_start(void) {
|
||||
sc_adb_devices_destroy(&vec);
|
||||
}
|
||||
|
||||
static void test_adb_devices_daemon_start_mixed(void) {
|
||||
static void test_adb_devices_daemon_start_mixed() {
|
||||
char output[] =
|
||||
"List of devices attached\n"
|
||||
"adb server version (41) doesn't match this client (39); killing...\n"
|
||||
@ -105,7 +105,7 @@ static void test_adb_devices_daemon_start_mixed(void) {
|
||||
sc_adb_devices_destroy(&vec);
|
||||
}
|
||||
|
||||
static void test_adb_devices_without_eol(void) {
|
||||
static void test_adb_devices_without_eol() {
|
||||
char output[] =
|
||||
"List of devices attached\n"
|
||||
"0123456789abcdef device usb:2-1 product:MyProduct model:MyModel "
|
||||
@ -124,7 +124,7 @@ static void test_adb_devices_without_eol(void) {
|
||||
sc_adb_devices_destroy(&vec);
|
||||
}
|
||||
|
||||
static void test_adb_devices_without_header(void) {
|
||||
static void test_adb_devices_without_header() {
|
||||
char output[] =
|
||||
"0123456789abcdef device usb:2-1 product:MyProduct model:MyModel "
|
||||
"device:MyDevice transport_id:1\n";
|
||||
@ -134,7 +134,7 @@ static void test_adb_devices_without_header(void) {
|
||||
assert(!ok);
|
||||
}
|
||||
|
||||
static void test_adb_devices_corrupted(void) {
|
||||
static void test_adb_devices_corrupted() {
|
||||
char output[] =
|
||||
"List of devices attached\n"
|
||||
"corrupted_garbage\n";
|
||||
@ -145,7 +145,7 @@ static void test_adb_devices_corrupted(void) {
|
||||
assert(vec.size == 0);
|
||||
}
|
||||
|
||||
static void test_adb_devices_spaces(void) {
|
||||
static void test_adb_devices_spaces() {
|
||||
char output[] =
|
||||
"List of devices attached\n"
|
||||
"0123456789abcdef unauthorized usb:1-4 transport_id:3\n";
|
||||
@ -163,106 +163,84 @@ static void test_adb_devices_spaces(void) {
|
||||
sc_adb_devices_destroy(&vec);
|
||||
}
|
||||
|
||||
static void test_get_ip_single_line(void) {
|
||||
static void test_get_ip_single_line() {
|
||||
char ip_route[] = "192.168.1.0/24 dev wlan0 proto kernel scope link src "
|
||||
"192.168.12.34\r\r\n";
|
||||
|
||||
char *ip = sc_adb_parse_device_ip(ip_route);
|
||||
char *ip = sc_adb_parse_device_ip_from_output(ip_route);
|
||||
assert(ip);
|
||||
assert(!strcmp(ip, "192.168.12.34"));
|
||||
free(ip);
|
||||
}
|
||||
|
||||
static void test_get_ip_single_line_without_eol(void) {
|
||||
static void test_get_ip_single_line_without_eol() {
|
||||
char ip_route[] = "192.168.1.0/24 dev wlan0 proto kernel scope link src "
|
||||
"192.168.12.34";
|
||||
|
||||
char *ip = sc_adb_parse_device_ip(ip_route);
|
||||
char *ip = sc_adb_parse_device_ip_from_output(ip_route);
|
||||
assert(ip);
|
||||
assert(!strcmp(ip, "192.168.12.34"));
|
||||
free(ip);
|
||||
}
|
||||
|
||||
static void test_get_ip_single_line_with_trailing_space(void) {
|
||||
static void test_get_ip_single_line_with_trailing_space() {
|
||||
char ip_route[] = "192.168.1.0/24 dev wlan0 proto kernel scope link src "
|
||||
"192.168.12.34 \n";
|
||||
|
||||
char *ip = sc_adb_parse_device_ip(ip_route);
|
||||
char *ip = sc_adb_parse_device_ip_from_output(ip_route);
|
||||
assert(ip);
|
||||
assert(!strcmp(ip, "192.168.12.34"));
|
||||
free(ip);
|
||||
}
|
||||
|
||||
static void test_get_ip_multiline_first_ok(void) {
|
||||
static void test_get_ip_multiline_first_ok() {
|
||||
char ip_route[] = "192.168.1.0/24 dev wlan0 proto kernel scope link src "
|
||||
"192.168.1.2\r\n"
|
||||
"10.0.0.0/24 dev rmnet proto kernel scope link src "
|
||||
"10.0.0.2\r\n";
|
||||
|
||||
char *ip = sc_adb_parse_device_ip(ip_route);
|
||||
char *ip = sc_adb_parse_device_ip_from_output(ip_route);
|
||||
assert(ip);
|
||||
assert(!strcmp(ip, "192.168.1.2"));
|
||||
free(ip);
|
||||
}
|
||||
|
||||
static void test_get_ip_multiline_second_ok(void) {
|
||||
static void test_get_ip_multiline_second_ok() {
|
||||
char ip_route[] = "10.0.0.0/24 dev rmnet proto kernel scope link src "
|
||||
"10.0.0.3\r\n"
|
||||
"192.168.1.0/24 dev wlan0 proto kernel scope link src "
|
||||
"192.168.1.3\r\n";
|
||||
|
||||
char *ip = sc_adb_parse_device_ip(ip_route);
|
||||
char *ip = sc_adb_parse_device_ip_from_output(ip_route);
|
||||
assert(ip);
|
||||
assert(!strcmp(ip, "192.168.1.3"));
|
||||
free(ip);
|
||||
}
|
||||
|
||||
static void test_get_ip_no_wlan(void) {
|
||||
static void test_get_ip_no_wlan() {
|
||||
char ip_route[] = "192.168.1.0/24 dev rmnet proto kernel scope link src "
|
||||
"192.168.12.34\r\r\n";
|
||||
|
||||
char *ip = sc_adb_parse_device_ip(ip_route);
|
||||
char *ip = sc_adb_parse_device_ip_from_output(ip_route);
|
||||
assert(!ip);
|
||||
}
|
||||
|
||||
static void test_get_ip_no_wlan_without_eol(void) {
|
||||
static void test_get_ip_no_wlan_without_eol() {
|
||||
char ip_route[] = "192.168.1.0/24 dev rmnet proto kernel scope link src "
|
||||
"192.168.12.34";
|
||||
|
||||
char *ip = sc_adb_parse_device_ip(ip_route);
|
||||
char *ip = sc_adb_parse_device_ip_from_output(ip_route);
|
||||
assert(!ip);
|
||||
}
|
||||
|
||||
static void test_get_ip_truncated(void) {
|
||||
static void test_get_ip_truncated() {
|
||||
char ip_route[] = "192.168.1.0/24 dev rmnet proto kernel scope link src "
|
||||
"\n";
|
||||
|
||||
char *ip = sc_adb_parse_device_ip(ip_route);
|
||||
char *ip = sc_adb_parse_device_ip_from_output(ip_route);
|
||||
assert(!ip);
|
||||
}
|
||||
|
||||
static void test_apk_path(void) {
|
||||
char str[] = "package:/data/app/~~71mguyc6p-kNjQdNaNkToA==/com.genymobile."
|
||||
"scrcpy-l6fiqqUSU7Ok7QLg-rIyJA==/base.apk=com.genymobile."
|
||||
"scrcpy\n";
|
||||
|
||||
const char *expected = "/data/app/~~71mguyc6p-kNjQdNaNkToA==/com.genymobile"
|
||||
".scrcpy-l6fiqqUSU7Ok7QLg-rIyJA==/base.apk";
|
||||
char *path = sc_adb_parse_installed_apk_path(str);
|
||||
assert(!strcmp(path, expected));
|
||||
free(path);
|
||||
}
|
||||
|
||||
static void test_apk_path_invalid(void) {
|
||||
// Does not start with "package:"
|
||||
char str[] = "garbage:/data/app/~~71mguyc6p-kNjQdNaNkToA==/com.genymobile."
|
||||
"scrcpy-l6fiqqUSU7Ok7QLg-rIyJA==/base.apk=com.genymobile."
|
||||
"scrcpy\n";
|
||||
|
||||
char *path = sc_adb_parse_installed_apk_path(str);
|
||||
assert(!path);
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
(void) argc;
|
||||
(void) argv;
|
||||
@ -284,9 +262,4 @@ int main(int argc, char *argv[]) {
|
||||
test_get_ip_no_wlan();
|
||||
test_get_ip_no_wlan_without_eol();
|
||||
test_get_ip_truncated();
|
||||
|
||||
test_apk_path();
|
||||
test_apk_path_invalid();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user