From 17128f7b03119e606b37cee249890d35e2a7e9ac Mon Sep 17 00:00:00 2001
From: vaclav <vaclav.eksler@usherbrooke.ca>
Date: Thu, 6 Feb 2025 14:08:56 +0100
Subject: [PATCH 1/2] fix issue 1273: fix counter overflow in ISM metadata
 encoder; under NONBE_1273_ISM_METADATA_COUNTER

---
 lib_com/options.h               |  2 ++
 lib_enc/ivas_ism_metadata_enc.c | 12 +++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/lib_com/options.h b/lib_com/options.h
index efaddf4e6a..052a90e1a9 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -168,6 +168,8 @@
 /* any switch which is non-be wrt selection floating point code */
 /* all switches in this category should start with "NONBE_" */
 
+#define NONBE_1273_ISM_METADATA_COUNTER                 /* VA: issue 1273: fix counter overflow in ISM metadata encoder */
+
 
 /* ##################### End NON-BE switches ########################### */
 
diff --git a/lib_enc/ivas_ism_metadata_enc.c b/lib_enc/ivas_ism_metadata_enc.c
index c7b991e2f6..c81190eee7 100644
--- a/lib_enc/ivas_ism_metadata_enc.c
+++ b/lib_enc/ivas_ism_metadata_enc.c
@@ -276,7 +276,9 @@ ivas_error ivas_ism_metadata_enc(
                         }
                         else if ( hIsmMeta[ch]->ism_md_fec_cnt_enc == ISM_MD_FEC_CNT_MAX )
                         {
-
+#ifdef NONBE_1273_ISM_METADATA_COUNTER
+                            hIsmMeta[ch]->ism_md_fec_cnt_enc = 0;
+#endif
                             lowrate_metadata_flag[ch] = 1;
 
                             hIsmMeta[ch]->position_angle.angle1_diff_cnt = ISM_FEC_MAX;
@@ -555,7 +557,11 @@ ivas_error ivas_ism_metadata_enc(
 
                 if ( hIsmMeta[ch]->ism_metadata_flag == 0 )
                 {
+#ifdef NONBE_1273_ISM_METADATA_COUNTER
+                    hIsmMeta[ch]->ism_md_fec_cnt_enc = min( hIsmMeta[ch]->ism_md_fec_cnt_enc++, ISM_MD_FEC_CNT_MAX );
+#else
                     hIsmMeta[ch]->ism_md_fec_cnt_enc++;
+#endif
                 }
                 else
                 {
@@ -699,7 +705,11 @@ ivas_error ivas_ism_metadata_enc(
 
         if ( hIsmMeta[ch]->ism_metadata_flag == 0 )
         {
+#ifdef NONBE_1273_ISM_METADATA_COUNTER
+            hIsmMeta[ch]->ism_md_fec_cnt_enc = min( hIsmMeta[ch]->ism_md_fec_cnt_enc++, ISM_MD_FEC_CNT_MAX );
+#else
             hIsmMeta[ch]->ism_md_fec_cnt_enc++;
+#endif
         }
         else
         {
-- 
GitLab


From a04dd23b77c69cd14f15f1b6bdbf13e71c8698dd Mon Sep 17 00:00:00 2001
From: vaclav <vaclav.eksler@usherbrooke.ca>
Date: Thu, 6 Feb 2025 14:19:03 +0100
Subject: [PATCH 2/2] attempt to fix compiler warning

---
 lib_enc/ivas_ism_metadata_enc.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib_enc/ivas_ism_metadata_enc.c b/lib_enc/ivas_ism_metadata_enc.c
index c81190eee7..b27235ae4b 100644
--- a/lib_enc/ivas_ism_metadata_enc.c
+++ b/lib_enc/ivas_ism_metadata_enc.c
@@ -557,10 +557,9 @@ ivas_error ivas_ism_metadata_enc(
 
                 if ( hIsmMeta[ch]->ism_metadata_flag == 0 )
                 {
-#ifdef NONBE_1273_ISM_METADATA_COUNTER
-                    hIsmMeta[ch]->ism_md_fec_cnt_enc = min( hIsmMeta[ch]->ism_md_fec_cnt_enc++, ISM_MD_FEC_CNT_MAX );
-#else
                     hIsmMeta[ch]->ism_md_fec_cnt_enc++;
+#ifdef NONBE_1273_ISM_METADATA_COUNTER
+                    hIsmMeta[ch]->ism_md_fec_cnt_enc = min( hIsmMeta[ch]->ism_md_fec_cnt_enc, ISM_MD_FEC_CNT_MAX );
 #endif
                 }
                 else
@@ -705,10 +704,9 @@ ivas_error ivas_ism_metadata_enc(
 
         if ( hIsmMeta[ch]->ism_metadata_flag == 0 )
         {
-#ifdef NONBE_1273_ISM_METADATA_COUNTER
-            hIsmMeta[ch]->ism_md_fec_cnt_enc = min( hIsmMeta[ch]->ism_md_fec_cnt_enc++, ISM_MD_FEC_CNT_MAX );
-#else
             hIsmMeta[ch]->ism_md_fec_cnt_enc++;
+#ifdef NONBE_1273_ISM_METADATA_COUNTER
+            hIsmMeta[ch]->ism_md_fec_cnt_enc = min( hIsmMeta[ch]->ism_md_fec_cnt_enc, ISM_MD_FEC_CNT_MAX );
 #endif
         }
         else
-- 
GitLab