mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-29 11:06:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

st/prober: Add remote loading

Browse source
This commit is contained in:
Jakob Bornecrantz 2020-10-15 18:11:25 +01:00 committed by Jakob Bornecrantz
parent 27abc58d51
commit 9440a9dd93
3 changed files with 70 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/xrt/state_trackers/prober/p_json.c
View file

@ -177,6 +177,8 @@ parse_active(const char *str,
*out_active = P_ACTIVE_CONFIG_NONE;
} else if (strcmp(str, "tracking") == 0) {
*out_active = P_ACTIVE_CONFIG_TRACKING;
} else if (strcmp(str, "remote") == 0) {
*out_active = P_ACTIVE_CONFIG_REMOTE;
} else {
fprintf(stderr, "Unknown active config '%s' from %s.\n", str,
from);
@ -205,6 +207,35 @@ p_json_get_active(struct prober *p, enum p_active_config *out_active)
parse_active(tmp, "json", out_active);
}
bool
p_json_get_remote_port(struct prober *p, int *out_port)
{
cJSON *t = cJSON_GetObjectItemCaseSensitive(p->json.root, "remote");
if (t == NULL) {
fprintf(stderr, "No remote node\n");
return false;
}
int ver = -1;
if (!get_obj_int(t, "version", &ver)) {
fprintf(stderr, "Missing version tag!\n");
return false;
}
if (ver >= 1) {
fprintf(stderr, "Unknown version tag '%i'!\n", ver);
return false;
}
int port = 0;
if (!get_obj_int(t, "port", &port)) {
return false;
}
*out_port = port;
return true;
}
bool
p_json_get_tracking_settings(struct prober *p, struct xrt_settings_tracking *s)
{

30
src/xrt/state_trackers/prober/p_prober.c
View file

@ -7,6 +7,8 @@
* @ingroup st_prober
*/
#include "xrt/xrt_config_drivers.h"
#include "util/u_var.h"
#include "util/u_misc.h"
#include "util/u_json.h"
@ -18,6 +20,10 @@
#include "v4l2/v4l2_interface.h"
#endif
#ifdef XRT_BUILD_DRIVER_REMOTE
#include "remote/r_interface.h"
#endif
#include <stdio.h>
#include <string.h>
#include <assert.h>
@ -651,6 +657,27 @@ add_from_auto_probers(struct prober *p,
}
}
static void
add_from_remote(struct prober *p,
struct xrt_device **xdevs,
size_t num_xdevs,
bool *have_hmd)
{
if (num_xdevs < 3) {
return;
}
#ifdef XRT_BUILD_DRIVER_REMOTE
int port = 4242;
if (!p_json_get_remote_port(p, &port)) {
port = 4242;
}
r_create_devices(port, &xdevs[0], &xdevs[1], &xdevs[2]);
*have_hmd = xdevs[0] != NULL;
#endif
}
static int
select_device(struct xrt_prober *xp,
struct xrt_device **xdevs,
@ -668,6 +695,9 @@ select_device(struct xrt_prober *xp,
add_from_devices(p, xdevs, num_xdevs, &have_hmd);
add_from_auto_probers(p, xdevs, num_xdevs, &have_hmd);
break;
case P_ACTIVE_CONFIG_REMOTE:
add_from_remote(p, xdevs, num_xdevs, &have_hmd);
break;
default: assert(false);
}

9
src/xrt/state_trackers/prober/p_prober.h
View file

@ -67,6 +67,7 @@ enum p_active_config
{
P_ACTIVE_CONFIG_NONE = 0,
P_ACTIVE_CONFIG_TRACKING = 1,
P_ACTIVE_CONFIG_REMOTE = 2,
};
#ifdef XRT_OS_LINUX
@ -220,6 +221,14 @@ p_json_get_active(struct prober *p, enum p_active_config *out_active);
bool
p_json_get_tracking_settings(struct prober *p, struct xrt_settings_tracking *s);
/*!
* Extract remote settings from the JSON.
*
* @public @memberof prober
*/
bool
p_json_get_remote_port(struct prober *p, int *out_port);
/*!
* Dump the given device to stdout.
*