From c8552ccaf3471934970eecbff3595c3821b94872 Mon Sep 17 00:00:00 2001 From: advasila Date: Fri, 20 Oct 2023 08:36:26 +0300 Subject: [PATCH 01/10] fix 874 --- lib_com/ivas_prot.h | 4 ++++ lib_com/options.h | 2 +- lib_dec/ivas_jbm_dec.c | 6 ++++++ lib_enc/ivas_cpe_enc.c | 12 ++++++++++++ lib_enc/ivas_omasa_enc.c | 6 ++++++ lib_enc/ivas_stereo_classifier.c | 8 ++++++++ 6 files changed, 37 insertions(+), 1 deletion(-) diff --git a/lib_com/ivas_prot.h b/lib_com/ivas_prot.h index 1cbac362b6..9e9cf2e338 100755 --- a/lib_com/ivas_prot.h +++ b/lib_com/ivas_prot.h @@ -1927,6 +1927,10 @@ int16_t select_stereo_mode( CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */ const IVAS_FORMAT ivas_format, /* i : IVAS format */ const int32_t ivas_total_brate /* i : IVAS total brate */ +#if 1 + , + const int32_t cpe_brate /* i : bitrate for CPE in combined format */ +#endif ); void stereo_classifier_init( diff --git a/lib_com/options.h b/lib_com/options.h index c5d1fd35b6..2a5e0e01f2 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -167,7 +167,7 @@ #define NONBE_FIX_861_MASA_CRASH_STEREO_SWITCHING /* VA: issue 861: fix MASA 2TC crash when switching from MDCT stereo to TD/DFT stereo */ #define BE_FIX_867_PARAMC_RECONFIG /* FhG: issue #867: fix ParamMC CLDFB buffer dealloc when reconfiguring */ #define NONBE_FIX_850_MASA_HBR_META_RATIO_DECODING /* Nokia: issue #850: Fixes rare non-valid diffuseness and energy ratio values in 2dir MASA. */ - +#define NONBE_FIX_874_OMASA_BRSW_2TD /* Nokia: issue 874: Fixes the crashes with the long test vectors that prompted switching to TD*/ /* ##################### End NON-BE switches ########################### */ diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c index 3e91dce044..8a1298b779 100644 --- a/lib_dec/ivas_jbm_dec.c +++ b/lib_dec/ivas_jbm_dec.c @@ -200,6 +200,12 @@ ivas_error ivas_jbm_dec_tc( { set_s( nb_bits_metadata, 0, MAX_SCE ); +#ifdef NONBE_FIX_874_OMASA_BRSW_2TD + if ( st_ivas->nCPE > 0 ) + { + st_ivas->hCPE[0]->brate_surplus = 0; + } +#endif /* read parameters from the bitstream */ if ( st_ivas->ivas_format == MASA_FORMAT && st_ivas->hQMetaData != NULL ) { diff --git a/lib_enc/ivas_cpe_enc.c b/lib_enc/ivas_cpe_enc.c index 38508a70f0..4fd854775b 100644 --- a/lib_enc/ivas_cpe_enc.c +++ b/lib_enc/ivas_cpe_enc.c @@ -176,7 +176,19 @@ ivas_error ivas_cpe_enc( if ( sts[0]->ini_frame > 0 && st_ivas->hMCT == NULL ) { +#ifdef NONBE_FIX_874_OMASA_BRSW_2TD + if ( ivas_format == MASA_ISM_FORMAT ) + { + cpe_brate = calculate_cpe_brate_MASA_ISM( st_ivas->ism_mode, ivas_total_brate, st_ivas->hEncoderConfig->nchan_ism ); + } + else + { + cpe_brate = ivas_total_brate; + } + hCPE->element_mode = select_stereo_mode( hCPE, ivas_format, ivas_total_brate, cpe_brate ); +#else hCPE->element_mode = select_stereo_mode( hCPE, ivas_format, ivas_total_brate ); +#endif } stereo_mode_combined_format_enc( st_ivas, hCPE ); diff --git a/lib_enc/ivas_omasa_enc.c b/lib_enc/ivas_omasa_enc.c index 8f0cf13487..9fe430c95c 100644 --- a/lib_enc/ivas_omasa_enc.c +++ b/lib_enc/ivas_omasa_enc.c @@ -291,6 +291,12 @@ ivas_error ivas_omasa_enc_config( else { hEncoderConfig->element_mode_init = IVAS_CPE_DFT; +#ifdef NONBE_FIX_874_OMASA_BRSW_2TD + if ( ivas_total_brate - ism_total_brate < MASA_STEREO_MIN_BITRATE ) + { + st_ivas->hCPE[0]->element_mode = IVAS_CPE_DFT; + } +#endif } } diff --git a/lib_enc/ivas_stereo_classifier.c b/lib_enc/ivas_stereo_classifier.c index 1edace43ba..bdceb92679 100644 --- a/lib_enc/ivas_stereo_classifier.c +++ b/lib_enc/ivas_stereo_classifier.c @@ -90,6 +90,10 @@ int16_t select_stereo_mode( CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */ const IVAS_FORMAT ivas_format, /* i : IVAS format */ const int32_t ivas_total_brate /* i : IVAS total brate */ +#ifdef NONBE_FIX_874_OMASA_BRSW_2TD + , + const int32_t cpe_brate /* i : bitrate for CPE in combined format */ +#endif ) { int16_t element_mode; @@ -113,7 +117,11 @@ int16_t select_stereo_mode( stereo_switching_flag = 1; #ifdef NONBE_FIX_861_MASA_CRASH_STEREO_SWITCHING +#ifdef NONBE_FIX_874_OMASA_BRSW_2TD + if ( hCPE->element_brate >= MIN_BRATE_MDCT_STEREO || ( ( ivas_format == MASA_FORMAT || ivas_format == MASA_ISM_FORMAT ) && cpe_brate < MASA_STEREO_MIN_BITRATE ) +#else if ( hCPE->element_brate >= MIN_BRATE_MDCT_STEREO || ( ( ivas_format == MASA_FORMAT || ivas_format == MASA_ISM_FORMAT ) && ivas_total_brate < MASA_STEREO_MIN_BITRATE ) +#endif #else if ( hCPE->element_brate >= MIN_BRATE_MDCT_STEREO || ( ivas_format >= MASA_FORMAT && ivas_total_brate < MASA_STEREO_MIN_BITRATE ) #endif -- GitLab From e956654319906052947d8ae95a24e5c6e21bc901 Mon Sep 17 00:00:00 2001 From: advasila Date: Fri, 20 Oct 2023 13:38:31 +0300 Subject: [PATCH 02/10] update for fix 874 --- lib_com/ivas_prot.h | 4 ---- lib_dec/ivas_jbm_dec.c | 10 ++++------ lib_enc/ivas_cpe_enc.c | 12 ------------ lib_enc/ivas_omasa_enc.c | 6 ------ lib_enc/ivas_stereo_classifier.c | 13 ++++++++----- 5 files changed, 12 insertions(+), 33 deletions(-) diff --git a/lib_com/ivas_prot.h b/lib_com/ivas_prot.h index 9e9cf2e338..1cbac362b6 100755 --- a/lib_com/ivas_prot.h +++ b/lib_com/ivas_prot.h @@ -1927,10 +1927,6 @@ int16_t select_stereo_mode( CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */ const IVAS_FORMAT ivas_format, /* i : IVAS format */ const int32_t ivas_total_brate /* i : IVAS total brate */ -#if 1 - , - const int32_t cpe_brate /* i : bitrate for CPE in combined format */ -#endif ); void stereo_classifier_init( diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c index 8a1298b779..12e97fc639 100644 --- a/lib_dec/ivas_jbm_dec.c +++ b/lib_dec/ivas_jbm_dec.c @@ -200,12 +200,7 @@ ivas_error ivas_jbm_dec_tc( { set_s( nb_bits_metadata, 0, MAX_SCE ); -#ifdef NONBE_FIX_874_OMASA_BRSW_2TD - if ( st_ivas->nCPE > 0 ) - { - st_ivas->hCPE[0]->brate_surplus = 0; - } -#endif + /* read parameters from the bitstream */ if ( st_ivas->ivas_format == MASA_FORMAT && st_ivas->hQMetaData != NULL ) { @@ -231,6 +226,9 @@ ivas_error ivas_jbm_dec_tc( if ( st_ivas->nchan_transport == CPE_CHANNELS && st_ivas->nCPE >= 1 ) { +#ifdef NONBE_FIX_874_OMASA_BRSW_2TD + st_ivas->hCPE[0]->brate_surplus = 0; +#endif st_ivas->hCPE[0]->element_brate = ivas_total_brate; } diff --git a/lib_enc/ivas_cpe_enc.c b/lib_enc/ivas_cpe_enc.c index 4fd854775b..38508a70f0 100644 --- a/lib_enc/ivas_cpe_enc.c +++ b/lib_enc/ivas_cpe_enc.c @@ -176,19 +176,7 @@ ivas_error ivas_cpe_enc( if ( sts[0]->ini_frame > 0 && st_ivas->hMCT == NULL ) { -#ifdef NONBE_FIX_874_OMASA_BRSW_2TD - if ( ivas_format == MASA_ISM_FORMAT ) - { - cpe_brate = calculate_cpe_brate_MASA_ISM( st_ivas->ism_mode, ivas_total_brate, st_ivas->hEncoderConfig->nchan_ism ); - } - else - { - cpe_brate = ivas_total_brate; - } - hCPE->element_mode = select_stereo_mode( hCPE, ivas_format, ivas_total_brate, cpe_brate ); -#else hCPE->element_mode = select_stereo_mode( hCPE, ivas_format, ivas_total_brate ); -#endif } stereo_mode_combined_format_enc( st_ivas, hCPE ); diff --git a/lib_enc/ivas_omasa_enc.c b/lib_enc/ivas_omasa_enc.c index 9fe430c95c..8f0cf13487 100644 --- a/lib_enc/ivas_omasa_enc.c +++ b/lib_enc/ivas_omasa_enc.c @@ -291,12 +291,6 @@ ivas_error ivas_omasa_enc_config( else { hEncoderConfig->element_mode_init = IVAS_CPE_DFT; -#ifdef NONBE_FIX_874_OMASA_BRSW_2TD - if ( ivas_total_brate - ism_total_brate < MASA_STEREO_MIN_BITRATE ) - { - st_ivas->hCPE[0]->element_mode = IVAS_CPE_DFT; - } -#endif } } diff --git a/lib_enc/ivas_stereo_classifier.c b/lib_enc/ivas_stereo_classifier.c index bdceb92679..d85e32b4ad 100644 --- a/lib_enc/ivas_stereo_classifier.c +++ b/lib_enc/ivas_stereo_classifier.c @@ -90,10 +90,6 @@ int16_t select_stereo_mode( CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */ const IVAS_FORMAT ivas_format, /* i : IVAS format */ const int32_t ivas_total_brate /* i : IVAS total brate */ -#ifdef NONBE_FIX_874_OMASA_BRSW_2TD - , - const int32_t cpe_brate /* i : bitrate for CPE in combined format */ -#endif ) { int16_t element_mode; @@ -118,7 +114,7 @@ int16_t select_stereo_mode( #ifdef NONBE_FIX_861_MASA_CRASH_STEREO_SWITCHING #ifdef NONBE_FIX_874_OMASA_BRSW_2TD - if ( hCPE->element_brate >= MIN_BRATE_MDCT_STEREO || ( ( ivas_format == MASA_FORMAT || ivas_format == MASA_ISM_FORMAT ) && cpe_brate < MASA_STEREO_MIN_BITRATE ) + if ( hCPE->element_brate >= MIN_BRATE_MDCT_STEREO || ( ( ivas_format == MASA_FORMAT || ivas_format == MASA_ISM_FORMAT ) && hCPE->element_brate < MASA_STEREO_MIN_BITRATE ) #else if ( hCPE->element_brate >= MIN_BRATE_MDCT_STEREO || ( ( ivas_format == MASA_FORMAT || ivas_format == MASA_ISM_FORMAT ) && ivas_total_brate < MASA_STEREO_MIN_BITRATE ) #endif @@ -130,6 +126,7 @@ int16_t select_stereo_mode( #endif ) { + stereo_switching_flag = 0; } @@ -170,6 +167,12 @@ int16_t select_stereo_mode( { element_mode = hCPE->stereo_mode_cmdl; } +#endif +#ifdef NONBE_FIX_874_OMASA_BRSW_2TD + if ( ( ivas_format == MASA_FORMAT || ivas_format == MASA_ISM_FORMAT ) && cpe_brate < MASA_STEREO_MIN_BITRATE ) + { + hCPE->element_mode = IVAS_CPE_DFT; + } #endif } else if ( element_mode == IVAS_CPE_TD ) -- GitLab From 387ff733b522f3dd1ce3a766064b4be87226e0b0 Mon Sep 17 00:00:00 2001 From: advasila Date: Fri, 20 Oct 2023 13:50:54 +0300 Subject: [PATCH 03/10] adding missing change for 874 --- lib_enc/ivas_stereo_classifier.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_enc/ivas_stereo_classifier.c b/lib_enc/ivas_stereo_classifier.c index d85e32b4ad..723fb1d99b 100644 --- a/lib_enc/ivas_stereo_classifier.c +++ b/lib_enc/ivas_stereo_classifier.c @@ -169,7 +169,7 @@ int16_t select_stereo_mode( } #endif #ifdef NONBE_FIX_874_OMASA_BRSW_2TD - if ( ( ivas_format == MASA_FORMAT || ivas_format == MASA_ISM_FORMAT ) && cpe_brate < MASA_STEREO_MIN_BITRATE ) + if ( ( ivas_format == MASA_FORMAT || ivas_format == MASA_ISM_FORMAT ) && hCPE->element_brate < MASA_STEREO_MIN_BITRATE ) { hCPE->element_mode = IVAS_CPE_DFT; } -- GitLab From 546ab869523e50f53e5c0b03aa11709f0fe33343 Mon Sep 17 00:00:00 2001 From: advasila Date: Fri, 20 Oct 2023 15:03:23 +0300 Subject: [PATCH 04/10] change of fix position is stereo classifier for 874 --- lib_enc/ivas_stereo_classifier.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib_enc/ivas_stereo_classifier.c b/lib_enc/ivas_stereo_classifier.c index 9d0e938613..23b8e67c2f 100644 --- a/lib_enc/ivas_stereo_classifier.c +++ b/lib_enc/ivas_stereo_classifier.c @@ -165,17 +165,17 @@ int16_t select_stereo_mode( { if ( stereo_switching_flag == 0 ) { -#ifdef DEBUGGING - if ( hCPE->stereo_mode_cmdl > 1 ) - { - element_mode = hCPE->stereo_mode_cmdl; - } -#endif #ifdef NONBE_FIX_874_OMASA_BRSW_2TD if ( ( ivas_format == MASA_FORMAT || ivas_format == MASA_ISM_FORMAT ) && hCPE->element_brate < MASA_STEREO_MIN_BITRATE ) { hCPE->element_mode = IVAS_CPE_DFT; } +#endif +#ifdef DEBUGGING + if ( hCPE->stereo_mode_cmdl > 1 ) + { + element_mode = hCPE->stereo_mode_cmdl; + } #endif } else if ( element_mode == IVAS_CPE_TD ) -- GitLab From 3268acbfec7ef7836e523f2232afe34231a8b49c Mon Sep 17 00:00:00 2001 From: Tommy Vaillancourt Date: Fri, 20 Oct 2023 10:14:17 -0400 Subject: [PATCH 05/10] complement fix NONBE_FIX_874_OMASA_BRSW_2TD --- lib_com/ivas_stereo_td_bit_alloc.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/lib_com/ivas_stereo_td_bit_alloc.c b/lib_com/ivas_stereo_td_bit_alloc.c index 87d3f7dd3e..9c4cc3ad20 100644 --- a/lib_com/ivas_stereo_td_bit_alloc.c +++ b/lib_com/ivas_stereo_td_bit_alloc.c @@ -307,7 +307,7 @@ void tdm_bit_alloc( else { *total_brate_sec = min( *total_brate_sec, element_brate_wo_meta - ( 5900 + BWE_brate ) ); - +#ifndef NONBE_FIX_874_OMASA_BRSW_2TD if ( coder_type == INACTIVE ) { *total_brate_sec = max( *total_brate_sec, tdm_bit_allc_tbl[0][0] ); /* sanity check to ensure the secondary channel always gets the minimal bitrate it needs */ @@ -316,8 +316,18 @@ void tdm_bit_alloc( { *total_brate_sec = max( *total_brate_sec, 3500 ); /* sanity check to ensure the secondary channel always gets the minimal bitrate it needs */ } +#endif } - +#ifdef NONBE_FIX_874_OMASA_BRSW_2TD + if ( coder_type == INACTIVE ) + { + *total_brate_sec = max( *total_brate_sec, tdm_bit_allc_tbl[0][0] ); /* sanity check to ensure the secondary channel always gets the minimal bitrate it needs */ + } + else + { + *total_brate_sec = max( *total_brate_sec, 3500 ); /* sanity check to ensure the secondary channel always gets the minimal bitrate it needs */ + } +#endif /* Secondary channel bitrate adjusment */ /* First, adjust the bitrate depending of what is transmitted */ /* Second, choose the number of subframe for ACELP core depending of the targetted bitratre */ -- GitLab From 4f9ad3f3eb4ea117e899d3e434d18ab6fe16f38f Mon Sep 17 00:00:00 2001 From: vaclav Date: Fri, 20 Oct 2023 16:42:56 +0200 Subject: [PATCH 06/10] fix compilation warning --- lib_com/ivas_prot.h | 6 ++++-- lib_enc/ivas_cpe_enc.c | 4 ++++ lib_enc/ivas_stereo_classifier.c | 8 +++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/lib_com/ivas_prot.h b/lib_com/ivas_prot.h index 1cbac362b6..866dd2922a 100755 --- a/lib_com/ivas_prot.h +++ b/lib_com/ivas_prot.h @@ -1925,8 +1925,10 @@ void stereo_icBWE_decproc( /*! r: element mode */ int16_t select_stereo_mode( CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */ - const IVAS_FORMAT ivas_format, /* i : IVAS format */ - const int32_t ivas_total_brate /* i : IVAS total brate */ + const IVAS_FORMAT ivas_format /* i : IVAS format */ +#ifndef NONBE_FIX_874_OMASA_BRSW_2TD + ,const int32_t ivas_total_brate /* i : IVAS total brate */ + #endif ); void stereo_classifier_init( diff --git a/lib_enc/ivas_cpe_enc.c b/lib_enc/ivas_cpe_enc.c index 38508a70f0..fc81004269 100644 --- a/lib_enc/ivas_cpe_enc.c +++ b/lib_enc/ivas_cpe_enc.c @@ -176,7 +176,11 @@ ivas_error ivas_cpe_enc( if ( sts[0]->ini_frame > 0 && st_ivas->hMCT == NULL ) { +#ifdef NONBE_FIX_874_OMASA_BRSW_2TD + hCPE->element_mode = select_stereo_mode( hCPE, ivas_format ); +#else hCPE->element_mode = select_stereo_mode( hCPE, ivas_format, ivas_total_brate ); +#endif } stereo_mode_combined_format_enc( st_ivas, hCPE ); diff --git a/lib_enc/ivas_stereo_classifier.c b/lib_enc/ivas_stereo_classifier.c index 23b8e67c2f..e5b3787b34 100644 --- a/lib_enc/ivas_stereo_classifier.c +++ b/lib_enc/ivas_stereo_classifier.c @@ -87,9 +87,11 @@ static float redge_detect( const float *inp, const int16_t len, const float inp_ /*! r: element mode */ int16_t select_stereo_mode( - CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */ - const IVAS_FORMAT ivas_format, /* i : IVAS format */ + CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */ + const IVAS_FORMAT ivas_format /* i : IVAS format */ +#ifndef NONBE_FIX_874_OMASA_BRSW_2TD const int32_t ivas_total_brate /* i : IVAS total brate */ +#endif ) { int16_t element_mode; @@ -129,6 +131,7 @@ int16_t select_stereo_mode( stereo_switching_flag = 0; } + #ifdef FIX_863_REMOVE_REDUNDANCIES_OMASA if ( hCPE->element_brate >= MIN_BRATE_MDCT_STEREO ) #else @@ -144,7 +147,6 @@ int16_t select_stereo_mode( hStereoClassif->lrtd_mode = 0; element_mode = IVAS_CPE_DFT; - #ifdef NONBE_FIX_861_MASA_CRASH_STEREO_SWITCHING if ( stereo_switching_flag == 1 && hCPE->element_brate > IVAS_13k2 && hCPE->hCoreCoder[0]->hSpMusClas->past_dlp[0] < 1.0f && hCPE->hCoreCoder[0]->hSpMusClas->wdlp_xtalk < -0.01f && hCPE->hCoreCoder[0]->vad_flag == 1 && ( hCPE->hStereoMdct->sw_uncorr || hStereoClassif->xtalk_decision ) ) #else -- GitLab From 0fffdd5e8d17f76ab807b0fa1a97a42dbe58513f Mon Sep 17 00:00:00 2001 From: vaclav Date: Fri, 20 Oct 2023 16:44:16 +0200 Subject: [PATCH 07/10] formatting --- lib_com/ivas_stereo_td_bit_alloc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib_com/ivas_stereo_td_bit_alloc.c b/lib_com/ivas_stereo_td_bit_alloc.c index 9c4cc3ad20..7af235e813 100644 --- a/lib_com/ivas_stereo_td_bit_alloc.c +++ b/lib_com/ivas_stereo_td_bit_alloc.c @@ -318,6 +318,7 @@ void tdm_bit_alloc( } #endif } + #ifdef NONBE_FIX_874_OMASA_BRSW_2TD if ( coder_type == INACTIVE ) { @@ -328,6 +329,7 @@ void tdm_bit_alloc( *total_brate_sec = max( *total_brate_sec, 3500 ); /* sanity check to ensure the secondary channel always gets the minimal bitrate it needs */ } #endif + /* Secondary channel bitrate adjusment */ /* First, adjust the bitrate depending of what is transmitted */ /* Second, choose the number of subframe for ACELP core depending of the targetted bitratre */ -- GitLab From be6460fc75089bdb32411f23dbdeb57a099f8469 Mon Sep 17 00:00:00 2001 From: vaclav Date: Fri, 20 Oct 2023 16:56:45 +0200 Subject: [PATCH 08/10] fix inside NONBE_FIX_874_OMASA_BRSW_2TD --- lib_enc/ivas_stereo_classifier.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib_enc/ivas_stereo_classifier.c b/lib_enc/ivas_stereo_classifier.c index e5b3787b34..8a18cb2caf 100644 --- a/lib_enc/ivas_stereo_classifier.c +++ b/lib_enc/ivas_stereo_classifier.c @@ -128,7 +128,6 @@ int16_t select_stereo_mode( #endif ) { - stereo_switching_flag = 0; } @@ -170,7 +169,7 @@ int16_t select_stereo_mode( #ifdef NONBE_FIX_874_OMASA_BRSW_2TD if ( ( ivas_format == MASA_FORMAT || ivas_format == MASA_ISM_FORMAT ) && hCPE->element_brate < MASA_STEREO_MIN_BITRATE ) { - hCPE->element_mode = IVAS_CPE_DFT; + element_mode = IVAS_CPE_DFT; } #endif #ifdef DEBUGGING -- GitLab From 349ceebcf3e9e2528d150e5a3eedf524544bb8ef Mon Sep 17 00:00:00 2001 From: advasila Date: Fri, 20 Oct 2023 19:01:51 +0300 Subject: [PATCH 09/10] make it compile for undefined switch 874 --- lib_enc/ivas_stereo_classifier.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_enc/ivas_stereo_classifier.c b/lib_enc/ivas_stereo_classifier.c index 8a18cb2caf..5a7276873e 100644 --- a/lib_enc/ivas_stereo_classifier.c +++ b/lib_enc/ivas_stereo_classifier.c @@ -90,7 +90,7 @@ int16_t select_stereo_mode( CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */ const IVAS_FORMAT ivas_format /* i : IVAS format */ #ifndef NONBE_FIX_874_OMASA_BRSW_2TD - const int32_t ivas_total_brate /* i : IVAS total brate */ + ,const int32_t ivas_total_brate /* i : IVAS total brate */ #endif ) { -- GitLab From fdaa9fc908c97f1ef2a5ac99cf321f8cc8df510a Mon Sep 17 00:00:00 2001 From: advasila Date: Fri, 20 Oct 2023 19:29:31 +0300 Subject: [PATCH 10/10] formatting --- lib_enc/ivas_stereo_classifier.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib_enc/ivas_stereo_classifier.c b/lib_enc/ivas_stereo_classifier.c index 5a7276873e..0e49c50d6a 100644 --- a/lib_enc/ivas_stereo_classifier.c +++ b/lib_enc/ivas_stereo_classifier.c @@ -90,7 +90,8 @@ int16_t select_stereo_mode( CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */ const IVAS_FORMAT ivas_format /* i : IVAS format */ #ifndef NONBE_FIX_874_OMASA_BRSW_2TD - ,const int32_t ivas_total_brate /* i : IVAS total brate */ + , + const int32_t ivas_total_brate /* i : IVAS total brate */ #endif ) { -- GitLab