From 72f76c5bf491d7fe503a90f9cff1340581d611a8 Mon Sep 17 00:00:00 2001 From: Archit Tamarapu Date: Fri, 31 Oct 2025 13:01:54 +0100 Subject: [PATCH 1/2] [ci] reenable lc3plus-ensure-no-code-changes --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eef6803ede..0c5f72c334 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1060,7 +1060,7 @@ check-first-frame-is-sid: expose_as: "logs-sidstart" expire_in: "5 days" -.lc3plus-ensure-no-code-changes: +lc3plus-ensure-no-code-changes: extends: - .test-job-linux - .rules-merge-request-to-main @@ -2236,7 +2236,7 @@ sanitizer-test-osba-planar-hoa3-ism4: expire_in: 1 week coverage-merge: - extends: + extends: - .rules-main-scheduled - .test-job-linux-needs-testv-dir tags: -- GitLab From 1befb2289431526abff094b0797b8229e03ba1ea Mon Sep 17 00:00:00 2001 From: Archit Tamarapu Date: Fri, 31 Oct 2025 13:26:58 +0100 Subject: [PATCH 2/2] add patchfile for fixes needed in latest LC3plus release for WMC tool --- scripts/lc3plus_lib_setup/get_lc3plus.sh | 3 ++ scripts/lc3plus_lib_setup/lc3plus_float.patch | 49 +++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 scripts/lc3plus_lib_setup/lc3plus_float.patch diff --git a/scripts/lc3plus_lib_setup/get_lc3plus.sh b/scripts/lc3plus_lib_setup/get_lc3plus.sh index 1aa5dc7b3a..2077484cc9 100755 --- a/scripts/lc3plus_lib_setup/get_lc3plus.sh +++ b/scripts/lc3plus_lib_setup/get_lc3plus.sh @@ -59,3 +59,6 @@ printf ' DisableFormat: true SortIncludes: Never ' >lib_lc3plus/.clang-format + +# temporary until LC3plus release is updated +git apply scripts/lc3plus_lib_setup/lc3plus_float.patch diff --git a/scripts/lc3plus_lib_setup/lc3plus_float.patch b/scripts/lc3plus_lib_setup/lc3plus_float.patch new file mode 100644 index 0000000000..3d3a4beae6 --- /dev/null +++ b/scripts/lc3plus_lib_setup/lc3plus_float.patch @@ -0,0 +1,49 @@ +diff --git b/lib_lc3plus/lc3plus.c a/lib_lc3plus/lc3plus.c +index 7063c4e183..594683cd2c 100644 +--- b/lib_lc3plus/lc3plus.c ++++ a/lib_lc3plus/lc3plus.c +@@ -77,8 +77,10 @@ static int lc3plus_frame_size_supported(LC3PLUS_FrameDuration frame_dms) + case LC3PLUS_FRAME_DURATION_7p5MS: /* fallthru */ + case LC3PLUS_FRAME_DURATION_10MS: + return 1; +- default: return 0; ++ default: break; + } ++ ++ return 0; + } + + static int null_in_list(void **list, int n) +diff --git b/lib_lc3plus/ltpf_decoder.c a/lib_lc3plus/ltpf_decoder.c +index f6560d9710..48aa9a2d70 100644 +--- b/lib_lc3plus/ltpf_decoder.c ++++ a/lib_lc3plus/ltpf_decoder.c +@@ -14,21 +14,25 @@ + #ifdef CR9_C_ADD_1p25MS + static LC3_INT16 get_continuation (LC3_INT32 fading_case, LC3PLUS_FrameDuration frame_dms, LC3_INT32 pos, LC3_INT32 total) + { ++ LC3_INT16 retval; ++ + if ( frame_dms != LC3PLUS_FRAME_DURATION_1p25MS ) + { +- return 0; ++ retval = 0; + } + else + { + if ( pos == total ) + { +- return 0; ++ retval = 0; + } + else + { +- return fading_case; ++ retval = fading_case; + } + } ++ ++ return retval; + } + #endif + -- GitLab