forked/ustreamer
1
0
Fork 0
mirror of https://github.com/pikvm/ustreamer.git synced 2026-08-31 23:31:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

janus: more us_str_is_ok()

Browse Source
This commit is contained in:
Maxim Devaev
2026-07-17 19:06:22 +03:00
parent 6e554e5081
commit e1542dd617
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
janus/src/config.c
View File

@@ -57,12 +57,14 @@ us_config_s *us_config_init(const char *config_dir_path) {
} }
janus_config_print(jcfg); janus_config_print(jcfg);
if ((config->video_sink_name = _get_value(jcfg, "video", "sink")) == NULL) { config->video_sink_name = _get_value(jcfg, "video", "sink");
if (!us_str_is_ok(config->video_sink_name)) {
US_LOG_ERROR("Missing config value: video.sink"); US_LOG_ERROR("Missing config value: video.sink");
goto error; goto error;
} }
if ((config->acap_dev_name = _get_value(jcfg, "acap", "device")) != NULL) { config->acap_dev_name = _get_value(jcfg, "acap", "device");
if (us_str_is_ok(config->acap_dev_name)) {
config->acap_hz = _get_uint(jcfg, "acap", "sampling_rate", 0, 10); config->acap_hz = _get_uint(jcfg, "acap", "sampling_rate", 0, 10);
config->tc358743_dev_path = _get_value(jcfg, "acap", "tc358743"); config->tc358743_dev_path = _get_value(jcfg, "acap", "tc358743");
if (config->acap_hz == 0 && !us_str_is_ok(config->tc358743_dev_path)) { if (config->acap_hz == 0 && !us_str_is_ok(config->tc358743_dev_path)) {

16
janus/src/plugin.c
View File

@@ -206,7 +206,7 @@ static void *_acap_thread(void *arg) {
US_THREAD_SETTLE("us_p_acap"); US_THREAD_SETTLE("us_p_acap");
atomic_store(&_g_acap_tid_created, true); atomic_store(&_g_acap_tid_created, true);
US_A(_g_config->acap_dev_name != NULL); US_A(us_str_is_ok(_g_config->acap_dev_name));
US_A(_g_rtpa != NULL); US_A(_g_rtpa != NULL);
int once = 0; int once = 0;
@@ -281,7 +281,7 @@ static void *_aplay_thread(void *arg) {
US_THREAD_SETTLE("us_p_aplay"); US_THREAD_SETTLE("us_p_aplay");
atomic_store(&_g_aplay_tid_created, true); atomic_store(&_g_aplay_tid_created, true);
US_A(_g_config->aplay_dev_name != NULL); US_A(us_str_is_ok(_g_config->aplay_dev_name));
int once = 0; int once = 0;
@@ -394,6 +394,8 @@ static void *_vplay_thread(void *arg) {
US_THREAD_SETTLE("us_p_vplay"); US_THREAD_SETTLE("us_p_vplay");
atomic_store(&_g_vplay_tid_created, true); atomic_store(&_g_vplay_tid_created, true);
US_A(us_str_is_ok(_g_config->vplay_sink_name));
us_frame_s *frame = us_frame_init(); us_frame_s *frame = us_frame_init();
while (!_STOP) { while (!_STOP) {
@@ -537,17 +539,17 @@ static int _plugin_init(janus_callbacks *gw, const char *config_dir_path) {
US_RING_INIT_WITH_ITEMS(_g_video_ring, 64, us_frame_init); US_RING_INIT_WITH_ITEMS(_g_video_ring, 64, us_frame_init);
_g_rtpv = us_rtpv_init(_relay_rtp_clients); _g_rtpv = us_rtpv_init(_relay_rtp_clients);
if (_g_config->vplay_sink_name != NULL) { if (us_str_is_ok(_g_config->vplay_sink_name)) {
US_RING_INIT_WITH_ITEMS(_g_vplay_ring, 15, us_frame_init); US_RING_INIT_WITH_ITEMS(_g_vplay_ring, 15, us_frame_init);
US_THREAD_CREATE(_g_vplay_tid, _vplay_thread, NULL); US_THREAD_CREATE(_g_vplay_tid, _vplay_thread, NULL);
} }
if (_g_config->acap_dev_name != NULL) { if (us_str_is_ok(_g_config->acap_dev_name)) {
_g_rtpa = us_rtpa_init(_relay_rtp_clients); _g_rtpa = us_rtpa_init(_relay_rtp_clients);
US_THREAD_CREATE(_g_acap_tid, _acap_thread, NULL); US_THREAD_CREATE(_g_acap_tid, _acap_thread, NULL);
} }
if (_g_config->aplay_dev_name != NULL) { if (us_str_is_ok(_g_config->aplay_dev_name)) {
US_THREAD_CREATE(_g_aplay_tid, _aplay_thread, NULL); US_THREAD_CREATE(_g_aplay_tid, _aplay_thread, NULL);
} }
@@ -785,7 +787,7 @@ static struct janus_plugin_result *_plugin_handle_message(
} }
READ_BOOL(with_acap, "audio", us_au_probe(_g_config->acap_dev_name)); READ_BOOL(with_acap, "audio", us_au_probe(_g_config->acap_dev_name));
READ_BOOL(with_aplay, "mic", us_au_probe(_g_config->aplay_dev_name)); READ_BOOL(with_aplay, "mic", us_au_probe(_g_config->aplay_dev_name));
READ_BOOL(with_vplay, "camera", (_g_config->vplay_sink_name != NULL)); READ_BOOL(with_vplay, "camera", us_str_is_ok(_g_config->vplay_sink_name));
# undef READ_BOOL # undef READ_BOOL
{ {
json_t *const obj = json_object_get(params, "orientation"); json_t *const obj = json_object_get(params, "orientation");
@@ -856,7 +858,7 @@ static struct janus_plugin_result *_plugin_handle_message(
"audio", us_au_probe(_g_config->acap_dev_name), "audio", us_au_probe(_g_config->acap_dev_name),
"mic", us_au_probe(_g_config->aplay_dev_name), "mic", us_au_probe(_g_config->aplay_dev_name),
"camera", "camera",
"enabled", (_g_config->vplay_sink_name != NULL), "enabled", us_str_is_ok(_g_config->vplay_sink_name),
"request", camera_req, "request", camera_req,
"ice", "ice",
"url", (ice_url != NULL ? ice_url : _g_default_ice_url) "url", (ice_url != NULL ? ice_url : _g_default_ice_url)