From c41e295566135ef76c941e17be1c64e9fa33897a Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Mon, 27 Apr 2026 13:31:52 +0200 Subject: [PATCH 1/2] Cleanup related to basop issue 2023 --- lib_dec/lib_dec.c | 9 ++++----- lib_util/rotation_file_reader.c | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c index 0dadf858c..63f78a949 100644 --- a/lib_dec/lib_dec.c +++ b/lib_dec/lib_dec.c @@ -2760,14 +2760,13 @@ ivas_error IVAS_DEC_FeedHeadTrackData( } #ifdef FIX_BASOP_2023_TDREND_DISTATT_PRECISION - hHeadTrackData->Pos[subframe_idx].x = max( min( IVAS_LISTENER_POSITION_MAX, Pos.x ), -IVAS_LISTENER_POSITION_MAX ); - hHeadTrackData->Pos[subframe_idx].y = max( min( IVAS_LISTENER_POSITION_MAX, Pos.y ), -IVAS_LISTENER_POSITION_MAX ); - hHeadTrackData->Pos[subframe_idx].z = max( min( IVAS_LISTENER_POSITION_MAX, Pos.z ), -IVAS_LISTENER_POSITION_MAX ); -#else + Pos.x = max( min( IVAS_LISTENER_POSITION_MAX, Pos.x ), -IVAS_LISTENER_POSITION_MAX ); + Pos.y = max( min( IVAS_LISTENER_POSITION_MAX, Pos.y ), -IVAS_LISTENER_POSITION_MAX ); + Pos.z = max( min( IVAS_LISTENER_POSITION_MAX, Pos.z ), -IVAS_LISTENER_POSITION_MAX ); +#endif hHeadTrackData->Pos[subframe_idx].x = Pos.x; hHeadTrackData->Pos[subframe_idx].y = Pos.y; hHeadTrackData->Pos[subframe_idx].z = Pos.z; -#endif hHeadTrackData->sr_pose_pred_axis = rot_axis; hIvasDec->updateOrientation = true; diff --git a/lib_util/rotation_file_reader.c b/lib_util/rotation_file_reader.c index 24d0acaff..f2d59cc9f 100644 --- a/lib_util/rotation_file_reader.c +++ b/lib_util/rotation_file_reader.c @@ -136,9 +136,9 @@ ivas_error HeadRotationFileReading( if ( pPos != NULL ) { #ifdef FIX_BASOP_2023_TDREND_DISTATT_PRECISION - pPos->x = min( max( -IVAS_LISTENER_POSITION_MAX, posx ), IVAS_LISTENER_POSITION_MAX ); - pPos->y = min( max( -IVAS_LISTENER_POSITION_MAX, posy ), IVAS_LISTENER_POSITION_MAX ); - pPos->z = min( max( -IVAS_LISTENER_POSITION_MAX, posz ), IVAS_LISTENER_POSITION_MAX ); + pPos->x = max( min( IVAS_LISTENER_POSITION_MAX, pPos->x ), -IVAS_LISTENER_POSITION_MAX ); + pPos->y = max( min( IVAS_LISTENER_POSITION_MAX, pPos->y ), -IVAS_LISTENER_POSITION_MAX ); + pPos->z = max( min( IVAS_LISTENER_POSITION_MAX, pPos->z ), -IVAS_LISTENER_POSITION_MAX ); #else pPos->x = posx; pPos->y = posy; -- GitLab From 749a6587c94a3a74e742ae19e843a6f0b0044dfa Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Mon, 27 Apr 2026 16:42:07 +0200 Subject: [PATCH 2/2] Fix wrong input in range check --- lib_util/rotation_file_reader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib_util/rotation_file_reader.c b/lib_util/rotation_file_reader.c index f2d59cc9f..b3801c9c6 100644 --- a/lib_util/rotation_file_reader.c +++ b/lib_util/rotation_file_reader.c @@ -136,9 +136,9 @@ ivas_error HeadRotationFileReading( if ( pPos != NULL ) { #ifdef FIX_BASOP_2023_TDREND_DISTATT_PRECISION - pPos->x = max( min( IVAS_LISTENER_POSITION_MAX, pPos->x ), -IVAS_LISTENER_POSITION_MAX ); - pPos->y = max( min( IVAS_LISTENER_POSITION_MAX, pPos->y ), -IVAS_LISTENER_POSITION_MAX ); - pPos->z = max( min( IVAS_LISTENER_POSITION_MAX, pPos->z ), -IVAS_LISTENER_POSITION_MAX ); + pPos->x = max( min( IVAS_LISTENER_POSITION_MAX, posx ), -IVAS_LISTENER_POSITION_MAX ); + pPos->y = max( min( IVAS_LISTENER_POSITION_MAX, posy ), -IVAS_LISTENER_POSITION_MAX ); + pPos->z = max( min( IVAS_LISTENER_POSITION_MAX, posz ), -IVAS_LISTENER_POSITION_MAX ); #else pPos->x = posx; pPos->y = posy; -- GitLab