Commit 3476a698 authored by malenov's avatar malenov
Browse files

cleanup NONBE_1273_ISM_METADATA_COUNTER

parent 7b25ad71

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -173,7 +173,6 @@ 


#define NONBE_FIX_1087_OOB_SBA_DTX_RS                   /* VA: issue 1087: Extend the length of the buffer for MCT decoding to avoid out-of-bound writing in SBA SID bitrate switching decoding */

#define FIX_920_IGF_INIT_ERROR                          /* FhG: issue 920: fix bitrate mismatch in initial IGF config to avoid error message in same cases */

#define NONBE_1273_ISM_METADATA_COUNTER                 /* VA: FLP issue 1273: fix counter overflow in ISM metadata encoder */

#define NONBE_FIX_GSC_BSTR                              /* VA: issue 1264 FLP (1189 BASOP): Fix bitstream synchronization between encoder and decoder in ACELP GSC in OMASA */

#define NONBE_FIX_1277_EVS_DTX_HIGH_RATE_THRESHOLD      /* VA/Eri: FLP issue 1277: Fix Mismatch in DTX high-rate threshold between EVS float and BASOP */

#define NONBE_FIX_708_OSBA_BR_SWITCHING_CRASH           /* FhG: issue 708: fix crash in OSBA BR switching with long test vectors */

lib_enc/ivas_ism_metadata_enc.c

+0 −6
Original line number Diff line number Diff line
@@ -277,9 +277,7 @@ 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;
@@ -569,9 +567,7 @@ ivas_error ivas_ism_metadata_enc( 
                if ( hIsmMeta[ch]->ism_metadata_flag == 0 )

                {

                    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

                {
@@ -716,9 +712,7 @@ ivas_error ivas_ism_metadata_enc( 
        if ( hIsmMeta[ch]->ism_metadata_flag == 0 )

        {

            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

        {