+1 -1

src/xrt/auxiliary/util/CMakeLists.txt

reviewed

··· 215 215 u_sink_simple_queue.c 216 216 u_sink_quirk.c 217 217 u_sink_split.c 218 218 - u_sink_stereo_sbs_to_slam_sbs.c 218 218 + u_sink_stereo_sbs_split.c 219 219 ) 220 220 target_link_libraries( 221 221 aux_util_sink

+5 -5

src/xrt/auxiliary/util/u_sink.h

reviewed

··· 172 172 * Splits Stereo SBS frames into two independent frames 173 173 */ 174 174 void 175 175 - u_sink_stereo_sbs_to_slam_sbs_create(struct xrt_frame_context *xfctx, 176 176 - struct xrt_frame_sink *downstream_left, 177 177 - struct xrt_frame_sink *downstream_right, 178 178 - struct xrt_frame_sink **out_xfs); 175 175 + u_sink_stereo_sbs_split_create(struct xrt_frame_context *xfctx, 176 176 + struct xrt_frame_sink *downstream_left, 177 177 + struct xrt_frame_sink *downstream_right, 178 178 + struct xrt_frame_sink **out_xfs); 179 179 180 180 /*! 181 181 * Combines stereo frames. 182 182 - * Opposite of u_sink_stereo_sbs_to_slam_sbs_create 182 182 + * Opposite of u_sink_stereo_sbs_split_create 183 183 */ 184 184 bool 185 185 u_sink_combiner_create(struct xrt_frame_context *xfctx,

+8 -8

src/xrt/auxiliary/util/u_sink_stereo_sbs_to_slam_sbs.c src/xrt/auxiliary/util/u_sink_stereo_sbs_split.c

reviewed

··· 20 20 * @implements xrt_frame_sink 21 21 * @implements xrt_frame_node 22 22 */ 23 23 - struct u_sink_stereo_sbs_to_slam_sbs 23 23 + struct u_sink_stereo_sbs_split 24 24 { 25 25 struct xrt_frame_sink base; 26 26 struct xrt_frame_node node; ··· 34 34 { 35 35 SINK_TRACE_MARKER(); 36 36 37 37 - struct u_sink_stereo_sbs_to_slam_sbs *s = (struct u_sink_stereo_sbs_to_slam_sbs *)xfs; 37 37 + struct u_sink_stereo_sbs_split *s = (struct u_sink_stereo_sbs_split *)xfs; 38 38 39 39 assert(xf->width % 2 == 0); 40 40 ··· 73 73 static void 74 74 split_destroy(struct xrt_frame_node *node) 75 75 { 76 76 - struct u_sink_stereo_sbs_to_slam_sbs *s = container_of(node, struct u_sink_stereo_sbs_to_slam_sbs, node); 76 76 + struct u_sink_stereo_sbs_split *s = container_of(node, struct u_sink_stereo_sbs_split, node); 77 77 78 78 free(s); 79 79 } ··· 86 86 */ 87 87 88 88 void 89 89 - u_sink_stereo_sbs_to_slam_sbs_create(struct xrt_frame_context *xfctx, 90 90 - struct xrt_frame_sink *downstream_left, 91 91 - struct xrt_frame_sink *downstream_right, 92 92 - struct xrt_frame_sink **out_xfs) 89 89 + u_sink_stereo_sbs_split_create(struct xrt_frame_context *xfctx, 90 90 + struct xrt_frame_sink *downstream_left, 91 91 + struct xrt_frame_sink *downstream_right, 92 92 + struct xrt_frame_sink **out_xfs) 93 93 { 94 94 - struct u_sink_stereo_sbs_to_slam_sbs *s = U_TYPED_CALLOC(struct u_sink_stereo_sbs_to_slam_sbs); 94 94 + struct u_sink_stereo_sbs_split *s = U_TYPED_CALLOC(struct u_sink_stereo_sbs_split); 95 95 96 96 s->base.push_frame = split_frame; 97 97 s->node.break_apart = split_break_apart;

+3 -3

src/xrt/targets/common/target_builder_lighthouse.c

reviewed

··· 419 419 if (slam_enabled && hand_enabled) { 420 420 u_sink_split_create(xfctx, slam_sinks->cams[0], hand_sinks->cams[0], &entry_left_sink); 421 421 u_sink_split_create(xfctx, slam_sinks->cams[1], hand_sinks->cams[1], &entry_right_sink); 422 422 - u_sink_stereo_sbs_to_slam_sbs_create(xfctx, entry_left_sink, entry_right_sink, &entry_sbs_sink); 422 422 + u_sink_stereo_sbs_split_create(xfctx, entry_left_sink, entry_right_sink, &entry_sbs_sink); 423 423 u_sink_create_format_converter(xfctx, XRT_FORMAT_L8, entry_sbs_sink, &entry_sbs_sink); 424 424 } else if (slam_enabled) { 425 425 entry_left_sink = slam_sinks->cams[0]; 426 426 entry_right_sink = slam_sinks->cams[1]; 427 427 - u_sink_stereo_sbs_to_slam_sbs_create(xfctx, entry_left_sink, entry_right_sink, &entry_sbs_sink); 427 427 + u_sink_stereo_sbs_split_create(xfctx, entry_left_sink, entry_right_sink, &entry_sbs_sink); 428 428 u_sink_create_format_converter(xfctx, XRT_FORMAT_L8, entry_sbs_sink, &entry_sbs_sink); 429 429 } else if (hand_enabled) { 430 430 entry_left_sink = hand_sinks->cams[0]; 431 431 entry_right_sink = hand_sinks->cams[1]; 432 432 - u_sink_stereo_sbs_to_slam_sbs_create(xfctx, entry_left_sink, entry_right_sink, &entry_sbs_sink); 432 432 + u_sink_stereo_sbs_split_create(xfctx, entry_left_sink, entry_right_sink, &entry_sbs_sink); 433 433 u_sink_create_format_converter(xfctx, XRT_FORMAT_L8, entry_sbs_sink, &entry_sbs_sink); 434 434 } else { 435 435 LH_WARN("No visual trackers were set");