From efa33dc3ba50a591ccf312ad841e981c52267e06 Mon Sep 17 00:00:00 2001
From: Dominik Weckbecker <dominik.weckbecker@iis.fraunhofer.de>
Date: Mon, 26 May 2025 11:35:28 +0200
Subject: [PATCH 1/2] fix compilation error with instrumented code

---
 lib_com/bitstream.c |  9 ++++++---
 lib_com/prot.h      | 11 ++++++-----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/lib_com/bitstream.c b/lib_com/bitstream.c
index 4a2e4da58..6b37cdae8 100644
--- a/lib_com/bitstream.c
+++ b/lib_com/bitstream.c
@@ -2865,9 +2865,11 @@ ivas_error push_indice(
  * Push a new indice into the buffer at the next position
  *-------------------------------------------------------------------*/
 
-ivas_error push_next_indice_(
 #ifdef DBG_BITSTREAM_ANALYSIS
+ivas_error push_next_indice_(
     const char *caller,
+#else
+ivas_error push_next_indice(
 #endif
     BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle                    */
     uint16_t value,        /* i  : value of the quantized indice               */
@@ -2930,10 +2932,11 @@ ivas_error push_next_indice_(
  * Push a bit buffer into the buffer at the next position
  *-------------------------------------------------------------------*/
 
-
-ivas_error push_next_bits_(
 #ifdef DBG_BITSTREAM_ANALYSIS
+ivas_error push_next_bits_(
     const char *caller,
+#else
+ivas_error push_next_bits(
 #endif
     BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle                     */
     const uint16_t bits[], /* i  : bit buffer to pack, sequence of single bits  */
diff --git a/lib_com/prot.h b/lib_com/prot.h
index 78f31c5a2..c3acc73e8 100644
--- a/lib_com/prot.h
+++ b/lib_com/prot.h
@@ -476,23 +476,24 @@ ivas_error push_indice(
 #ifdef DBG_BITSTREAM_ANALYSIS
 #define push_next_indice( ... ) push_next_indice_( __func__, __VA_ARGS__ )
 #define push_next_bits( ... )   push_next_bits_( __func__, __VA_ARGS__ );
-#else
-#define push_next_indice( ... ) push_next_indice_( __VA_ARGS__ )
-#define push_next_bits( ... )   push_next_bits_( __VA_ARGS__ );
 #endif
 
-ivas_error push_next_indice_(
 #ifdef DBG_BITSTREAM_ANALYSIS
+ivas_error push_next_indice_(
     const char *caller,
+#else
+ivas_error push_next_indice(
 #endif
     BSTR_ENC_HANDLE hBstr,
     uint16_t value, /* i  : value of the quantized indice          */
     int16_t nb_bits /* i  : number of bits used to quantize the indice */
 );
 
-ivas_error push_next_bits_(
 #ifdef DBG_BITSTREAM_ANALYSIS
+ivas_error push_next_bits_(
     const char *caller,
+#else
+ivas_error push_next_bits(
 #endif
     BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle               */
     const uint16_t bits[], /* i  : bit buffer to pack, sequence of single bits */
-- 
GitLab


From 4b37cfd3803a146ded34378e249c50fa6e857287 Mon Sep 17 00:00:00 2001
From: Dominik Weckbecker <dominik.weckbecker@iis.fraunhofer.de>
Date: Mon, 26 May 2025 11:57:03 +0200
Subject: [PATCH 2/2] enable instrumented build on ivas-float-update

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1447d9d13..9ec43210b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -669,7 +669,7 @@ build-codec-linux-instrumented-make:
   rules:
     - if: $CI_PIPELINE_SOURCE == 'web'
     - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" # only have MR pipelines for MRs to main
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
     - if: $CI_PIPELINE_SOURCE == 'schedule'
     - if: $CI_PIPELINE_SOURCE == 'push'
       when: never
-- 
GitLab