From f8369474c2fa4928b701ebbdd3ed3d17ad0b20a4 Mon Sep 17 00:00:00 2001 From: Beyley Cardellio Date: Mon, 30 Jun 2025 18:25:43 -0700 Subject: [PATCH] a/util: `stereo_sbs_to_slam_sbs` -> `stereo_sbs_split` Part-of: --- src/xrt/auxiliary/util/CMakeLists.txt | 2 +- src/xrt/auxiliary/util/u_sink.h | 10 +++++----- ...s_to_slam_sbs.c => u_sink_stereo_sbs_split.c} | 16 ++++++++-------- .../targets/common/target_builder_lighthouse.c | 6 +++--- 4 files changed, 17 insertions(+), 17 deletions(-) rename src/xrt/auxiliary/util/{u_sink_stereo_sbs_to_slam_sbs.c => u_sink_stereo_sbs_split.c} (75%) diff --git a/src/xrt/auxiliary/util/CMakeLists.txt b/src/xrt/auxiliary/util/CMakeLists.txt index 0d566c6a8..f915c7c0a 100644 --- a/src/xrt/auxiliary/util/CMakeLists.txt +++ b/src/xrt/auxiliary/util/CMakeLists.txt @@ -215,7 +215,7 @@ add_library( u_sink_simple_queue.c u_sink_quirk.c u_sink_split.c - u_sink_stereo_sbs_to_slam_sbs.c + u_sink_stereo_sbs_split.c ) target_link_libraries( aux_util_sink diff --git a/src/xrt/auxiliary/util/u_sink.h b/src/xrt/auxiliary/util/u_sink.h index 0dc869bec..668e4c18c 100644 --- a/src/xrt/auxiliary/util/u_sink.h +++ b/src/xrt/auxiliary/util/u_sink.h @@ -172,14 +172,14 @@ u_sink_split_create(struct xrt_frame_context *xfctx, * Splits Stereo SBS frames into two independent frames */ void -u_sink_stereo_sbs_to_slam_sbs_create(struct xrt_frame_context *xfctx, - struct xrt_frame_sink *downstream_left, - struct xrt_frame_sink *downstream_right, - struct xrt_frame_sink **out_xfs); +u_sink_stereo_sbs_split_create(struct xrt_frame_context *xfctx, + struct xrt_frame_sink *downstream_left, + struct xrt_frame_sink *downstream_right, + struct xrt_frame_sink **out_xfs); /*! * Combines stereo frames. - * Opposite of u_sink_stereo_sbs_to_slam_sbs_create + * Opposite of u_sink_stereo_sbs_split_create */ bool u_sink_combiner_create(struct xrt_frame_context *xfctx, diff --git a/src/xrt/auxiliary/util/u_sink_stereo_sbs_to_slam_sbs.c b/src/xrt/auxiliary/util/u_sink_stereo_sbs_split.c similarity index 75% rename from src/xrt/auxiliary/util/u_sink_stereo_sbs_to_slam_sbs.c rename to src/xrt/auxiliary/util/u_sink_stereo_sbs_split.c index c2c8d8d5e..fecb1a010 100644 --- a/src/xrt/auxiliary/util/u_sink_stereo_sbs_to_slam_sbs.c +++ b/src/xrt/auxiliary/util/u_sink_stereo_sbs_split.c @@ -20,7 +20,7 @@ * @implements xrt_frame_sink * @implements xrt_frame_node */ -struct u_sink_stereo_sbs_to_slam_sbs +struct u_sink_stereo_sbs_split { struct xrt_frame_sink base; struct xrt_frame_node node; @@ -34,7 +34,7 @@ split_frame(struct xrt_frame_sink *xfs, struct xrt_frame *xf) { SINK_TRACE_MARKER(); - struct u_sink_stereo_sbs_to_slam_sbs *s = (struct u_sink_stereo_sbs_to_slam_sbs *)xfs; + struct u_sink_stereo_sbs_split *s = (struct u_sink_stereo_sbs_split *)xfs; assert(xf->width % 2 == 0); @@ -73,7 +73,7 @@ split_break_apart(struct xrt_frame_node *node) static void split_destroy(struct xrt_frame_node *node) { - struct u_sink_stereo_sbs_to_slam_sbs *s = container_of(node, struct u_sink_stereo_sbs_to_slam_sbs, node); + struct u_sink_stereo_sbs_split *s = container_of(node, struct u_sink_stereo_sbs_split, node); free(s); } @@ -86,12 +86,12 @@ split_destroy(struct xrt_frame_node *node) */ void -u_sink_stereo_sbs_to_slam_sbs_create(struct xrt_frame_context *xfctx, - struct xrt_frame_sink *downstream_left, - struct xrt_frame_sink *downstream_right, - struct xrt_frame_sink **out_xfs) +u_sink_stereo_sbs_split_create(struct xrt_frame_context *xfctx, + struct xrt_frame_sink *downstream_left, + struct xrt_frame_sink *downstream_right, + struct xrt_frame_sink **out_xfs) { - struct u_sink_stereo_sbs_to_slam_sbs *s = U_TYPED_CALLOC(struct u_sink_stereo_sbs_to_slam_sbs); + struct u_sink_stereo_sbs_split *s = U_TYPED_CALLOC(struct u_sink_stereo_sbs_split); s->base.push_frame = split_frame; s->node.break_apart = split_break_apart; diff --git a/src/xrt/targets/common/target_builder_lighthouse.c b/src/xrt/targets/common/target_builder_lighthouse.c index 78fe52ab4..18dd92b9a 100644 --- a/src/xrt/targets/common/target_builder_lighthouse.c +++ b/src/xrt/targets/common/target_builder_lighthouse.c @@ -419,17 +419,17 @@ valve_index_setup_visual_trackers(struct lighthouse_system *lhs, if (slam_enabled && hand_enabled) { u_sink_split_create(xfctx, slam_sinks->cams[0], hand_sinks->cams[0], &entry_left_sink); u_sink_split_create(xfctx, slam_sinks->cams[1], hand_sinks->cams[1], &entry_right_sink); - u_sink_stereo_sbs_to_slam_sbs_create(xfctx, entry_left_sink, entry_right_sink, &entry_sbs_sink); + u_sink_stereo_sbs_split_create(xfctx, entry_left_sink, entry_right_sink, &entry_sbs_sink); u_sink_create_format_converter(xfctx, XRT_FORMAT_L8, entry_sbs_sink, &entry_sbs_sink); } else if (slam_enabled) { entry_left_sink = slam_sinks->cams[0]; entry_right_sink = slam_sinks->cams[1]; - u_sink_stereo_sbs_to_slam_sbs_create(xfctx, entry_left_sink, entry_right_sink, &entry_sbs_sink); + u_sink_stereo_sbs_split_create(xfctx, entry_left_sink, entry_right_sink, &entry_sbs_sink); u_sink_create_format_converter(xfctx, XRT_FORMAT_L8, entry_sbs_sink, &entry_sbs_sink); } else if (hand_enabled) { entry_left_sink = hand_sinks->cams[0]; entry_right_sink = hand_sinks->cams[1]; - u_sink_stereo_sbs_to_slam_sbs_create(xfctx, entry_left_sink, entry_right_sink, &entry_sbs_sink); + u_sink_stereo_sbs_split_create(xfctx, entry_left_sink, entry_right_sink, &entry_sbs_sink); u_sink_create_format_converter(xfctx, XRT_FORMAT_L8, entry_sbs_sink, &entry_sbs_sink); } else { LH_WARN("No visual trackers were set"); -- 2.51.2