From 437a7c5a25291cfa3c72a6f979be3cee99e26afa Mon Sep 17 00:00:00 2001 From: Eleni Fotopoulou Date: Thu, 31 Aug 2023 11:47:08 +0200 Subject: [PATCH 01/10] fix for issue 752 under CR_FIX_752_OSBA_MISCONFIG_MCT --- lib_com/bitstream.c | 4 +++- lib_com/options.h | 2 ++ lib_dec/ivas_init_dec.c | 7 ++++--- lib_dec/ivas_mct_dec.c | 25 ++++++++++++++++++++++++- lib_dec/ivas_sba_dec.c | 10 ++++++++-- lib_enc/ivas_corecoder_enc_reconfig.c | 3 +++ lib_enc/ivas_mct_enc.c | 18 ++++++++++++++++++ lib_enc/ivas_osba_enc.c | 9 ++++++++- 8 files changed, 70 insertions(+), 8 deletions(-) diff --git a/lib_com/bitstream.c b/lib_com/bitstream.c index 2c90b913b5..0feba146c7 100644 --- a/lib_com/bitstream.c +++ b/lib_com/bitstream.c @@ -2740,7 +2740,9 @@ ivas_error preview_indices( /* Read SBA planar flag and SBA order */ st_ivas->sba_planar = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_EXTENDED + IVAS_COMBINED_FORMAT_SIGNALLING_BITS] == 1 ); - if ( total_brate > IVAS_256k ) +#ifdef CR_FIX_752_OSBA_MISCONFIG_MCT + if ( total_brate >= IVAS_256k ) +#endif { st_ivas->sba_order = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_EXTENDED + IVAS_COMBINED_FORMAT_SIGNALLING_BITS + 2] == 1 ); st_ivas->sba_order += 2 * ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_EXTENDED + IVAS_COMBINED_FORMAT_SIGNALLING_BITS + 1] == 1 ); diff --git a/lib_com/options.h b/lib_com/options.h index e3e04a1c7a..f52afcdbde 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -167,6 +167,8 @@ /* all switches in this category should start with "CR_" */ + +#define CR_FIX_752_OSBA_MISCONFIG_MCT /* FhG: issue 752: misconfiguration of MCT causes crashes for coding with sampling rate under 48kHz at 256kbps*/ /* ##################### End NON-BE CR switches ########################### */ /* ################## End DEVELOPMENT switches ######################### */ diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c index 6a462fcd25..38267c184d 100644 --- a/lib_dec/ivas_init_dec.c +++ b/lib_dec/ivas_init_dec.c @@ -1531,11 +1531,12 @@ ivas_error ivas_init_decoder( st_ivas->hCPE[0]->hCoreCoder[0] = st_ivas->hSCE[0]->hCoreCoder[0]; /* don't allocate unnecessary core coder, simply point to core coder of SCE element */ st_ivas->hCPE[0]->hCoreCoder[1] = NULL; } - +#ifndef CR_FIX_752_OSBA_MISCONFIG_MCT if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) { st_ivas->nchan_transport += st_ivas->nchan_ism; } +#endif if ( st_ivas->nCPE > 1 ) { if ( ( error = create_mct_dec( st_ivas ) ) != IVAS_ERR_OK ) @@ -1543,12 +1544,12 @@ ivas_error ivas_init_decoder( return error; } } - +#ifndef CR_FIX_752_OSBA_MISCONFIG_MCT if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) { st_ivas->nchan_transport -= st_ivas->nchan_ism; } - +#endif if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) { if ( ( error = ivas_ism_metadata_dec_create( st_ivas, st_ivas->nchan_ism, temp_brate ) ) != IVAS_ERR_OK ) diff --git a/lib_dec/ivas_mct_dec.c b/lib_dec/ivas_mct_dec.c index 9072d8a1b7..046b5db290 100644 --- a/lib_dec/ivas_mct_dec.c +++ b/lib_dec/ivas_mct_dec.c @@ -350,6 +350,12 @@ ivas_error create_mct_dec( if ( ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMMC ) || st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == SBA_ISM_FORMAT ) { hMCT->nchan_out_woLFE = st_ivas->nchan_transport; +#ifdef CR_FIX_752_OSBA_MISCONFIG_MCT + if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) + { + hMCT->nchan_out_woLFE += st_ivas->nchan_ism; + } +#endif } else if ( st_ivas->mc_mode == MC_MODE_MCT ) { @@ -366,6 +372,12 @@ ivas_error create_mct_dec( cp_bitrate = st_ivas->hDecoderConfig->ivas_total_brate / hMCT->nchan_out_woLFE * CPE_CHANNELS; +#ifdef CR_FIX_752_OSBA_MISCONFIG_MCT + if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) + { + cp_bitrate = st_ivas->hDecoderConfig->ivas_total_brate / st_ivas->nchan_transport * CPE_CHANNELS; + } +#endif /* indicate LFE for appropriate core-coder channel */ for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ ) { @@ -460,6 +472,12 @@ ivas_error mct_dec_reconfigure( if ( ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMMC ) || st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == SBA_ISM_FORMAT ) { hMCT->nchan_out_woLFE = st_ivas->nchan_transport; +#ifdef CR_FIX_752_OSBA_MISCONFIG_MCT + if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) + { + hMCT->nchan_out_woLFE += st_ivas->nchan_ism; + } +#endif } else if ( st_ivas->mc_mode == MC_MODE_MCT ) { @@ -491,7 +509,12 @@ ivas_error mct_dec_reconfigure( } cp_bitrate = st_ivas->hDecoderConfig->ivas_total_brate / hMCT->nchan_out_woLFE * CPE_CHANNELS; - +#ifdef CR_FIX_752_OSBA_MISCONFIG_MCT + if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) + { + cp_bitrate = st_ivas->hDecoderConfig->ivas_total_brate / st_ivas->nchan_transport * CPE_CHANNELS; + } +#endif /* set correct nominal bitrates and igf config already here, otherwise we * run into a number of problems */ for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ ) diff --git a/lib_dec/ivas_sba_dec.c b/lib_dec/ivas_sba_dec.c index 1189fb7cd1..21ca310130 100755 --- a/lib_dec/ivas_sba_dec.c +++ b/lib_dec/ivas_sba_dec.c @@ -369,8 +369,9 @@ ivas_error ivas_sba_dec_reconfigure( return error; } - +#ifndef CR_FIX_752_OSBA_MISCONFIG_MCT st_ivas->nchan_transport += st_ivas->nchan_ism; +#endif st_ivas->nCPE += ( st_ivas->nchan_ism + 1 ) >> 1; } else if ( ism_mode_old == ISM_SBA_MODE_DISC && st_ivas->ism_mode == ISM_MODE_NONE ) @@ -398,12 +399,16 @@ ivas_error ivas_sba_dec_reconfigure( } } } +#ifndef CR_FIX_752_OSBA_MISCONFIG_MCT nchan_transport_old += st_ivas->nchan_ism; +#endif st_ivas->ism_mode = ISM_MODE_NONE; } else if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) { +#ifndef CR_FIX_752_OSBA_MISCONFIG_MCT st_ivas->nchan_transport += st_ivas->nchan_ism; +#endif st_ivas->nCPE += ( st_ivas->nchan_ism + 1 ) >> 1; nCPE_old = st_ivas->nCPE; nchan_transport_old = st_ivas->nchan_transport; @@ -414,7 +419,7 @@ ivas_error ivas_sba_dec_reconfigure( { return error; } - +#ifndef CR_FIX_752_OSBA_MISCONFIG_MCT if ( st_ivas->ivas_format == SBA_ISM_FORMAT ) { if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) @@ -422,6 +427,7 @@ ivas_error ivas_sba_dec_reconfigure( st_ivas->nchan_transport -= st_ivas->nchan_ism; } } +#endif /*-----------------------------------------------------------------* * HP20 memories diff --git a/lib_enc/ivas_corecoder_enc_reconfig.c b/lib_enc/ivas_corecoder_enc_reconfig.c index 153d85e4f2..8ab4e9f014 100644 --- a/lib_enc/ivas_corecoder_enc_reconfig.c +++ b/lib_enc/ivas_corecoder_enc_reconfig.c @@ -122,6 +122,9 @@ ivas_error ivas_corecoder_enc_reconfig( nchan_transport_old_real = nchan_transport_old; nchan_transport_real = st_ivas->nchan_transport; +#ifdef CR_FIX_752_OSBA_MISCONFIG_MCT + nchan_transport_real += st_ivas->hEncoderConfig->nchan_ism; +#endif /* in SCE+CPE McMASA nchan_transport is still 2, fix the numbers */ if ( hEncoderConfig->ivas_format == MC_FORMAT && last_mc_mode == MC_MODE_MCMASA ) { diff --git a/lib_enc/ivas_mct_enc.c b/lib_enc/ivas_mct_enc.c index 895e864797..029d97c3d9 100644 --- a/lib_enc/ivas_mct_enc.c +++ b/lib_enc/ivas_mct_enc.c @@ -338,6 +338,12 @@ ivas_error create_mct_enc( cp_bitrate = ivas_total_brate / hMCT->nchan_out_woLFE * CPE_CHANNELS; +#ifdef CR_FIX_752_OSBA_MISCONFIG_MCT + if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) + { + cp_bitrate = ivas_total_brate / st_ivas->nchan_transport * CPE_CHANNELS; + } +#endif for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ ) { for ( n = 0; n < CPE_CHANNELS; n++ ) @@ -444,6 +450,12 @@ ivas_error mct_enc_reconfigure( else if ( ivas_format == SBA_FORMAT || ivas_format == SBA_ISM_FORMAT ) { hMCT->nchan_out_woLFE = st_ivas->nchan_transport; +#ifdef CR_FIX_752_OSBA_MISCONFIG_MCT + if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) + { + hMCT->nchan_out_woLFE += st_ivas->hEncoderConfig->nchan_ism; + } +#endif } else { @@ -452,6 +464,12 @@ ivas_error mct_enc_reconfigure( } cp_bitrate = ivas_total_brate / hMCT->nchan_out_woLFE * CPE_CHANNELS; +#ifdef CR_FIX_752_OSBA_MISCONFIG_MCT + if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) + { + cp_bitrate = ivas_total_brate / st_ivas->nchan_transport * CPE_CHANNELS; + } +#endif for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ ) { diff --git a/lib_enc/ivas_osba_enc.c b/lib_enc/ivas_osba_enc.c index 8630c97671..087f973def 100644 --- a/lib_enc/ivas_osba_enc.c +++ b/lib_enc/ivas_osba_enc.c @@ -336,16 +336,22 @@ ivas_error ivas_osba_enc_reconfig( *-----------------------------------------------------------------*/ if ( old_ism_mode == ISM_MODE_NONE && st_ivas->ism_mode == ISM_SBA_MODE_DISC ) { +#ifndef CR_FIX_752_OSBA_MISCONFIG_MCT st_ivas->nchan_transport += st_ivas->hEncoderConfig->nchan_ism; +#endif st_ivas->nCPE += ( st_ivas->hEncoderConfig->nchan_ism + 1 ) >> 1; } +#ifndef CR_FIX_752_OSBA_MISCONFIG_MCT else if ( old_ism_mode == ISM_SBA_MODE_DISC && st_ivas->ism_mode == ISM_MODE_NONE ) { nchan_transport_old += st_ivas->hEncoderConfig->nchan_ism; } +#endif else if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) { +#ifndef CR_FIX_752_OSBA_MISCONFIG_MCT st_ivas->nchan_transport += st_ivas->hEncoderConfig->nchan_ism; +#endif st_ivas->nCPE += ( st_ivas->hEncoderConfig->nchan_ism + 1 ) >> 1; nCPE_old = st_ivas->nCPE; nchan_transport_old = st_ivas->nchan_transport; @@ -355,12 +361,13 @@ ivas_error ivas_osba_enc_reconfig( { return error; } - +#ifndef CR_FIX_752_OSBA_MISCONFIG_MCT if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) { /*retain original value for further processing*/ st_ivas->nchan_transport -= st_ivas->hEncoderConfig->nchan_ism; } +#endif } return error; -- GitLab From 186ced20982cb8c6cfdf86ddb659e9307dfe8de4 Mon Sep 17 00:00:00 2001 From: Eleni Fotopoulou Date: Fri, 1 Sep 2023 08:40:04 +0200 Subject: [PATCH 02/10] redefine condition when CR_FIX_752_OSBA_MISCONFIG_MCT is disabled --- lib_com/bitstream.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib_com/bitstream.c b/lib_com/bitstream.c index 0feba146c7..4b56006e47 100644 --- a/lib_com/bitstream.c +++ b/lib_com/bitstream.c @@ -2742,6 +2742,8 @@ ivas_error preview_indices( #ifdef CR_FIX_752_OSBA_MISCONFIG_MCT if ( total_brate >= IVAS_256k ) +#else + if ( total_brate > IVAS_256k ) #endif { st_ivas->sba_order = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_EXTENDED + IVAS_COMBINED_FORMAT_SIGNALLING_BITS + 2] == 1 ); -- GitLab From de4008bce3d46127b57ac79a7ed770f2055c7370 Mon Sep 17 00:00:00 2001 From: Eleni Fotopoulou Date: Fri, 1 Sep 2023 08:52:53 +0200 Subject: [PATCH 03/10] Rename define with NONBE_ prefix instead of CR_ --- lib_com/bitstream.c | 2 +- lib_com/options.h | 4 +--- lib_dec/ivas_init_dec.c | 4 ++-- lib_dec/ivas_mct_dec.c | 8 ++++---- lib_dec/ivas_sba_dec.c | 8 ++++---- lib_enc/ivas_corecoder_enc_reconfig.c | 2 +- lib_enc/ivas_mct_enc.c | 6 +++--- lib_enc/ivas_osba_enc.c | 8 ++++---- 8 files changed, 20 insertions(+), 22 deletions(-) diff --git a/lib_com/bitstream.c b/lib_com/bitstream.c index 4b56006e47..dabdc5660c 100644 --- a/lib_com/bitstream.c +++ b/lib_com/bitstream.c @@ -2740,7 +2740,7 @@ ivas_error preview_indices( /* Read SBA planar flag and SBA order */ st_ivas->sba_planar = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_EXTENDED + IVAS_COMBINED_FORMAT_SIGNALLING_BITS] == 1 ); -#ifdef CR_FIX_752_OSBA_MISCONFIG_MCT +#ifdef NONBE_FIX_752_OSBA_MISCONFIG_MCT if ( total_brate >= IVAS_256k ) #else if ( total_brate > IVAS_256k ) diff --git a/lib_com/options.h b/lib_com/options.h index fdf10638dc..c2bc103f00 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -167,9 +167,7 @@ #define NONBE_FIX_736_FOA_BR_SWITCH /* FhG/Dlb : Issue 736: FOA bitrate switching decoding crashes in in ivas_spar_to_dirac */ #define NONBE_FIX_746_NONDIEGETIC_MD /* Eri: Issue 746: The non-diegetic panning flag affects the encoder bitstream even if extended metadata is not enabled. Crashes the decoder.*/ - - -#define CR_FIX_752_OSBA_MISCONFIG_MCT /* FhG: issue 752: misconfiguration of MCT causes crashes for coding with sampling rate under 48kHz at 256kbps*/ +#define NONBE_FIX_752_OSBA_MISCONFIG_MCT /* FhG: issue 752: misconfiguration of MCT causes crashes for coding with sampling rate under 48kHz at 256kbps*/ /* ##################### End NON-BE switches ############################# */ /* ################## End DEVELOPMENT switches ######################### */ diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c index 38267c184d..c323141180 100644 --- a/lib_dec/ivas_init_dec.c +++ b/lib_dec/ivas_init_dec.c @@ -1531,7 +1531,7 @@ ivas_error ivas_init_decoder( st_ivas->hCPE[0]->hCoreCoder[0] = st_ivas->hSCE[0]->hCoreCoder[0]; /* don't allocate unnecessary core coder, simply point to core coder of SCE element */ st_ivas->hCPE[0]->hCoreCoder[1] = NULL; } -#ifndef CR_FIX_752_OSBA_MISCONFIG_MCT +#ifndef NONBE_FIX_752_OSBA_MISCONFIG_MCT if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) { st_ivas->nchan_transport += st_ivas->nchan_ism; @@ -1544,7 +1544,7 @@ ivas_error ivas_init_decoder( return error; } } -#ifndef CR_FIX_752_OSBA_MISCONFIG_MCT +#ifndef NONBE_FIX_752_OSBA_MISCONFIG_MCT if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) { st_ivas->nchan_transport -= st_ivas->nchan_ism; diff --git a/lib_dec/ivas_mct_dec.c b/lib_dec/ivas_mct_dec.c index 046b5db290..f6c32eae31 100644 --- a/lib_dec/ivas_mct_dec.c +++ b/lib_dec/ivas_mct_dec.c @@ -350,7 +350,7 @@ ivas_error create_mct_dec( if ( ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMMC ) || st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == SBA_ISM_FORMAT ) { hMCT->nchan_out_woLFE = st_ivas->nchan_transport; -#ifdef CR_FIX_752_OSBA_MISCONFIG_MCT +#ifdef NONBE_FIX_752_OSBA_MISCONFIG_MCT if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) { hMCT->nchan_out_woLFE += st_ivas->nchan_ism; @@ -372,7 +372,7 @@ ivas_error create_mct_dec( cp_bitrate = st_ivas->hDecoderConfig->ivas_total_brate / hMCT->nchan_out_woLFE * CPE_CHANNELS; -#ifdef CR_FIX_752_OSBA_MISCONFIG_MCT +#ifdef NONBE_FIX_752_OSBA_MISCONFIG_MCT if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) { cp_bitrate = st_ivas->hDecoderConfig->ivas_total_brate / st_ivas->nchan_transport * CPE_CHANNELS; @@ -472,7 +472,7 @@ ivas_error mct_dec_reconfigure( if ( ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMMC ) || st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == SBA_ISM_FORMAT ) { hMCT->nchan_out_woLFE = st_ivas->nchan_transport; -#ifdef CR_FIX_752_OSBA_MISCONFIG_MCT +#ifdef NONBE_FIX_752_OSBA_MISCONFIG_MCT if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) { hMCT->nchan_out_woLFE += st_ivas->nchan_ism; @@ -509,7 +509,7 @@ ivas_error mct_dec_reconfigure( } cp_bitrate = st_ivas->hDecoderConfig->ivas_total_brate / hMCT->nchan_out_woLFE * CPE_CHANNELS; -#ifdef CR_FIX_752_OSBA_MISCONFIG_MCT +#ifdef NONBE_FIX_752_OSBA_MISCONFIG_MCT if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) { cp_bitrate = st_ivas->hDecoderConfig->ivas_total_brate / st_ivas->nchan_transport * CPE_CHANNELS; diff --git a/lib_dec/ivas_sba_dec.c b/lib_dec/ivas_sba_dec.c index 9fc9dfd412..0041e15bef 100755 --- a/lib_dec/ivas_sba_dec.c +++ b/lib_dec/ivas_sba_dec.c @@ -414,7 +414,7 @@ ivas_error ivas_sba_dec_reconfigure( return error; } -#ifndef CR_FIX_752_OSBA_MISCONFIG_MCT +#ifndef NONBE_FIX_752_OSBA_MISCONFIG_MCT st_ivas->nchan_transport += st_ivas->nchan_ism; #endif st_ivas->nCPE += ( st_ivas->nchan_ism + 1 ) >> 1; @@ -444,14 +444,14 @@ ivas_error ivas_sba_dec_reconfigure( } } } -#ifndef CR_FIX_752_OSBA_MISCONFIG_MCT +#ifndef NONBE_FIX_752_OSBA_MISCONFIG_MCT nchan_transport_old += st_ivas->nchan_ism; #endif st_ivas->ism_mode = ISM_MODE_NONE; } else if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) { -#ifndef CR_FIX_752_OSBA_MISCONFIG_MCT +#ifndef NONBE_FIX_752_OSBA_MISCONFIG_MCT st_ivas->nchan_transport += st_ivas->nchan_ism; #endif st_ivas->nCPE += ( st_ivas->nchan_ism + 1 ) >> 1; @@ -464,7 +464,7 @@ ivas_error ivas_sba_dec_reconfigure( { return error; } -#ifndef CR_FIX_752_OSBA_MISCONFIG_MCT +#ifndef NONBE_FIX_752_OSBA_MISCONFIG_MCT if ( st_ivas->ivas_format == SBA_ISM_FORMAT ) { if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) diff --git a/lib_enc/ivas_corecoder_enc_reconfig.c b/lib_enc/ivas_corecoder_enc_reconfig.c index 8ab4e9f014..e64d109504 100644 --- a/lib_enc/ivas_corecoder_enc_reconfig.c +++ b/lib_enc/ivas_corecoder_enc_reconfig.c @@ -122,7 +122,7 @@ ivas_error ivas_corecoder_enc_reconfig( nchan_transport_old_real = nchan_transport_old; nchan_transport_real = st_ivas->nchan_transport; -#ifdef CR_FIX_752_OSBA_MISCONFIG_MCT +#ifdef NONBE_FIX_752_OSBA_MISCONFIG_MCT nchan_transport_real += st_ivas->hEncoderConfig->nchan_ism; #endif /* in SCE+CPE McMASA nchan_transport is still 2, fix the numbers */ diff --git a/lib_enc/ivas_mct_enc.c b/lib_enc/ivas_mct_enc.c index 029d97c3d9..e6580b1dbb 100644 --- a/lib_enc/ivas_mct_enc.c +++ b/lib_enc/ivas_mct_enc.c @@ -338,7 +338,7 @@ ivas_error create_mct_enc( cp_bitrate = ivas_total_brate / hMCT->nchan_out_woLFE * CPE_CHANNELS; -#ifdef CR_FIX_752_OSBA_MISCONFIG_MCT +#ifdef NONBE_FIX_752_OSBA_MISCONFIG_MCT if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) { cp_bitrate = ivas_total_brate / st_ivas->nchan_transport * CPE_CHANNELS; @@ -450,7 +450,7 @@ ivas_error mct_enc_reconfigure( else if ( ivas_format == SBA_FORMAT || ivas_format == SBA_ISM_FORMAT ) { hMCT->nchan_out_woLFE = st_ivas->nchan_transport; -#ifdef CR_FIX_752_OSBA_MISCONFIG_MCT +#ifdef NONBE_FIX_752_OSBA_MISCONFIG_MCT if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) { hMCT->nchan_out_woLFE += st_ivas->hEncoderConfig->nchan_ism; @@ -464,7 +464,7 @@ ivas_error mct_enc_reconfigure( } cp_bitrate = ivas_total_brate / hMCT->nchan_out_woLFE * CPE_CHANNELS; -#ifdef CR_FIX_752_OSBA_MISCONFIG_MCT +#ifdef NONBE_FIX_752_OSBA_MISCONFIG_MCT if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) { cp_bitrate = ivas_total_brate / st_ivas->nchan_transport * CPE_CHANNELS; diff --git a/lib_enc/ivas_osba_enc.c b/lib_enc/ivas_osba_enc.c index 087f973def..da9bdb9d28 100644 --- a/lib_enc/ivas_osba_enc.c +++ b/lib_enc/ivas_osba_enc.c @@ -336,12 +336,12 @@ ivas_error ivas_osba_enc_reconfig( *-----------------------------------------------------------------*/ if ( old_ism_mode == ISM_MODE_NONE && st_ivas->ism_mode == ISM_SBA_MODE_DISC ) { -#ifndef CR_FIX_752_OSBA_MISCONFIG_MCT +#ifndef NONBE_FIX_752_OSBA_MISCONFIG_MCT st_ivas->nchan_transport += st_ivas->hEncoderConfig->nchan_ism; #endif st_ivas->nCPE += ( st_ivas->hEncoderConfig->nchan_ism + 1 ) >> 1; } -#ifndef CR_FIX_752_OSBA_MISCONFIG_MCT +#ifndef NONBE_FIX_752_OSBA_MISCONFIG_MCT else if ( old_ism_mode == ISM_SBA_MODE_DISC && st_ivas->ism_mode == ISM_MODE_NONE ) { nchan_transport_old += st_ivas->hEncoderConfig->nchan_ism; @@ -349,7 +349,7 @@ ivas_error ivas_osba_enc_reconfig( #endif else if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) { -#ifndef CR_FIX_752_OSBA_MISCONFIG_MCT +#ifndef NONBE_FIX_752_OSBA_MISCONFIG_MCT st_ivas->nchan_transport += st_ivas->hEncoderConfig->nchan_ism; #endif st_ivas->nCPE += ( st_ivas->hEncoderConfig->nchan_ism + 1 ) >> 1; @@ -361,7 +361,7 @@ ivas_error ivas_osba_enc_reconfig( { return error; } -#ifndef CR_FIX_752_OSBA_MISCONFIG_MCT +#ifndef NONBE_FIX_752_OSBA_MISCONFIG_MCT if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) { /*retain original value for further processing*/ -- GitLab From 2d38a86225f5ed85f2349a4be86afe09af095036 Mon Sep 17 00:00:00 2001 From: Eleni Fotopoulou Date: Fri, 1 Sep 2023 12:56:32 +0200 Subject: [PATCH 04/10] correct nchan_transport_old fix for bitrate switching --- lib_enc/ivas_corecoder_enc_reconfig.c | 5 ++++- lib_enc/ivas_osba_enc.c | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib_enc/ivas_corecoder_enc_reconfig.c b/lib_enc/ivas_corecoder_enc_reconfig.c index e64d109504..76152d8f43 100644 --- a/lib_enc/ivas_corecoder_enc_reconfig.c +++ b/lib_enc/ivas_corecoder_enc_reconfig.c @@ -123,7 +123,10 @@ ivas_error ivas_corecoder_enc_reconfig( nchan_transport_real = st_ivas->nchan_transport; #ifdef NONBE_FIX_752_OSBA_MISCONFIG_MCT - nchan_transport_real += st_ivas->hEncoderConfig->nchan_ism; + if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) + { + nchan_transport_real += st_ivas->hEncoderConfig->nchan_ism; + } #endif /* in SCE+CPE McMASA nchan_transport is still 2, fix the numbers */ if ( hEncoderConfig->ivas_format == MC_FORMAT && last_mc_mode == MC_MODE_MCMASA ) diff --git a/lib_enc/ivas_osba_enc.c b/lib_enc/ivas_osba_enc.c index da9bdb9d28..4558f337ec 100644 --- a/lib_enc/ivas_osba_enc.c +++ b/lib_enc/ivas_osba_enc.c @@ -341,12 +341,10 @@ ivas_error ivas_osba_enc_reconfig( #endif st_ivas->nCPE += ( st_ivas->hEncoderConfig->nchan_ism + 1 ) >> 1; } -#ifndef NONBE_FIX_752_OSBA_MISCONFIG_MCT else if ( old_ism_mode == ISM_SBA_MODE_DISC && st_ivas->ism_mode == ISM_MODE_NONE ) { nchan_transport_old += st_ivas->hEncoderConfig->nchan_ism; } -#endif else if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) { #ifndef NONBE_FIX_752_OSBA_MISCONFIG_MCT @@ -355,6 +353,9 @@ ivas_error ivas_osba_enc_reconfig( st_ivas->nCPE += ( st_ivas->hEncoderConfig->nchan_ism + 1 ) >> 1; nCPE_old = st_ivas->nCPE; nchan_transport_old = st_ivas->nchan_transport; +#ifdef NONBE_FIX_752_OSBA_MISCONFIG_MCT + nchan_transport_old += st_ivas->hEncoderConfig->nchan_ism; +#endif } if ( ( error = ivas_corecoder_enc_reconfig( st_ivas, nSCE_old, nCPE_old, nchan_transport_old, ivas_total_brate / st_ivas->nchan_transport, ( ivas_total_brate / st_ivas->nchan_transport ) * CPE_CHANNELS, MC_MODE_NONE ) ) != IVAS_ERR_OK ) -- GitLab From b0a39d0d06fe6def25d69e1cc6a3063021fb1e87 Mon Sep 17 00:00:00 2001 From: Eleni Fotopoulou Date: Mon, 4 Sep 2023 15:16:20 +0200 Subject: [PATCH 05/10] more fixes for bitrate switching - bitrate switching for swb and wb was previously still broken --- lib_dec/ivas_corecoder_dec_reconfig.c | 15 ++++++++++++++ lib_dec/ivas_sba_dec.c | 3 +++ lib_enc/ivas_corecoder_enc_reconfig.c | 28 +++++++++++++++++++-------- lib_enc/ivas_mct_enc.c | 7 +++++++ 4 files changed, 45 insertions(+), 8 deletions(-) diff --git a/lib_dec/ivas_corecoder_dec_reconfig.c b/lib_dec/ivas_corecoder_dec_reconfig.c index ffd96b635c..25767099ae 100644 --- a/lib_dec/ivas_corecoder_dec_reconfig.c +++ b/lib_dec/ivas_corecoder_dec_reconfig.c @@ -60,6 +60,9 @@ ivas_error ivas_corecoder_dec_reconfig( int16_t n, sce_id, cpe_id, output_frame; int16_t nSCE_existing, nCPE_existing; int32_t ivas_total_brate; +#ifdef NONBE_FIX_752_OSBA_MISCONFIG_MCT + int16_t nchan_transport_real; +#endif MC_MODE last_mc_mode; DECODER_CONFIG_HANDLE hDecoderConfig; ivas_error error; @@ -82,6 +85,14 @@ ivas_error ivas_corecoder_dec_reconfig( last_mc_mode = MC_MODE_NONE; } +#ifdef NONBE_FIX_752_OSBA_MISCONFIG_MCT + nchan_transport_real = st_ivas->nchan_transport; + + if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) + { + nchan_transport_real += st_ivas->nchan_ism; + } +#endif /*-----------------------------------------------------------------* * Allocate, initialize, and configure SCE/CPE/MCT handles *-----------------------------------------------------------------*/ @@ -105,7 +116,11 @@ ivas_error ivas_corecoder_dec_reconfig( } } +#ifdef NONBE_FIX_752_OSBA_MISCONFIG_MCT + if ( nchan_transport_real == nchan_transport_old && st_ivas->nSCE == nSCE_old && st_ivas->nCPE == nCPE_old ) +#else if ( st_ivas->nchan_transport == nchan_transport_old && st_ivas->nSCE == nSCE_old && st_ivas->nCPE == nCPE_old ) +#endif { for ( sce_id = 0; sce_id < st_ivas->nSCE; sce_id++ ) { diff --git a/lib_dec/ivas_sba_dec.c b/lib_dec/ivas_sba_dec.c index 0041e15bef..e46e4000f0 100755 --- a/lib_dec/ivas_sba_dec.c +++ b/lib_dec/ivas_sba_dec.c @@ -457,6 +457,9 @@ ivas_error ivas_sba_dec_reconfigure( st_ivas->nCPE += ( st_ivas->nchan_ism + 1 ) >> 1; nCPE_old = st_ivas->nCPE; nchan_transport_old = st_ivas->nchan_transport; +#ifdef NONBE_FIX_752_OSBA_MISCONFIG_MCT + nchan_transport_old += st_ivas->nchan_ism; +#endif } } diff --git a/lib_enc/ivas_corecoder_enc_reconfig.c b/lib_enc/ivas_corecoder_enc_reconfig.c index 76152d8f43..9a962855c7 100644 --- a/lib_enc/ivas_corecoder_enc_reconfig.c +++ b/lib_enc/ivas_corecoder_enc_reconfig.c @@ -64,7 +64,9 @@ ivas_error ivas_corecoder_enc_reconfig( int16_t i, nb_bits; Indice temp_ind_list[MAX_NUM_IND_TEMP_LIST]; int16_t nb_bits_tot; - +#ifdef NONBE_FIX_752_OSBA_MISCONFIG_MCT + int16_t nchan_transport_real, nchan_transport_old_real; +#endif ENCODER_CONFIG_HANDLE hEncoderConfig; ivas_error error; @@ -81,11 +83,24 @@ ivas_error ivas_corecoder_enc_reconfig( len_inp_memory += NS2SA( hEncoderConfig->input_Fs, IVAS_FB_ENC_DELAY_NS ); } +#ifdef NONBE_FIX_752_OSBA_MISCONFIG_MCT + nchan_transport_old_real = nchan_transport_old; + nchan_transport_real = st_ivas->nchan_transport; + + if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) + { + nchan_transport_real += st_ivas->hEncoderConfig->nchan_ism; + } +#endif + /*-----------------------------------------------------------------* * Switching between SCE(s)/CPE(s)/MCT *-----------------------------------------------------------------*/ - +#ifdef NONBE_FIX_752_OSBA_MISCONFIG_MCT + if ( nchan_transport_real == nchan_transport_old_real && st_ivas->nSCE == nSCE_old && st_ivas->nCPE == nCPE_old ) /* in McMASA, nchan_transport may be the same, but nSCE/nCPE differs */ +#else if ( st_ivas->nchan_transport == nchan_transport_old && st_ivas->nSCE == nSCE_old && st_ivas->nCPE == nCPE_old ) /* in McMASA, nchan_transport may be the same, but nSCE/nCPE differs */ +#endif { for ( sce_id = 0; sce_id < st_ivas->nSCE; sce_id++ ) { @@ -117,17 +132,14 @@ ivas_error ivas_corecoder_enc_reconfig( } else { +#ifndef NONBE_FIX_752_OSBA_MISCONFIG_MCT int16_t nchan_transport_real, nchan_transport_old_real; + nchan_transport_old_real = nchan_transport_old; nchan_transport_real = st_ivas->nchan_transport; - -#ifdef NONBE_FIX_752_OSBA_MISCONFIG_MCT - if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) - { - nchan_transport_real += st_ivas->hEncoderConfig->nchan_ism; - } #endif + /* in SCE+CPE McMASA nchan_transport is still 2, fix the numbers */ if ( hEncoderConfig->ivas_format == MC_FORMAT && last_mc_mode == MC_MODE_MCMASA ) { diff --git a/lib_enc/ivas_mct_enc.c b/lib_enc/ivas_mct_enc.c index e6580b1dbb..a328833a88 100644 --- a/lib_enc/ivas_mct_enc.c +++ b/lib_enc/ivas_mct_enc.c @@ -222,6 +222,13 @@ ivas_error ivas_mct_enc( int32_t cp_bitrate; cp_bitrate = ivas_total_brate / hMCT->nchan_out_woLFE * CPE_CHANNELS; +#ifdef NONBE_FIX_752_OSBA_MISCONFIG_MCT + if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) + { + cp_bitrate = ivas_total_brate / st_ivas->nchan_transport * CPE_CHANNELS; + } +#endif + for ( n = 0; n < (int16_t) ( hMCT->nchan_out_woLFE * 0.5 ); n++ ) { initMdctStereoEncData( hMCT->hBlockData[n]->hStereoMdct, ivas_format, IVAS_CPE_MDCT, cp_bitrate, max_bwidth, st_ivas->hCPE[0]->hCoreCoder[0]->igf, st_ivas->hCPE[0]->hCoreCoder[0]->hIGFEnc->igfData.igfInfo.grid, 0 ); -- GitLab From c4b489cc10eec03ea67d25d266b52d671b26da2e Mon Sep 17 00:00:00 2001 From: Eleni Fotopoulou Date: Tue, 5 Sep 2023 08:11:22 +0200 Subject: [PATCH 06/10] correct nchan_transport_old for bitrate switching case --- lib_dec/ivas_sba_dec.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib_dec/ivas_sba_dec.c b/lib_dec/ivas_sba_dec.c index e46e4000f0..f2e99927b7 100755 --- a/lib_dec/ivas_sba_dec.c +++ b/lib_dec/ivas_sba_dec.c @@ -444,9 +444,7 @@ ivas_error ivas_sba_dec_reconfigure( } } } -#ifndef NONBE_FIX_752_OSBA_MISCONFIG_MCT nchan_transport_old += st_ivas->nchan_ism; -#endif st_ivas->ism_mode = ISM_MODE_NONE; } else if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) -- GitLab From 2b550e7a82989406c77ad73f3b0e9ef38ae904ad Mon Sep 17 00:00:00 2001 From: Eleni Fotopoulou Date: Tue, 5 Sep 2023 17:10:08 +0200 Subject: [PATCH 07/10] add OSBA test conditions for other bitrates --- scripts/config/self_test.prm | 16 ++++++++++++++++ scripts/testv/stvOSBA_2ISM_3OA32c.wav | 3 +++ scripts/testv/stvOSBA_3ISM_2OA16c.wav | 3 +++ scripts/testv/stvOSBA_4ISM_3OA32c.wav | 3 +++ scripts/testv/stvOSBA_4ISM_FOA32c.wav | 3 +++ 5 files changed, 28 insertions(+) create mode 100644 scripts/testv/stvOSBA_2ISM_3OA32c.wav create mode 100644 scripts/testv/stvOSBA_3ISM_2OA16c.wav create mode 100644 scripts/testv/stvOSBA_4ISM_3OA32c.wav create mode 100644 scripts/testv/stvOSBA_4ISM_FOA32c.wav diff --git a/scripts/config/self_test.prm b/scripts/config/self_test.prm index 9aa93b4f46..23b6cad17c 100644 --- a/scripts/config/self_test.prm +++ b/scripts/config/self_test.prm @@ -1512,3 +1512,19 @@ networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit // OSBA 3OA 4ISM bitrate switching 13.2 to 512, 48kHz in, 48kHz out, BIN out ../IVAS_cod -ism_sba 4 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stvOSBA_4ISM_3OA48c.wav bit ../IVAS_dec BINAURAL 48 bit testv/stvOSBA_4ISM_3OA48c.wav_BINAURAL_sw_13k2_512k_48-48.tst + +// OSBA 3OA 2ISM at 256 kbps, 32kHz in, 32kHz out, BINAURAL_ROOM_IR out +../IVAS_cod -ism_sba 2 3 testv/stvISM1.csv testv/stvISM2.csv 256000 32 testv/stvOSBA_2ISM_3OA32c.wav bit +../IVAS_dec BINAURAL_ROOM_IR 32 bit testv/stvOSBA_2ISM_3OA32c.wav_BINAURAL_ROOM_IR_256000_32-32.tst + +// OSBA 2OA 3ISM at 384 kbps, 16kHz in, 16kHz out, MONO out +../IVAS_cod -ism_sba 3 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 384000 16 testv/stvOSBA_3ISM_2OA16c.wav bit +../IVAS_dec MONO 16 bit testv/stvOSBA_3ISM_2OA16c.wav_MONO_256000_16-16.tst + +// OSBA FOA 4ISM at 512 kbps, 32kHz in, 48kHz out, STEREO out +../IVAS_cod -ism_sba 4 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 512000 32 testv/stvOSBA_4ISM_FOA32c.wav bit +../IVAS_dec STEREO 48 bit testv/stvOSBA_4ISM_FOA32c.wav_STEREO_512000_32-48.tst + +// OSBA 3OA 4ISM bitrate switching 13.2 to 512, 32kHz in, 32kHz out, EXT out +../IVAS_cod -ism_sba 4 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv ../scripts/switchPaths/sw_13k2_512k.bin 32 testv/stvOSBA_4ISM_3OA32c.wav bit +../IVAS_dec EXT 48 bit testv/stvOSBA_4ISM_3OA32c.wav_EXT_sw_13k2_512k_32-32.tst \ No newline at end of file diff --git a/scripts/testv/stvOSBA_2ISM_3OA32c.wav b/scripts/testv/stvOSBA_2ISM_3OA32c.wav new file mode 100644 index 0000000000..f544067d5b --- /dev/null +++ b/scripts/testv/stvOSBA_2ISM_3OA32c.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65903daba9f698dfe8f3a2b5d3ddbdb4a8a273fe1588e0c6e7c763a30c3b3d95 +size 23040744 diff --git a/scripts/testv/stvOSBA_3ISM_2OA16c.wav b/scripts/testv/stvOSBA_3ISM_2OA16c.wav new file mode 100644 index 0000000000..fbab528f8c --- /dev/null +++ b/scripts/testv/stvOSBA_3ISM_2OA16c.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff34580d35d4413e5425af332941a370632d2ced910f89cd77dbdc353ae213ba +size 7680348 diff --git a/scripts/testv/stvOSBA_4ISM_3OA32c.wav b/scripts/testv/stvOSBA_4ISM_3OA32c.wav new file mode 100644 index 0000000000..8faf85b7ca --- /dev/null +++ b/scripts/testv/stvOSBA_4ISM_3OA32c.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2c0ab8504ea708e3ca8785fe6993e75a86e1e35540eae980f4d6e94ba4124da +size 25600812 diff --git a/scripts/testv/stvOSBA_4ISM_FOA32c.wav b/scripts/testv/stvOSBA_4ISM_FOA32c.wav new file mode 100644 index 0000000000..af4ba5b9a2 --- /dev/null +++ b/scripts/testv/stvOSBA_4ISM_FOA32c.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7933dec8112b580ca0af485157d1c8b76d8a04af9a440e742f429c023b2d0fee +size 10240404 -- GitLab From 6fb017b0ef6c565cbd34c38a8c24a698ce80a546 Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 6 Sep 2023 13:45:00 +0200 Subject: [PATCH 08/10] increase timeout for smoke test --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0da7bd4f76..e6ce9894e6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -366,7 +366,7 @@ codec-smoke-test: extends: - .test-job-linux-needs-testv-dir - .rules-merge-request - timeout: "10 minutes" + timeout: "15 minutes" stage: test needs: ["build-codec-linux-cmake", "build-codec-linux-make", "build-codec-instrumented-linux", "build-codec-sanitizers-linux"] script: -- GitLab From 55c109a22a49396a20cc911ab9eb5757d91c1cd3 Mon Sep 17 00:00:00 2001 From: Eleni Fotopoulou Date: Wed, 6 Sep 2023 15:22:20 +0200 Subject: [PATCH 09/10] change problematic output condition from test --- scripts/config/self_test.prm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/config/self_test.prm b/scripts/config/self_test.prm index 23b6cad17c..0114a862ba 100644 --- a/scripts/config/self_test.prm +++ b/scripts/config/self_test.prm @@ -1513,9 +1513,9 @@ networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit ../IVAS_cod -ism_sba 4 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stvOSBA_4ISM_3OA48c.wav bit ../IVAS_dec BINAURAL 48 bit testv/stvOSBA_4ISM_3OA48c.wav_BINAURAL_sw_13k2_512k_48-48.tst -// OSBA 3OA 2ISM at 256 kbps, 32kHz in, 32kHz out, BINAURAL_ROOM_IR out +// OSBA 3OA 2ISM at 256 kbps, 32kHz in, 32kHz out, HOA3 out ../IVAS_cod -ism_sba 2 3 testv/stvISM1.csv testv/stvISM2.csv 256000 32 testv/stvOSBA_2ISM_3OA32c.wav bit -../IVAS_dec BINAURAL_ROOM_IR 32 bit testv/stvOSBA_2ISM_3OA32c.wav_BINAURAL_ROOM_IR_256000_32-32.tst +../IVAS_dec HOA3 32 bit testv/stvOSBA_2ISM_3OA32c.wav_BINAURAL_ROOM_IR_256000_32-32.tst // OSBA 2OA 3ISM at 384 kbps, 16kHz in, 16kHz out, MONO out ../IVAS_cod -ism_sba 3 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 384000 16 testv/stvOSBA_3ISM_2OA16c.wav bit -- GitLab From 74a03fca5da4c867b2d72e0f0b9c5f2efc22e071 Mon Sep 17 00:00:00 2001 From: Eleni Fotopoulou Date: Wed, 6 Sep 2023 15:42:06 +0200 Subject: [PATCH 10/10] small correction in file name --- scripts/config/self_test.prm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/config/self_test.prm b/scripts/config/self_test.prm index 0114a862ba..6fc06b2474 100644 --- a/scripts/config/self_test.prm +++ b/scripts/config/self_test.prm @@ -1515,7 +1515,7 @@ networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit // OSBA 3OA 2ISM at 256 kbps, 32kHz in, 32kHz out, HOA3 out ../IVAS_cod -ism_sba 2 3 testv/stvISM1.csv testv/stvISM2.csv 256000 32 testv/stvOSBA_2ISM_3OA32c.wav bit -../IVAS_dec HOA3 32 bit testv/stvOSBA_2ISM_3OA32c.wav_BINAURAL_ROOM_IR_256000_32-32.tst +../IVAS_dec HOA3 32 bit testv/stvOSBA_2ISM_3OA32c.wav_HOA3_256000_32-32.tst // OSBA 2OA 3ISM at 384 kbps, 16kHz in, 16kHz out, MONO out ../IVAS_cod -ism_sba 3 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 384000 16 testv/stvOSBA_3ISM_2OA16c.wav bit -- GitLab