From 0082c84ea589d40cdf4c9e4b5a5d9e06dd5cac51 Mon Sep 17 00:00:00 2001 From: vaclav Date: Thu, 5 Dec 2024 17:52:40 +0100 Subject: [PATCH 01/36] issue 1228: Exit the processing when a HRTF binary file with wrong sampling rate is provided; under FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE --- apps/decoder.c | 22 +++++++-- apps/renderer.c | 12 +++++ lib_com/ivas_error.h | 7 +++ lib_com/options.h | 3 +- lib_dec/lib_dec.c | 20 +++++--- lib_dec/lib_dec.h | 2 +- lib_util/hrtf_file_reader.c | 97 ++++++++++++++++++++++++++++++------- lib_util/hrtf_file_reader.h | 28 ++++++++--- 8 files changed, 154 insertions(+), 37 deletions(-) diff --git a/apps/decoder.c b/apps/decoder.c index 55ef28160e..9f3cb51889 100644 --- a/apps/decoder.c +++ b/apps/decoder.c @@ -3775,13 +3775,17 @@ static ivas_error IVAS_DEC_LoadHrtfFromFile( if ( binaural_renderer == IVAS_BIN_RENDERER_TYPE_TDREND || binaural_renderer_sec == IVAS_BIN_RENDERER_TYPE_TDREND || binaural_renderer == IVAS_BIN_RENDERER_TYPE_DEFAULT ) { - if ( ( error = IVAS_DEC_GetHrtfHandle( hIvasDec, &hHrtfBinary->hHrtfTD ) ) != IVAS_ERR_OK ) + if ( ( error = IVAS_DEC_GetHrtfTDrendHandle( hIvasDec, &hHrtfBinary->hHrtfTD ) ) != IVAS_ERR_OK ) { - fprintf( stderr, "\nIVAS_DEC_GetHrtfHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) ); + fprintf( stderr, "\nIVAS_DEC_GetHrtfTDrendHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) ); return error; } +#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE + if ( ( error = load_TDrend_HRTF_binary( *hHrtfBinary->hHrtfTD, output_Fs, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK ) +#else if ( ( error = load_HRTF_binary( *hHrtfBinary->hHrtfTD, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK ) +#endif { if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA ) { @@ -3840,7 +3844,11 @@ static ivas_error IVAS_DEC_LoadHrtfFromFile( } #ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM +#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE + if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, OutputConfig, hHrtfBinary->hrtf_set_audio_cfg, output_Fs, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK ) +#else if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, OutputConfig, hHrtfBinary->hrtf_set_audio_cfg, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK ) +#endif #else if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, hHrtfBinary->room_reverb_flag, hHrtfBinary->intern_audio_config, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK ) #endif @@ -3866,7 +3874,11 @@ static ivas_error IVAS_DEC_LoadHrtfFromFile( return error; } +#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE + if ( ( error = load_parambin_HRTF_from_binary( *hHrtfParambin, output_Fs, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK ) +#else if ( ( error = load_parambin_HRTF_from_binary( *hHrtfParambin, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK ) +#endif { if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA ) { @@ -3881,11 +3893,15 @@ static ivas_error IVAS_DEC_LoadHrtfFromFile( } } +#ifdef FIX_1228_HRTF_STATISTICS + if ( hHrtfBinary->hHrtfStatistics == NULL && ( binaural_renderer == IVAS_BIN_RENDERER_TYPE_FASTCONV || binaural_renderer == IVAS_BIN_RENDERER_TYPE_CREND ) && OutputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) +#else if ( hHrtfBinary->hHrtfStatistics == NULL ) +#endif { if ( ( error = IVAS_DEC_GetHrtfStatisticsHandle( hIvasDec, &hHrtfBinary->hHrtfStatistics ) ) != IVAS_ERR_OK ) { - fprintf( stderr, "\nIVAS_DEC_GetHrtfHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) ); + fprintf( stderr, "\nIVAS_DEC_GetHrtfStatisticsHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) ); return error; } diff --git a/apps/renderer.c b/apps/renderer.c index f90ec711f6..20da0f967f 100644 --- a/apps/renderer.c +++ b/apps/renderer.c @@ -910,7 +910,11 @@ int main( goto cleanup; } +#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE + if ( ( error = load_TDrend_HRTF_binary( *hHrtfTD, args.sampleRate, hrtfFileReader ) ) != IVAS_ERR_OK ) +#else if ( ( error = load_HRTF_binary( *hHrtfTD, hrtfFileReader ) ) != IVAS_ERR_OK ) +#endif { if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA ) { @@ -968,7 +972,11 @@ int main( } #ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM +#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE + if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, args.outConfig.audioConfig, args.inConfig.ambisonicsBuses->audioConfig, args.sampleRate, hrtfFileReader ) ) != IVAS_ERR_OK ) +#else if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, args.outConfig.audioConfig, args.inConfig.ambisonicsBuses->audioConfig, hrtfFileReader ) ) != IVAS_ERR_OK ) +#endif #else if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, 0, IVAS_AUDIO_CONFIG_INVALID, hrtfFileReader ) ) != IVAS_ERR_OK ) #endif @@ -990,7 +998,11 @@ int main( goto cleanup; } +#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE + if ( ( error = load_parambin_HRTF_from_binary( *hHrtfParambin, args.sampleRate, hrtfFileReader ) ) != IVAS_ERR_OK ) +#else if ( ( error = load_parambin_HRTF_from_binary( *hHrtfParambin, hrtfFileReader ) ) != IVAS_ERR_OK ) +#endif { if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA ) { diff --git a/lib_com/ivas_error.h b/lib_com/ivas_error.h index 50b6c2d9bc..a6a0e70ea5 100644 --- a/lib_com/ivas_error.h +++ b/lib_com/ivas_error.h @@ -79,6 +79,9 @@ typedef enum IVAS_ERR_ACOUSTIC_ENVIRONMENT_NOT_SUPPORTED, IVAS_ERR_OBJECTS_EDITING_NOT_SUPPORTED, IVAS_ERR_INVALID_HRTF, +#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE + IVAS_ERR_INVALID_HRTF_SAMPLING_RATE, +#endif IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA, IVAS_ERR_INVALID_INPUT_FORMAT, IVAS_ERR_INVALID_INDEX, @@ -259,6 +262,10 @@ static inline const char *ivas_error_to_string( ivas_error error_code ) return "Objects editing not supported"; case IVAS_ERR_INVALID_HRTF: return "Unsupported HRTF filter set"; +#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE + case IVAS_ERR_INVALID_HRTF_SAMPLING_RATE: + return "Wrong sampling rate in HRTF binary file"; +#endif case IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA: return "Renderer data missing in HRTF binary file"; case IVAS_ERR_INVALID_INPUT_FORMAT: diff --git a/lib_com/options.h b/lib_com/options.h index 484de232aa..af0ae671f6 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -163,7 +163,8 @@ #define FIX_1226_FASTCONV_HRTF_LOADING_OPTIM /* VA: issue 1226: for FastConv binaural renderer in decoder, load only HTRT coefficient set that is needed */ #define FIX_1227_Crend_HRTF_LOADING_OPTIM /* VA: issue 1227: for Crend binaural renderer in decoder, load only HTRT coefficient set that is needed */ #define FIX_1222_OMASA_DEC_CHANNEL_BUFFERS /* VA: issue 1222: Reduction of the number of channel buffers in OMASA decoder */ - +#define FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE /* VA: issue 1228: Exit the processing when a HRTF binary file with wrong sampling rate is provided */ +#define FIX_1228_HRTF_STATISTICS /* VA: issue 1228: allocate 'HRTFstatistics' handle only when needed */ /* #################### End BE switches ################################## */ diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c index a71d801ae7..044c47e3bf 100644 --- a/lib_dec/lib_dec.c +++ b/lib_dec/lib_dec.c @@ -2679,12 +2679,12 @@ ivas_error IVAS_DEC_FeedCustomLsData( /*---------------------------------------------------------------------* - * IVAS_DEC_GetHrtfHandle( ) - * + * IVAS_DEC_GetHrtfTDrendHandle( ) * + * Get TD binaural renderer handle *---------------------------------------------------------------------*/ -ivas_error IVAS_DEC_GetHrtfHandle( +ivas_error IVAS_DEC_GetHrtfTDrendHandle( IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ IVAS_DEC_HRTF_HANDLE **hHrtfTD /* o : HRTF handle */ ) @@ -2703,7 +2703,7 @@ ivas_error IVAS_DEC_GetHrtfHandle( /*---------------------------------------------------------------------* * IVAS_DEC_GetHrtfCRendHandle( ) * - * + * Get Crend binaural renderer handle *---------------------------------------------------------------------*/ ivas_error IVAS_DEC_GetHrtfCRendHandle( @@ -2738,7 +2738,7 @@ ivas_error IVAS_DEC_GetHrtfCRendHandle( /*---------------------------------------------------------------------* * IVAS_DEC_GetHrtfFastConvHandle( ) * - * + * Get FastConv binaural renderer handle *---------------------------------------------------------------------*/ ivas_error IVAS_DEC_GetHrtfFastConvHandle( @@ -2760,7 +2760,7 @@ ivas_error IVAS_DEC_GetHrtfFastConvHandle( /*---------------------------------------------------------------------* * IVAS_DEC_GetHrtfParamBinHandle( ) * - * + * Get Parametric binaural renderer handle *---------------------------------------------------------------------*/ ivas_error IVAS_DEC_GetHrtfParamBinHandle( @@ -2781,7 +2781,7 @@ ivas_error IVAS_DEC_GetHrtfParamBinHandle( /*---------------------------------------------------------------------* * IVAS_DEC_GetHrtfStatisticsHandle( ) * - * + * Get HRTF statistics (room effect) binaural renderer handle *---------------------------------------------------------------------*/ ivas_error IVAS_DEC_GetHrtfStatisticsHandle( @@ -2867,7 +2867,11 @@ ivas_error IVAS_DEC_HRTF_binary_open( } } +#ifdef FIX_1228_HRTF_STATISTICS + if ( st_ivas->hHrtfStatistics == NULL && ( binaural_renderer == IVAS_BIN_RENDERER_TYPE_FASTCONV || binaural_renderer == IVAS_BIN_RENDERER_TYPE_CREND ) && st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) +#else if ( st_ivas->hHrtfStatistics == NULL ) +#endif { if ( ( error = ivas_HRTF_statistics_binary_open( &st_ivas->hHrtfStatistics ) ) != IVAS_ERR_OK ) { @@ -2883,7 +2887,7 @@ ivas_error IVAS_DEC_HRTF_binary_open( /*---------------------------------------------------------------------* * IVAS_DEC_HRTF_binary_close( ) * - * + * Deallocate HRTF binary handles *---------------------------------------------------------------------*/ ivas_error IVAS_DEC_HRTF_binary_close( diff --git a/lib_dec/lib_dec.h b/lib_dec/lib_dec.h index 3aca0e9b1c..43dcfb33ba 100644 --- a/lib_dec/lib_dec.h +++ b/lib_dec/lib_dec.h @@ -436,7 +436,7 @@ ivas_error IVAS_DEC_FeedCustomLsData( ); /*! r: error code */ -ivas_error IVAS_DEC_GetHrtfHandle( +ivas_error IVAS_DEC_GetHrtfTDrendHandle( IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ IVAS_DEC_HRTF_HANDLE **hHrtfTD /* o : HRTF handle */ ); diff --git a/lib_util/hrtf_file_reader.c b/lib_util/hrtf_file_reader.c index ac74c6c49a..2660e0a45c 100644 --- a/lib_util/hrtf_file_reader.c +++ b/lib_util/hrtf_file_reader.c @@ -215,7 +215,11 @@ static ivas_error check_hrtf_binary_header( /* Check the sampling frequency */ if ( ( hrtf_header->frequency != 48000 ) && ( hrtf_header->frequency != 32000 ) && ( hrtf_header->frequency != 16000 ) ) { +#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE return IVAS_ERROR( IVAS_ERR_INVALID_SAMPLING_RATE, "Header of HRTF binary file not compliant (sampling frequency)" ); +#else + return IVAS_ERROR( IVAS_ERR_INVALID_SAMPLING_RATE, "Header of HRTF binary file not compliant (sampling frequency)" ); +#endif } return IVAS_ERR_OK; @@ -290,12 +294,12 @@ static BINAURAL_INPUT_AUDIO_CONFIG audio_cfg_2_binaural_cfg( #endif /*-------------------------------------------------------------------* - * LoadBSplineBinaryITD() + * TDREND_LoadBSplineBinaryITD() * * Loads the B Spline HR filter model ITD data from file for TD renderer --------------------------------------------------------------------*/ -static ivas_error LoadBSplineBinaryITD( +static ivas_error TDREND_LoadBSplineBinaryITD( ModelParamsITD_t *modelITD, /* i/o: ITD model parameter structure */ FILE *f_hrtf /* i : HR filter data file handle */ ) @@ -445,12 +449,12 @@ static ivas_error LoadBSplineBinaryITD( } /*-------------------------------------------------------------------* - * LoadBSplineBinary() + * TDREND_LoadBSplineBinary() * * Loads the B Spline HR filter model data from file for TD renderer --------------------------------------------------------------------*/ -static ivas_error LoadBSplineBinary( +static ivas_error TDREND_LoadBSplineBinary( IVAS_DEC_HRTF_HANDLE HrFiltSet_p, /* i/o: HR filter model parameter structure */ FILE *f_hrtf /* i : HR filter data file handle */ ) @@ -722,7 +726,7 @@ static ivas_error LoadBSplineBinary( if ( HrFiltSet_p->ModelParams.UseItdModel ) { - if ( ( error = LoadBSplineBinaryITD( &HrFiltSet_p->ModelParamsITD, f_hrtf ) ) != IVAS_ERR_OK ) + if ( ( error = TDREND_LoadBSplineBinaryITD( &HrFiltSet_p->ModelParamsITD, f_hrtf ) ) != IVAS_ERR_OK ) { return error; } @@ -740,7 +744,7 @@ static ivas_error LoadBSplineBinary( static ivas_error load_reverb_from_binary( IVAS_DEC_HRTF_STATISTICS_HANDLE hHrtfStatistics, /* i/o: HRTF statistics handle */ - int32_t sampleRate, /* i : sample rate */ + const int32_t sampleRate, /* i : sample rate */ FILE *f_hrtf /* i : HR filter data file handle */ ) { @@ -814,6 +818,15 @@ static ivas_error load_reverb_from_binary( return IVAS_ERROR( IVAS_ERR_FAILED_FILE_READ, "Error in HRTF file reading" ); } } +#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE + else + { + if ( hrtf_header.frequency != sampleRate ) + { + return IVAS_ERR_INVALID_HRTF_SAMPLING_RATE; + } + } +#endif } free( hrtf_data ); @@ -868,7 +881,7 @@ static ivas_error load_reverb_from_binary( ivas_error load_reverb_binary( IVAS_DEC_HRTF_STATISTICS_HANDLE hHrtfStatistics, /* i/o: HRTF statistics handle */ - int32_t sampleRate, /* i : sample rate */ + const int32_t sampleRate, /* i : sample rate */ const hrtfFileReader *hrtfReader /* i/o: pointer to hrtfFileReader handle */ ) { @@ -890,7 +903,10 @@ ivas_error load_reverb_binary( --------------------------------------------------------------------*/ static ivas_error TDREND_MIX_LoadHRTF( - FILE *f_hrtf, /* i/o: File pointer to HRTF file */ + FILE *f_hrtf, /* i/o: File pointer to HRTF file */ +#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE + const int32_t sampleRate, /* i : sample rate */ +#endif IVAS_DEC_HRTF_HANDLE HrFiltSet_p /* o : Loaded HR filter set */ ) { @@ -912,8 +928,6 @@ static ivas_error TDREND_MIX_LoadHRTF( if ( ( header_check_result = read_and_check_hrtf_binary_file_header( &hrtfs_file_header, f_hrtf ) ) != IVAS_ERR_OK ) { - - /* try if it is old format for BE tests*/ fseek( f_hrtf, 0, SEEK_SET ); if ( fread( &tmp, 1, sizeof( int16_t ), f_hrtf ) == 0 ) { @@ -928,7 +942,7 @@ static ivas_error TDREND_MIX_LoadHRTF( } else { - header_check_result = LoadBSplineBinary( HrFiltSet_p, f_hrtf ); + header_check_result = TDREND_LoadBSplineBinary( HrFiltSet_p, f_hrtf ); } return header_check_result; @@ -970,6 +984,15 @@ static ivas_error TDREND_MIX_LoadHRTF( return IVAS_ERROR( IVAS_ERR_FAILED_FILE_READ, "Error in HRTF file reading" ); } } +#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE + else + { + if ( hrtf_header.frequency != sampleRate ) + { + return IVAS_ERR_INVALID_HRTF_SAMPLING_RATE; + } + } +#endif } free( hrtf_data ); @@ -989,7 +1012,7 @@ static ivas_error TDREND_MIX_LoadHRTF( } else { - header_check_result = LoadBSplineBinary( HrFiltSet_p, f_hrtf ); + header_check_result = TDREND_LoadBSplineBinary( HrFiltSet_p, f_hrtf ); } } else @@ -1002,14 +1025,21 @@ static ivas_error TDREND_MIX_LoadHRTF( /*---------------------------------------------------------------------* - * load_HRTF_binary() + * load_TDrend_HRTF_binary() * * Load HRTF binary data into the HRTF handle for TD renderer *---------------------------------------------------------------------*/ +#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE +ivas_error load_TDrend_HRTF_binary( +#else ivas_error load_HRTF_binary( - IVAS_DEC_HRTF_HANDLE hHrtf, /* i/o: HRTF handle */ - const hrtfFileReader *hrtfReader /* i/o: pointer to hrtfFileReader handle */ +#endif + IVAS_DEC_HRTF_HANDLE hHrtf, /* i/o: HRTF handle */ +#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE + const int32_t sampleRate, /* i : sample rate */ +#endif + const hrtfFileReader *hrtfReader /* i : pointer to hrtfFileReader handle */ ) { if ( hrtfReader == NULL || hrtfReader->file == NULL ) @@ -1019,7 +1049,11 @@ ivas_error load_HRTF_binary( fseek( hrtfReader->file, 0, SEEK_SET ); +#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE + return TDREND_MIX_LoadHRTF( hrtfReader->file, sampleRate, hHrtf ); +#else return TDREND_MIX_LoadHRTF( hrtfReader->file, hHrtf ); +#endif } @@ -2097,6 +2131,9 @@ ivas_error load_fastconv_HRTF_from_binary( #else const int16_t room_reverb_flag, /* i : room reverb flag */ const IVAS_AUDIO_CONFIG intern_audio_config, /* i : internal audio configuration */ +#endif +#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE + const int32_t sampleRate, /* i : sample rate */ #endif const hrtfFileReader *hrtfReader /* i : pointer to hrtfFileReader handle */ ) @@ -2174,6 +2211,13 @@ ivas_error load_fastconv_HRTF_from_binary( ( ( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV || hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV_ROOM ) && intern_audio_config == IVAS_AUDIO_CONFIG_INVALID ) ) #endif { +#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE + if ( hrtf_header.frequency != sampleRate ) + { + return IVAS_ERR_INVALID_HRTF_SAMPLING_RATE; + } + +#endif if ( fread( hrtf_data, 1, hrtf_header.data_size, f_hrtf ) != hrtf_header.data_size ) { free( hrtf_data ); @@ -2216,7 +2260,10 @@ ivas_error load_fastconv_HRTF_from_binary( ivas_error load_parambin_HRTF_from_binary( IVAS_DEC_HRTF_PARAMBIN_HANDLE hHrtfParamBin, /* i/o: Parametric binauralizer HRTF handle */ - const hrtfFileReader *hrtfReader /* i : pointer to hrtfFileReader handle */ +#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE + const int32_t sampleRate, /* i : sample rate */ +#endif + const hrtfFileReader *hrtfReader /* i : pointer to hrtfFileReader handle */ ) { FILE *f_hrtf; @@ -2265,8 +2312,16 @@ ivas_error load_parambin_HRTF_from_binary( free( hrtf_data ); return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "HRTF binary file not compliant (number of HRTF)" ); } + if ( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_PARAMETRIC ) /* Parametric binauralizer data is represented as single entity */ { +#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE + if ( hrtf_header.frequency != sampleRate ) + { + return IVAS_ERR_INVALID_HRTF_SAMPLING_RATE; + } + +#endif if ( fread( hrtf_data, 1, hrtf_header.data_size, f_hrtf ) != hrtf_header.data_size ) { free( hrtf_data ); @@ -2311,7 +2366,7 @@ ivas_error load_Crend_HRTF_from_binary( const hrtfFileReader *hrtfReader, /* i : pointer to hrtfFileReader handle */ const IVAS_AUDIO_CONFIG OutputConfig, /* i : output audio configuration */ const IVAS_AUDIO_CONFIG hrtf_set_audio_cfg, /* i : HRTF set audio config. */ - const int32_t output_Fs /* i : Output sampling frequency */ + const int32_t sampleRate /* i : sample rate */ ) #else ivas_error create_SetOfHRTF_from_binary( @@ -2430,7 +2485,13 @@ ivas_error create_SetOfHRTF_from_binary( } } #endif +#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE + if ( hrtf_header.frequency != sampleRate ) + { + return IVAS_ERR_INVALID_HRTF_SAMPLING_RATE; + } +#endif if ( fread( hrtf_data, 1, hrtf_header.data_size, f_hrtf ) != hrtf_header.data_size ) { free( hrtf_data ); @@ -2438,11 +2499,13 @@ ivas_error create_SetOfHRTF_from_binary( } #ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM +#ifndef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE if ( hrtf_header.frequency != output_Fs ) { return IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA; } +#endif if ( ( create_Crend_HRTF_from_rawdata( &hHrtfCrend, hrtf_data ) ) != IVAS_ERR_OK ) { free( hrtf_data ); diff --git a/lib_util/hrtf_file_reader.h b/lib_util/hrtf_file_reader.h index db9b29f65e..ead05ff9e6 100644 --- a/lib_util/hrtf_file_reader.h +++ b/lib_util/hrtf_file_reader.h @@ -80,14 +80,21 @@ void hrtfFileReader_close( ); /*---------------------------------------------------------------------* - * load_HRTF_binary() + * load_TDrend_HRTF_binary() * - * Load HRTF binary data into the HRTF handle + * Load TD renderer HRTF binary data into the HRTF handle *---------------------------------------------------------------------*/ +#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE +ivas_error load_TDrend_HRTF_binary( +#else ivas_error load_HRTF_binary( - IVAS_DEC_HRTF_HANDLE hHrtf, /* i/o: HRTF handle */ - const hrtfFileReader *hrtfReader /* i/o: pointer to hrtfFileReader handle */ +#endif + IVAS_DEC_HRTF_HANDLE hHrtf, /* i/o: HRTF handle */ +#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE + const int32_t sampleRate, /* i : sample rate */ +#endif + const hrtfFileReader *hrtfReader /* i : pointer to hrtfFileReader handle */ ); /*---------------------------------------------------------------------* @@ -98,9 +105,10 @@ ivas_error load_HRTF_binary( ivas_error load_reverb_binary( IVAS_DEC_HRTF_STATISTICS_HANDLE hHrtfStatistics, /* i/o: HRTF statistics handle */ - int32_t sampleRate, /* i : sample rate */ + const int32_t sampleRate, /* i : sample rate */ const hrtfFileReader *hrtfReader /* i/o: pointer to hrtfFileReader handle */ ); + /*---------------------------------------------------------------------* * load_Crend_HRTF_from_binary() * @@ -113,7 +121,7 @@ ivas_error load_Crend_HRTF_from_binary( const hrtfFileReader *hrtfReader, /* i : pointer to hrtfFileReader handle */ const IVAS_AUDIO_CONFIG OutputConfig, /* i : output audio configuration */ const IVAS_AUDIO_CONFIG hrtf_set_audio_cfg, /* i : HRTF set audio config. */ - const int32_t output_Fs /* i : Output sampling frequency */ + const int32_t sampleRate /* i : sample rate */ ); #else ivas_error create_SetOfHRTF_from_binary( @@ -159,6 +167,9 @@ ivas_error load_fastconv_HRTF_from_binary( #else const int16_t room_reverb_flag, /* i : room reverb flag */ IVAS_AUDIO_CONFIG intern_audio_config, /* i : internal audio configuration */ +#endif +#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE + const int32_t sampleRate, /* i : sample rate */ #endif const hrtfFileReader *hrtfReader /* i : pointer to hrtfFileReader handle */ ); @@ -181,7 +192,10 @@ void destroy_fastconv_hrtf( ivas_error load_parambin_HRTF_from_binary( IVAS_DEC_HRTF_PARAMBIN_HANDLE hHrtfParambin, /* i/o: Parambin HRTF handle */ - const hrtfFileReader *hrtfReader /* i : pointer to hrtfFileReader handle */ +#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE + const int32_t sampleRate, /* i : sample rate */ +#endif + const hrtfFileReader *hrtfReader /* i : pointer to hrtfFileReader handle */ ); -- GitLab From b0b95b90e0d557db1d6a19d8cca3e7ee6b832833 Mon Sep 17 00:00:00 2001 From: vaclav Date: Fri, 6 Dec 2024 10:19:13 +0100 Subject: [PATCH 02/36] fix Param and FastConv cases --- apps/decoder.c | 8 -------- apps/renderer.c | 8 -------- lib_util/hrtf_file_reader.c | 12 +++--------- lib_util/hrtf_file_reader.h | 8 +------- 4 files changed, 4 insertions(+), 32 deletions(-) diff --git a/apps/decoder.c b/apps/decoder.c index 9f3cb51889..15b5d69822 100644 --- a/apps/decoder.c +++ b/apps/decoder.c @@ -3844,11 +3844,7 @@ static ivas_error IVAS_DEC_LoadHrtfFromFile( } #ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM -#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE - if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, OutputConfig, hHrtfBinary->hrtf_set_audio_cfg, output_Fs, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK ) -#else if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, OutputConfig, hHrtfBinary->hrtf_set_audio_cfg, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK ) -#endif #else if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, hHrtfBinary->room_reverb_flag, hHrtfBinary->intern_audio_config, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK ) #endif @@ -3874,11 +3870,7 @@ static ivas_error IVAS_DEC_LoadHrtfFromFile( return error; } -#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE - if ( ( error = load_parambin_HRTF_from_binary( *hHrtfParambin, output_Fs, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK ) -#else if ( ( error = load_parambin_HRTF_from_binary( *hHrtfParambin, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK ) -#endif { if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA ) { diff --git a/apps/renderer.c b/apps/renderer.c index 20da0f967f..22ffa4838d 100644 --- a/apps/renderer.c +++ b/apps/renderer.c @@ -972,11 +972,7 @@ int main( } #ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM -#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE - if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, args.outConfig.audioConfig, args.inConfig.ambisonicsBuses->audioConfig, args.sampleRate, hrtfFileReader ) ) != IVAS_ERR_OK ) -#else if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, args.outConfig.audioConfig, args.inConfig.ambisonicsBuses->audioConfig, hrtfFileReader ) ) != IVAS_ERR_OK ) -#endif #else if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, 0, IVAS_AUDIO_CONFIG_INVALID, hrtfFileReader ) ) != IVAS_ERR_OK ) #endif @@ -998,11 +994,7 @@ int main( goto cleanup; } -#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE - if ( ( error = load_parambin_HRTF_from_binary( *hHrtfParambin, args.sampleRate, hrtfFileReader ) ) != IVAS_ERR_OK ) -#else if ( ( error = load_parambin_HRTF_from_binary( *hHrtfParambin, hrtfFileReader ) ) != IVAS_ERR_OK ) -#endif { if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA ) { diff --git a/lib_util/hrtf_file_reader.c b/lib_util/hrtf_file_reader.c index 2660e0a45c..a50b89e70f 100644 --- a/lib_util/hrtf_file_reader.c +++ b/lib_util/hrtf_file_reader.c @@ -2131,9 +2131,6 @@ ivas_error load_fastconv_HRTF_from_binary( #else const int16_t room_reverb_flag, /* i : room reverb flag */ const IVAS_AUDIO_CONFIG intern_audio_config, /* i : internal audio configuration */ -#endif -#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE - const int32_t sampleRate, /* i : sample rate */ #endif const hrtfFileReader *hrtfReader /* i : pointer to hrtfFileReader handle */ ) @@ -2212,7 +2209,7 @@ ivas_error load_fastconv_HRTF_from_binary( #endif { #ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE - if ( hrtf_header.frequency != sampleRate ) + if ( hrtf_header.frequency != 48000 ) /* note: Parametric renderer data are always stored at 48 kHz */ { return IVAS_ERR_INVALID_HRTF_SAMPLING_RATE; } @@ -2260,10 +2257,7 @@ ivas_error load_fastconv_HRTF_from_binary( ivas_error load_parambin_HRTF_from_binary( IVAS_DEC_HRTF_PARAMBIN_HANDLE hHrtfParamBin, /* i/o: Parametric binauralizer HRTF handle */ -#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE - const int32_t sampleRate, /* i : sample rate */ -#endif - const hrtfFileReader *hrtfReader /* i : pointer to hrtfFileReader handle */ + const hrtfFileReader *hrtfReader /* i : pointer to hrtfFileReader handle */ ) { FILE *f_hrtf; @@ -2316,7 +2310,7 @@ ivas_error load_parambin_HRTF_from_binary( if ( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_PARAMETRIC ) /* Parametric binauralizer data is represented as single entity */ { #ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE - if ( hrtf_header.frequency != sampleRate ) + if ( hrtf_header.frequency != 48000 ) /* note: Parametric renderer data are always stored at 48 kHz */ { return IVAS_ERR_INVALID_HRTF_SAMPLING_RATE; } diff --git a/lib_util/hrtf_file_reader.h b/lib_util/hrtf_file_reader.h index ead05ff9e6..b61c0847ba 100644 --- a/lib_util/hrtf_file_reader.h +++ b/lib_util/hrtf_file_reader.h @@ -167,9 +167,6 @@ ivas_error load_fastconv_HRTF_from_binary( #else const int16_t room_reverb_flag, /* i : room reverb flag */ IVAS_AUDIO_CONFIG intern_audio_config, /* i : internal audio configuration */ -#endif -#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE - const int32_t sampleRate, /* i : sample rate */ #endif const hrtfFileReader *hrtfReader /* i : pointer to hrtfFileReader handle */ ); @@ -192,10 +189,7 @@ void destroy_fastconv_hrtf( ivas_error load_parambin_HRTF_from_binary( IVAS_DEC_HRTF_PARAMBIN_HANDLE hHrtfParambin, /* i/o: Parambin HRTF handle */ -#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE - const int32_t sampleRate, /* i : sample rate */ -#endif - const hrtfFileReader *hrtfReader /* i : pointer to hrtfFileReader handle */ + const hrtfFileReader *hrtfReader /* i : pointer to hrtfFileReader handle */ ); -- GitLab From 214277ba0f53b77192149b945817bde292951123 Mon Sep 17 00:00:00 2001 From: vaclav Date: Fri, 6 Dec 2024 12:18:52 +0100 Subject: [PATCH 03/36] update readme files to match the naming conventions and current status --- scripts/binauralRenderer_interface/README.md | 13 +++---------- ...as_crend_sofa_to_rom_table_converter_readme.txt} | 0 2 files changed, 3 insertions(+), 10 deletions(-) rename scripts/binauralRenderer_interface/{mixer_conv_sofa_to_rom_table_converter_readme.txt => ivas_crend_sofa_to_rom_table_converter_readme.txt} (100%) diff --git a/scripts/binauralRenderer_interface/README.md b/scripts/binauralRenderer_interface/README.md index cedfb9841e..822d723797 100644 --- a/scripts/binauralRenderer_interface/README.md +++ b/scripts/binauralRenderer_interface/README.md @@ -27,8 +27,8 @@ accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and the United Nations Convention on Contracts on the International Sales of Goods. --> -# Modeling tool for all IVAS binaural renderer -# Allows to convert SOFA file(s) to rom tables files (*.c|h) or binaural binary file(s) +# Modeling tool for all IVAS binaural renderers +# Allows to convert SOFA file(s) to ROM tables files (*.c|h) or binaural binary file(s) ## Requirements - MATLAB >= R2017b @@ -55,7 +55,7 @@ ``` - `generate_crend_ivas_tables` executable shall be in folder [`../../scripts/binauralRenderer_interface`](../../scripts/binauralRenderer_interface) - On Windows this executable requires DLL from MATLAB, you need to add to your path `*/matlab/version/bin/win64` - - For more details on `generate_crend_ivas_tables` see [`mixer_conv_sofa_to_rom_table_converter_readme.txt`](mixer_conv_sofa_to_rom_table_converter_readme.txt). + - For more details on `generate_crend_ivas_tables` see [`ivas_crend_sofa_to_rom_table_converter_readme.txt`](ivas_crend_sofa_to_rom_table_converter_readme.txt). - On Apple Silicon Mac with Intel MATLAB, it is necessary to add `SET(CMAKE_OSX_ARCHITECTURES "x86_64")` in the `CMakeLists.txt` near the top of the file. This forces the compilation to use Intel architecture instead ofo the native one. - if find_package do not find matlab, at the beginning of the cmakelists.txt file you can set the search path with the folowing line set(Matlab_ROOT_DIR matlab_path), for example on linux set(Matlab_ROOT_DIR ~/MATLAB/R2023b) on mac set(Matlab_ROOT_DIR /Applications/MATLAB_R2023b.app) @@ -109,11 +109,4 @@ See [`scripts/ThirdPartyLegalNotices`](../../scripts/ThirdPartyLegalNotices) for → Generated files are in folder [`binaural_renderers_hrtf_data`](binaural_renderers_hrtf_data) - Generated files : - `ivas_binaural_*kHz.bin`: file containing all tables values for all IVAS binaural renderers for one sample rate. - - `ivas_binaural_td_*kHz.bin`: file containing tables values for IVAS td binaural renderer for one sample rate. - - `ivas_binaural_reverb_*kHz.bin`: file containing tables values for IVAS td reverberation process for one sample rate. - - `ivas_binaural_fastconv_*kHz.bin`: file containing tables values for IVAS fastconv binaural renderers. Files for all sampling rate files are the same. - - `ivas_binaural_parambin_*kHz.bin`: file containing tables values for IVAS prametric binaural renderers. Files for all sampling rate files are the same. - - `ivas_binaural_td_*kHz.bin`: file containing tables values for IVAS td binaural renderers for one sample rate. - - `ivas_binaural_mixconv_hrir_*kHz.bin`: file containing tables values for IVAS mixer conv binaural renderer for HRIR for one sample rate. - - `ivas_binaural_mixconv_brir_*kHz.bin`: file containing tables values for IVAS mixer conv binaural renderer for BRIR for one sample rate. diff --git a/scripts/binauralRenderer_interface/mixer_conv_sofa_to_rom_table_converter_readme.txt b/scripts/binauralRenderer_interface/ivas_crend_sofa_to_rom_table_converter_readme.txt similarity index 100% rename from scripts/binauralRenderer_interface/mixer_conv_sofa_to_rom_table_converter_readme.txt rename to scripts/binauralRenderer_interface/ivas_crend_sofa_to_rom_table_converter_readme.txt -- GitLab From 245b62947a90b26514d309d586f7d1caaa944624 Mon Sep 17 00:00:00 2001 From: vaclav Date: Fri, 6 Dec 2024 12:21:44 +0100 Subject: [PATCH 04/36] remove obsolete MATLAB scripts --- .../fastconv/write_fastconv_binary_data_old.m | 294 ------------------ ...rite_parametric_binauralizer_binary_data.m | 99 ------ 2 files changed, 393 deletions(-) delete mode 100644 scripts/binauralRenderer_interface/fastconv/write_fastconv_binary_data_old.m delete mode 100644 scripts/binauralRenderer_interface/param_bin/write_parametric_binauralizer_binary_data.m diff --git a/scripts/binauralRenderer_interface/fastconv/write_fastconv_binary_data_old.m b/scripts/binauralRenderer_interface/fastconv/write_fastconv_binary_data_old.m deleted file mode 100644 index 3371eef834..0000000000 --- a/scripts/binauralRenderer_interface/fastconv/write_fastconv_binary_data_old.m +++ /dev/null @@ -1,294 +0,0 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, -% Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., -% Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, -% Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other -% contributors to this repository. All Rights Reserved. -% -% This software is protected by copyright law and by international treaties. -% The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, -% Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., -% Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, -% Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other -% contributors to this repository retain full ownership rights in their respective contributions in -% the software. This notice grants no license of any kind, including but not limited to patent -% license, nor is any license granted by implication, estoppel or otherwise. -% -% Contributors are required to enter into the IVAS codec Public Collaboration agreement before making -% contributions. -% -% This software is provided "AS IS", without any express or implied warranties. The software is in the -% development stage. It is intended exclusively for experts who have experience with such software and -% solely for the purpose of inspection. All implied warranties of non-infringement, merchantability -% and fitness for a particular purpose are hereby disclaimed and excluded. -% -% Any dispute, controversy or claim arising under or in relation to providing this software shall be -% submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in -% accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and -% the United Nations Convention on Contracts on the International Sales of Goods. -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -function write_fastconv_binary_data(ivas_path, bin_file, FastConv_SHD_IR_FOA, FastConv_SHD_IR_HOA2, FastConv_SHD_IR_HOA3, FastConv_SD_IR, FastConv_SD_BRIR) -% -% Writes HRIR & BRIR based data for FastConv binaural renderer into a binary file. -% -% write_fastconv_binary_data(rom_file, FastConv_SHD_IR_FOA, FastConv_SHD_IR_HOA2, FastConv_SHD_IR_HOA3, FastConv_SD_IR, FastConv_SD_BRIR) -% -% filename : string -% name of the file to be written -% -% -% Output file format: -% Header [Declaration of the HRTF] -% Renderer type (int32_t) : See "RENDERER_TYPE" -% Decoder output format (int32_t) : See "BINAURAL_INPUT_AUDIO_CONFIG" -% Sampling Frequency (int32_t) -% Raw data size (uint32_t) -% -% HRIRs -% latency_s => float32 -% BINAURAL_CONVBANDS => uint16_t -% num_channels => uint16_t -% BINAURAL_NTAPS => uint16_t -% leftHRIRReal => float32[BINAURAL_CONVBANDS][num_channels][num_taps] -% leftHRIRImag => float32[BINAURAL_CONVBANDS][num_channels][num_taps] -% rightHRIRReal => float32[BINAURAL_CONVBANDS][num_channels][num_taps] -% rightHRIRImag => float32[BINAURAL_CONVBANDS][num_channels][num_taps] -% -% BRIRs -% latency_s => float32 -% num_channels => uint16_t -% BINAURAL_NTAPS_MAX => uint16_t -% leftBRIRReal => float32[BINAURAL_CONVBANDS][num_channels][num_taps] -% leftBRIRImag => float32[BINAURAL_CONVBANDS][num_channels][num_taps] -% rightBRIRReal => float32[BINAURAL_CONVBANDS][num_channels][num_taps] -% rightBRIRImag => float32[BINAURAL_CONVBANDS][num_channels][num_taps] -% CLDFB_NO_CHANNELS_MAX => uint16_t -% fastConvReverberationTimes => float32[CLDFB_NO_CHANNELS_MAX] -% fastConvReverberationEneCorrections => float32[CLDFB_NO_CHANNELS_MAX] -% - -[f_id, err_msg] = fopen(bin_file, 'wb'); - -if f_id == -1 - error('Could not open file %s for writing. Error message:\n%s', filename, err_msg); -end - -%% File header -% We need to get the chunksize of all IRs to get total size -% SHD HRIRs -% FOA -IR = FastConv_SHD_IR_FOA; -[~, binaural_convbands, num_channels, binaural_ntaps] = size(IR.IR); - -header = get_ivas_binary_header(ivas_path,'HRTF_READER_RENDERER_BINAURAL_FASTCONV', ['BINAURAL_INPUT_AUDIO_CONFIG_' IR.order]); -header.chunksize = header.chunksize + 4; % latency_s -header.chunksize = header.chunksize + 2; % BINAURAL_CONVBANDS -header.chunksize = header.chunksize + 2; % num_channels -header.chunksize = header.chunksize + 2; % num_taps -header.chunksize = header.chunksize + 4 * (binaural_convbands * num_channels * binaural_ntaps * 4 ); % HRTF L/R Re/Im - -IR.header = header; -FastConv_SHD_IR_FOA = IR; - -% HOA2 -IR = FastConv_SHD_IR_HOA2; -[~, binaural_convbands, num_channels, binaural_ntaps] = size(IR.IR); - -header = get_ivas_binary_header(ivas_path, 'HRTF_READER_RENDERER_BINAURAL_FASTCONV', ['BINAURAL_INPUT_AUDIO_CONFIG_' IR.order]); -header.chunksize = header.chunksize + 4; % latency_s -header.chunksize = header.chunksize + 2; % BINAURAL_CONVBANDS -header.chunksize = header.chunksize + 2; % num_channels -header.chunksize = header.chunksize + 2; % num_taps -header.chunksize = header.chunksize + 4 * (binaural_convbands * num_channels * binaural_ntaps * 4 ); % HRTF L/R Re/Im - -IR.header = header; -FastConv_SHD_IR_HOA2 = IR; - -% HOA3 -IR = FastConv_SHD_IR_HOA3; -[~, binaural_convbands, num_channels, binaural_ntaps] = size(IR.IR); - -header = get_ivas_binary_header(ivas_path, 'HRTF_READER_RENDERER_BINAURAL_FASTCONV', ['BINAURAL_INPUT_AUDIO_CONFIG_' IR.order]); -header.chunksize = header.chunksize + 4; % latency_s -header.chunksize = header.chunksize + 2; % BINAURAL_CONVBANDS -header.chunksize = header.chunksize + 2; % num_channels -header.chunksize = header.chunksize + 2; % num_taps -header.chunksize = header.chunksize + 4 * (binaural_convbands * num_channels * binaural_ntaps * 4 ); % HRTF L/R Re/Im - -IR.header = header; -FastConv_SHD_IR_HOA3 = IR; - -% SD HRIRs -IR = FastConv_SD_IR; -[~, binaural_convbands, num_channels, binaural_ntaps] = size(IR.IR); - -header = get_ivas_binary_header(ivas_path, 'HRTF_READER_RENDERER_BINAURAL_FASTCONV', 'BINAURAL_INPUT_AUDIO_CONFIG_COMBINED'); -header.chunksize = header.chunksize + 4; % latency_s -header.chunksize = header.chunksize + 2; % BINAURAL_CONVBANDS -header.chunksize = header.chunksize + 2; % num_channels -header.chunksize = header.chunksize + 2; % num_taps -header.chunksize = header.chunksize + 4 * (binaural_convbands * num_channels * binaural_ntaps * 4 ); % HRTF L/R Re/Im - -IR.header = header; -FastConv_SD_IR = IR; - -% SD BRIRs -IR = FastConv_SD_BRIR; -[~, binaural_convbands, num_channels, ~] = size(IR.IR); -cldfb_no_channels_max = IR.rev_param.kAna; - -header = get_ivas_binary_header(ivas_path, 'HRTF_READER_RENDERER_BINAURAL_FASTCONV_ROOM', 'BINAURAL_INPUT_AUDIO_CONFIG_COMBINED'); -header.chunksize = header.chunksize + 4; % latency_s -header.chunksize = header.chunksize + 2; % BINAURAL_CONVBANDS -header.chunksize = header.chunksize + 2; % num_channels -header.chunksize = header.chunksize + 2; % num_taps -header.chunksize = header.chunksize + 4 * (binaural_convbands * num_channels * IR.rev_param.NFilter * 4 ); % HRTF L/R Re/Im -header.chunksize = header.chunksize + 2; % CLDFB_NO_CHANNELS_MAX -header.chunksize = header.chunksize + cldfb_no_channels_max * 4; % rt60 -header.chunksize = header.chunksize + cldfb_no_channels_max * 4; % nrgLr - -IR.header = header; -FastConv_SD_BRIR = IR; - -% calculate the size of all chunks -HRTFs = {FastConv_SHD_IR_FOA, FastConv_SHD_IR_HOA2, FastConv_SHD_IR_HOA3, FastConv_SD_IR, FastConv_SD_BRIR}; -hrtf_data_size = 0; -total_file_size = 0; -for i = 1:length(HRTFs) - hrtf_data_size = hrtf_data_size + HRTFs{i}.header.chunksize; - total_file_size = total_file_size + 4 * 4; % chunk header 4 (u)int32 values -end - -total_file_size = total_file_size + 8; % 'IVASHRTF' (char[8]) -total_file_size = total_file_size + 4; % file size (int32) -total_file_size = total_file_size + 2; % number of HRTFs in file (int16) -total_file_size = total_file_size + 4; % HRTF size (int32) -total_file_size = total_file_size + hrtf_data_size; % size of all HRTF data chunks - -fwrite(f_id, 'IVASHRTF', 'char'); % identifier -fwrite(f_id, total_file_size, 'int32'); % file size -fwrite(f_id, length(HRTFs), 'int16'); % number of HRTFs -fwrite(f_id, hrtf_data_size, 'int32'); % max data size (bytes to read after this header) - -%% HRIRs - -% SHD HRIRs -SHD_HRIRs = {FastConv_SHD_IR_FOA, FastConv_SHD_IR_HOA2, FastConv_SHD_IR_HOA3}; -for i = 1:length(SHD_HRIRs) - IR = SHD_HRIRs{i}; - [~, binaural_convbands, num_channels, binaural_ntaps] = size(IR.IR); - - % write header for this chunk - fwrite(f_id, IR.header.renderer_type, 'int32'); - fwrite(f_id, IR.header.in_fmt, 'int32'); - fwrite(f_id, IR.header.fs, 'int32'); - fwrite(f_id, IR.header.chunksize, 'uint32'); - - fwrite(f_id, IR.latency_s, 'float32'); - fwrite(f_id, binaural_convbands, 'uint16'); - fwrite(f_id, num_channels, 'uint16'); - fwrite(f_id, binaural_ntaps, 'uint16'); - - for band = 1:binaural_convbands - for ch = 1:num_channels - fwrite(f_id, real(squeeze(IR.IR(1, band, ch, :))), 'float32'); - end - end - for band = 1:binaural_convbands - for ch = 1:num_channels - fwrite(f_id, imag(squeeze(IR.IR(1, band, ch, :))), 'float32'); - end - end - for band = 1:binaural_convbands - for ch = 1:num_channels - fwrite(f_id, real(squeeze(IR.IR(2, band, ch, :))), 'float32'); - end - end - for band = 1:binaural_convbands - for ch = 1:num_channels - fwrite(f_id, imag(squeeze(IR.IR(2, band, ch, :))), 'float32'); - end - end -end - -% SD HRIRs -IR = FastConv_SD_IR; -[~, binaural_convbands, num_channels, binaural_ntaps] = size(IR.IR); - -% write header for this chunk -fwrite(f_id, IR.header.renderer_type, 'int32'); -fwrite(f_id, IR.header.in_fmt, 'int32'); -fwrite(f_id, IR.header.fs, 'int32'); -fwrite(f_id, IR.header.chunksize, 'uint32'); - -fwrite(f_id, IR.latency_s, 'float32'); -fwrite(f_id, binaural_convbands, 'uint16'); -fwrite(f_id, num_channels, 'uint16'); -fwrite(f_id, binaural_ntaps, 'uint16'); -for band = 1:binaural_convbands - for ch = 1:num_channels - fwrite(f_id, real(squeeze(IR.IR(1, band, ch, :))), 'float32'); - end -end -for band = 1:binaural_convbands - for ch = 1:num_channels - fwrite(f_id, imag(squeeze(IR.IR(1, band, ch, :))), 'float32'); - end -end -for band = 1:binaural_convbands - for ch = 1:num_channels - fwrite(f_id, real(squeeze(IR.IR(2, band, ch, :))), 'float32'); - end -end -for band = 1:binaural_convbands - for ch = 1:num_channels - fwrite(f_id, imag(squeeze(IR.IR(2, band, ch, :))), 'float32'); - end -end - - -% SD BRIRs -IR = FastConv_SD_BRIR; -[~, binaural_convbands, num_channels, ~] = size(IR.IR); -cldfb_no_channels_max = IR.rev_param.kAna; - -% write header for this chunk -fwrite(f_id, IR.header.renderer_type, 'int32'); -fwrite(f_id, IR.header.in_fmt, 'int32'); -fwrite(f_id, IR.header.fs, 'int32'); -fwrite(f_id, IR.header.chunksize, 'uint32'); - -fwrite(f_id, IR.rev_param.latency_s, 'float32'); -fwrite(f_id, binaural_convbands, 'uint16'); -fwrite(f_id, num_channels, 'uint16'); -fwrite(f_id, IR.rev_param.NFilter, 'uint16'); -for band = 1:binaural_convbands - for ch = 1:num_channels - fwrite(f_id, real(squeeze(IR.IR(1, band, ch, 1:IR.rev_param.NFilter))), 'float32' ); - end -end -for band = 1:binaural_convbands - for ch = 1:num_channels - fwrite(f_id, imag(squeeze(IR.IR(1, band, ch, 1:IR.rev_param.NFilter))), 'float32' ); - end -end -for band = 1:binaural_convbands - for ch = 1:num_channels - fwrite(f_id, real(squeeze(IR.IR(2, band, ch, 1:IR.rev_param.NFilter))), 'float32' ); - end -end -for band = 1:binaural_convbands - for ch = 1:num_channels - fwrite(f_id, imag(squeeze(IR.IR(2, band, ch, 1:IR.rev_param.NFilter))), 'float32' ); - end -end - -fwrite(f_id, cldfb_no_channels_max, 'uint16'); -fwrite(f_id, IR.rev_param.rt60, 'float32'); -fwrite(f_id, IR.rev_param.nrgLr, 'float32'); - -fclose(f_id); - -end \ No newline at end of file diff --git a/scripts/binauralRenderer_interface/param_bin/write_parametric_binauralizer_binary_data.m b/scripts/binauralRenderer_interface/param_bin/write_parametric_binauralizer_binary_data.m deleted file mode 100644 index 21c013120a..0000000000 --- a/scripts/binauralRenderer_interface/param_bin/write_parametric_binauralizer_binary_data.m +++ /dev/null @@ -1,99 +0,0 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, -% Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., -% Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, -% Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other -% contributors to this repository. All Rights Reserved. -% -% This software is protected by copyright law and by international treaties. -% The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, -% Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., -% Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, -% Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other -% contributors to this repository retain full ownership rights in their respective contributions in -% the software. This notice grants no license of any kind, including but not limited to patent -% license, nor is any license granted by implication, estoppel or otherwise. -% -% Contributors are required to enter into the IVAS codec Public Collaboration agreement before making -% contributions. -% -% This software is provided "AS IS", without any express or implied warranties. The software is in the -% development stage. It is intended exclusively for experts who have experience with such software and -% solely for the purpose of inspection. All implied warranties of non-infringement, merchantability -% and fitness for a particular purpose are hereby disclaimed and excluded. -% -% Any dispute, controversy or claim arising under or in relation to providing this software shall be -% submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in -% accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and -% the United Nations Convention on Contracts on the International Sales of Goods. -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - -function write_parametric_binauralizer_binary_data(filename, SHhrtf, T60, late_enes, early_enes) -% -% Writes HRIR & BRIR based data for parametric binauralizer into a binary file. -% -% write_parametric_binauralizer_binary_data(filename, SHhrtf, T60, late_enes, early_enes) -% -% filename : string -% name of the file to be written -% SHhrtf : array of shape (2, 16, 60) i.e., (BINAURAL_CHANNELS, HRTF_SH_CHANNELS, HRTF_NUM_BINS), complex-valued -% HRTF coefficients -% T60 : array of shape (60, 1), i.e., (CLDFB_NO_CHANNELS_MAX, 1), double -% late_enes : array of shape (1, 60), i.e., (1, CLDFB_NO_CHANNELS_MAX), double -% early_enes : array of shape (1, 60), i.e., (1, CLDFB_NO_CHANNELS_MAX), double -% -% -% Output file format: -% HRTFs -% HRTF_SH_CHANNELS => uint16_t -% HRTF_NUM_BINS => uint16_t -% hrtfShCoeffsRe => float[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS]; -% hrtfShCoeffsIm => float[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS]; -% -% BRIR-based reverb -% CLDFB_NO_CHANNELS_MAX => uint16_t -% parametricReverberationTimes => float[CLDFB_NO_CHANNELS_MAX]; -% parametricReverberationEneCorrections => float[CLDFB_NO_CHANNELS_MAX]; -% parametricEarlyPartEneCorrection => float[CLDFB_NO_CHANNELS_MAX]; -% - -[f_id, err_msg] = fopen(filename, 'wb'); - -if f_id == -1 - error('Could not open file %s for writing. Error message:\n%s', filename, err_msg); -end - -% HRTFs -n_chnls_bin = 2; -hrtf_sh_channels = size(SHhrtf, 2); -hrtf_num_bins = size(SHhrtf, 3); - -fwrite(f_id, hrtf_sh_channels, 'uint16'); -fwrite(f_id, hrtf_num_bins, 'uint16'); - -% hrtfShCoeffsRe -for bin_chnl_idx = 1:n_chnls_bin - for hrtf_chnl_idx = 1:hrtf_sh_channels - fwrite(f_id, real(SHhrtf(bin_chnl_idx, hrtf_chnl_idx, :)), 'float32'); % HRTF_NUM_BINS elements - end -end - -% hrtfShCoeffsIm -for bin_chnl_idx = 1:n_chnls_bin - for hrtf_chnl_idx = 1:hrtf_sh_channels - fwrite(f_id, imag(SHhrtf(bin_chnl_idx, hrtf_chnl_idx, :)), 'float32'); % HRTF_NUM_BINS elements - end -end - -% BRIR-based reverb -cldfb_no_channels_max = size(T60, 1); - -fwrite(f_id, cldfb_no_channels_max, 'uint16'); -fwrite(f_id, T60, 'float32'); % parametricReverberationTimes -fwrite(f_id, late_enes, 'float32'); % parametricReverberationEneCorrections -fwrite(f_id, early_enes, 'float32'); % parametricEarlyPartEneCorrection - -fclose(f_id); -- GitLab From 4c0c556b9739e531efe6402ded5fa04998157ef7 Mon Sep 17 00:00:00 2001 From: vaclav Date: Fri, 6 Dec 2024 12:24:40 +0100 Subject: [PATCH 05/36] define BINAURAL_INPUT_AUDIO_CONFIG enum only at one place --- lib_util/hrtf_file_reader.c | 13 ------------- lib_util/hrtf_file_reader.h | 15 +++++++++++++++ .../generate_tables_from_rom_to_bin.c | 15 --------------- 3 files changed, 15 insertions(+), 28 deletions(-) diff --git a/lib_util/hrtf_file_reader.c b/lib_util/hrtf_file_reader.c index a50b89e70f..f3517edd30 100644 --- a/lib_util/hrtf_file_reader.c +++ b/lib_util/hrtf_file_reader.c @@ -56,19 +56,6 @@ typedef struct ivas_hrtfs_file_header_t } ivas_hrtfs_file_header_t; -#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM -typedef enum -{ - BINAURAL_INPUT_AUDIO_CONFIG_INVALID, - BINAURAL_INPUT_AUDIO_CONFIG_COMBINED, /* 5_1, 5_1_2, 5_1_4, 7_1, 7_1_4 */ - BINAURAL_INPUT_AUDIO_CONFIG_HOA3, /* HOA3 */ - BINAURAL_INPUT_AUDIO_CONFIG_HOA2, /* HOA2 */ - BINAURAL_INPUT_AUDIO_CONFIG_FOA, /* FOA */ - BINAURAL_INPUT_AUDIO_CONFIG_UNDEFINED /* Not used */ - -} BINAURAL_INPUT_AUDIO_CONFIG; - -#endif /*---------------------------------------------------------------------* * hrtfFileReader_open() diff --git a/lib_util/hrtf_file_reader.h b/lib_util/hrtf_file_reader.h index b61c0847ba..b27a42cf9f 100644 --- a/lib_util/hrtf_file_reader.h +++ b/lib_util/hrtf_file_reader.h @@ -35,6 +35,7 @@ #include "common_api_types.h" + typedef struct hrtfFileReader hrtfFileReader; typedef enum @@ -47,8 +48,22 @@ typedef enum HRTF_READER_RENDERER_BINAURAL_MIXER_CONV, HRTF_READER_RENDERER_BINAURAL_MIXER_CONV_ROOM, HRTF_READER_RENDERER_BINAURAL_REVERB_ALL + } HRTF_READER_RENDERER_TYPE; +#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM +typedef enum +{ + BINAURAL_INPUT_AUDIO_CONFIG_INVALID, + BINAURAL_INPUT_AUDIO_CONFIG_COMBINED, /* 5_1, 5_1_2, 5_1_4, 7_1, 7_1_4 */ + BINAURAL_INPUT_AUDIO_CONFIG_HOA3, /* HOA3 */ + BINAURAL_INPUT_AUDIO_CONFIG_HOA2, /* HOA2 */ + BINAURAL_INPUT_AUDIO_CONFIG_FOA, /* FOA */ + BINAURAL_INPUT_AUDIO_CONFIG_UNDEFINED /* Not used */ + +} BINAURAL_INPUT_AUDIO_CONFIG; + +#endif typedef struct ivas_hrtfs_header_t { int32_t rend_type; diff --git a/scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c b/scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c index c9a5d6df5c..a7cc7d7574 100644 --- a/scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c +++ b/scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c @@ -73,21 +73,6 @@ const HRTF_READER_RENDERER_TYPE rend_types[IVAS_NB_RENDERER_TYPE] = { HRTF_READER_RENDERER_BINAURAL_REVERB_ALL }; -#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM -typedef enum -{ - BINAURAL_INPUT_AUDIO_CONFIG_INVALID, - BINAURAL_INPUT_AUDIO_CONFIG_COMBINED, /* 5_1, 5_1_2, 5_1_4, 7_1, 7_1_4 */ - BINAURAL_INPUT_AUDIO_CONFIG_HOA3, /* HOA3 */ - BINAURAL_INPUT_AUDIO_CONFIG_HOA2, /* HOA2 */ - BINAURAL_INPUT_AUDIO_CONFIG_FOA, /* FOA */ - BINAURAL_INPUT_AUDIO_CONFIG_UNDEFINED /* Not used */ - -} BINAURAL_INPUT_AUDIO_CONFIG; - -#endif - - const BINAURAL_INPUT_AUDIO_CONFIG input_cfgs[IVAS_NB_AUDIO_CONFIG] = { BINAURAL_INPUT_AUDIO_CONFIG_COMBINED, BINAURAL_INPUT_AUDIO_CONFIG_HOA3, -- GitLab From a7365b5b794543f4306a1ac26f7d20d81a5e77bd Mon Sep 17 00:00:00 2001 From: vaclav Date: Fri, 6 Dec 2024 12:26:31 +0100 Subject: [PATCH 06/36] merge FIX_1228_HRTF_STATISTICS into FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE --- apps/decoder.c | 2 +- lib_com/options.h | 2 +- lib_dec/lib_dec.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/decoder.c b/apps/decoder.c index 15b5d69822..4db62d0f1e 100644 --- a/apps/decoder.c +++ b/apps/decoder.c @@ -3885,7 +3885,7 @@ static ivas_error IVAS_DEC_LoadHrtfFromFile( } } -#ifdef FIX_1228_HRTF_STATISTICS +#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE if ( hHrtfBinary->hHrtfStatistics == NULL && ( binaural_renderer == IVAS_BIN_RENDERER_TYPE_FASTCONV || binaural_renderer == IVAS_BIN_RENDERER_TYPE_CREND ) && OutputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) #else if ( hHrtfBinary->hHrtfStatistics == NULL ) diff --git a/lib_com/options.h b/lib_com/options.h index af0ae671f6..059877b9b2 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -164,7 +164,7 @@ #define FIX_1227_Crend_HRTF_LOADING_OPTIM /* VA: issue 1227: for Crend binaural renderer in decoder, load only HTRT coefficient set that is needed */ #define FIX_1222_OMASA_DEC_CHANNEL_BUFFERS /* VA: issue 1222: Reduction of the number of channel buffers in OMASA decoder */ #define FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE /* VA: issue 1228: Exit the processing when a HRTF binary file with wrong sampling rate is provided */ -#define FIX_1228_HRTF_STATISTICS /* VA: issue 1228: allocate 'HRTFstatistics' handle only when needed */ + /* #################### End BE switches ################################## */ diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c index 044c47e3bf..8ac62b87c3 100644 --- a/lib_dec/lib_dec.c +++ b/lib_dec/lib_dec.c @@ -2867,7 +2867,7 @@ ivas_error IVAS_DEC_HRTF_binary_open( } } -#ifdef FIX_1228_HRTF_STATISTICS +#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE if ( st_ivas->hHrtfStatistics == NULL && ( binaural_renderer == IVAS_BIN_RENDERER_TYPE_FASTCONV || binaural_renderer == IVAS_BIN_RENDERER_TYPE_CREND ) && st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) #else if ( st_ivas->hHrtfStatistics == NULL ) -- GitLab From f41a5e48b0e1c4d4f1e3d56d22c53cd61588504b Mon Sep 17 00:00:00 2001 From: Charles Kinuthia Date: Fri, 6 Dec 2024 14:22:40 +0100 Subject: [PATCH 07/36] add missing ism modes with extended metadata --- scripts/self_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/self_test.py b/scripts/self_test.py index 7688fc50f9..47940aec6b 100755 --- a/scripts/self_test.py +++ b/scripts/self_test.py @@ -63,7 +63,7 @@ MODES = { "5_1_4": "5_1_4", "7_1_4": "7_1_4", }, - "-ISM": {"1": "ISM1", "2": "ISM2", "3": "ISM3", "4": "ISM4", "+4": "ISM+4"}, + "-ISM": {"1": "ISM1", "2": "ISM2", "3": "ISM3", "4": "ISM4", "+1": "ISM+1", "+2": "ISM+2", "+3": "ISM3", "+4": "ISM+4"}, "-SBA": { "-3": "HOA3", "3": "HOA3", -- GitLab From 7c344b3b2b3278ca8225c0da52e074a74df64e49 Mon Sep 17 00:00:00 2001 From: Vladimir Malenovsky Date: Mon, 9 Dec 2024 10:47:33 +0100 Subject: [PATCH 08/36] copy over .c files to avoid des-instrumentation by the WMC tool --- scripts/prepare_instrumentation.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/scripts/prepare_instrumentation.sh b/scripts/prepare_instrumentation.sh index f72c3f28d5..2432e969e6 100755 --- a/scripts/prepare_instrumentation.sh +++ b/scripts/prepare_instrumentation.sh @@ -185,14 +185,18 @@ shopt -u extglob find $targetdir -name "*.[ch]" -exec sed -i.bak -e "s/\(0x[0-9a-fA-F]*\)UL/\(\(unsigned long\)\1\)/" \{\} \; # run wmc_tool -"tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/encoder.c" "$targetdir/lib_enc/*.c" "$targetdir/lib_com/*.c" >> /dev/null -"tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/decoder.c" "$targetdir/lib_dec/*.c" "$targetdir/lib_rend/*.c" >> /dev/null +"tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/encoder.c" "$targetdir/lib_enc/*.c" "$targetdir/lib_com/*.c" +"tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/decoder.c" "$targetdir/lib_dec/*.c" "$targetdir/lib_rend/*.c" # ISAR post-renderer and lc3plus sources only need to be instrumented in float code if [ "$PROJECT" = "FLOAT" ]; then - "tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/renderer.c" "$targetdir/lib_rend/*.c" "$targetdir/lib_lc3plus/*.c" "$targetdir/lib_lc3plus/fft/*.c" >> /dev/null - "tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/isar_post_rend.c" "$targetdir/lib_isar/*.c" "$targetdir/lib_lc3plus/*.c" "$targetdir/lib_lc3plus/fft/*.c" >> /dev/null + cp -R ../lib_rend/*.c $targetdir/lib_rend # copy over fresh .c files to avoid time-consuming des-instrumentation of files by the WMC tool + "tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/renderer.c" "$targetdir/lib_rend/*.c" "$targetdir/lib_lc3plus/*.c" "$targetdir/lib_lc3plus/fft/*.c" + cp -R ../lib_lc3plus/*.c $targetdir/lib_lc3plus # copy over fresh .c files to avoid time-consuming des-instrumentation of files by the WMC tool + cp -R ../lib_lc3plus/fft/*.c $targetdir/lib_lc3plus/fft # copy over fresh .c files to avoid time-consuming des-instrumentation of files by the WMC tool + "tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/isar_post_rend.c" "$targetdir/lib_isar/*.c" "$targetdir/lib_lc3plus/*.c" "$targetdir/lib_lc3plus/fft/*.c" else - "tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/renderer.c" "$targetdir/lib_rend/*.c" >> /dev/null + cp -R ../lib_rend/*.c $targetdir/lib_rend # copy over fresh .c files to avoid time-consuming des-instrumentation of files by the WMC tool + "tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/renderer.c" "$targetdir/lib_rend/*.c" fi # automatically enable #define WMOPS in options.h -- GitLab From 6443f22c8ce3219449d19a1dbbaa6165d9256c41 Mon Sep 17 00:00:00 2001 From: Vladimir Malenovsky Date: Mon, 9 Dec 2024 12:23:35 +0100 Subject: [PATCH 09/36] accidentally removed >> dev/null --- scripts/prepare_instrumentation.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/prepare_instrumentation.sh b/scripts/prepare_instrumentation.sh index 2432e969e6..832d6ce670 100755 --- a/scripts/prepare_instrumentation.sh +++ b/scripts/prepare_instrumentation.sh @@ -185,18 +185,18 @@ shopt -u extglob find $targetdir -name "*.[ch]" -exec sed -i.bak -e "s/\(0x[0-9a-fA-F]*\)UL/\(\(unsigned long\)\1\)/" \{\} \; # run wmc_tool -"tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/encoder.c" "$targetdir/lib_enc/*.c" "$targetdir/lib_com/*.c" -"tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/decoder.c" "$targetdir/lib_dec/*.c" "$targetdir/lib_rend/*.c" +"tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/encoder.c" "$targetdir/lib_enc/*.c" "$targetdir/lib_com/*.c" >> /dev/null +"tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/decoder.c" "$targetdir/lib_dec/*.c" "$targetdir/lib_rend/*.c" >> /dev/null # ISAR post-renderer and lc3plus sources only need to be instrumented in float code if [ "$PROJECT" = "FLOAT" ]; then cp -R ../lib_rend/*.c $targetdir/lib_rend # copy over fresh .c files to avoid time-consuming des-instrumentation of files by the WMC tool - "tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/renderer.c" "$targetdir/lib_rend/*.c" "$targetdir/lib_lc3plus/*.c" "$targetdir/lib_lc3plus/fft/*.c" + "tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/renderer.c" "$targetdir/lib_rend/*.c" "$targetdir/lib_lc3plus/*.c" "$targetdir/lib_lc3plus/fft/*.c" >> /dev/null cp -R ../lib_lc3plus/*.c $targetdir/lib_lc3plus # copy over fresh .c files to avoid time-consuming des-instrumentation of files by the WMC tool cp -R ../lib_lc3plus/fft/*.c $targetdir/lib_lc3plus/fft # copy over fresh .c files to avoid time-consuming des-instrumentation of files by the WMC tool - "tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/isar_post_rend.c" "$targetdir/lib_isar/*.c" "$targetdir/lib_lc3plus/*.c" "$targetdir/lib_lc3plus/fft/*.c" + "tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/isar_post_rend.c" "$targetdir/lib_isar/*.c" "$targetdir/lib_lc3plus/*.c" "$targetdir/lib_lc3plus/fft/*.c" >> /dev/null else cp -R ../lib_rend/*.c $targetdir/lib_rend # copy over fresh .c files to avoid time-consuming des-instrumentation of files by the WMC tool - "tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/renderer.c" "$targetdir/lib_rend/*.c" + "tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/renderer.c" "$targetdir/lib_rend/*.c" >> /dev/null fi # automatically enable #define WMOPS in options.h -- GitLab From ef53480d9b7105d3b087f01315802dbeb65058ea Mon Sep 17 00:00:00 2001 From: Vladimir Malenovsky Date: Mon, 9 Dec 2024 15:01:30 +0100 Subject: [PATCH 10/36] rename *.bak instead of copying fresh .c files --- scripts/prepare_instrumentation.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/prepare_instrumentation.sh b/scripts/prepare_instrumentation.sh index 832d6ce670..4ed7098442 100755 --- a/scripts/prepare_instrumentation.sh +++ b/scripts/prepare_instrumentation.sh @@ -189,13 +189,13 @@ find $targetdir -name "*.[ch]" -exec sed -i.bak -e "s/\(0x[0-9a-fA-F]*\)UL/\(\(u "tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/decoder.c" "$targetdir/lib_dec/*.c" "$targetdir/lib_rend/*.c" >> /dev/null # ISAR post-renderer and lc3plus sources only need to be instrumented in float code if [ "$PROJECT" = "FLOAT" ]; then - cp -R ../lib_rend/*.c $targetdir/lib_rend # copy over fresh .c files to avoid time-consuming des-instrumentation of files by the WMC tool + for bak_file in $targetdir/lib_rend/*.bak; do mv "$bak_file" "${bak_file%.*}"; done # restore fresh .c files to avoid time-consuming des-instrumentation of files by the WMC tool "tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/renderer.c" "$targetdir/lib_rend/*.c" "$targetdir/lib_lc3plus/*.c" "$targetdir/lib_lc3plus/fft/*.c" >> /dev/null - cp -R ../lib_lc3plus/*.c $targetdir/lib_lc3plus # copy over fresh .c files to avoid time-consuming des-instrumentation of files by the WMC tool - cp -R ../lib_lc3plus/fft/*.c $targetdir/lib_lc3plus/fft # copy over fresh .c files to avoid time-consuming des-instrumentation of files by the WMC tool + for bak_file in $targetdir/lib_lc3plus/*.bak; do mv "$bak_file" "${bak_file%.*}"; done # restore fresh .c files to avoid time-consuming des-instrumentation of files by the WMC tool + for bak_file in $targetdir/lib_lc3plus/fft/*.bak; do mv "$bak_file" "${bak_file%.*}"; done # restore fresh .c files to avoid time-consuming des-instrumentation of files by the WMC tool "tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/isar_post_rend.c" "$targetdir/lib_isar/*.c" "$targetdir/lib_lc3plus/*.c" "$targetdir/lib_lc3plus/fft/*.c" >> /dev/null else - cp -R ../lib_rend/*.c $targetdir/lib_rend # copy over fresh .c files to avoid time-consuming des-instrumentation of files by the WMC tool + for bak_file in $targetdir/lib_rend/*.bak; do mv "$bak_file" "${bak_file%.*}"; done # restore fresh .c files to avoid time-consuming des-instrumentation of files by the WMC tool "tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/renderer.c" "$targetdir/lib_rend/*.c" >> /dev/null fi -- GitLab From 79473234d023f498b44f4083b0e8c1296f26220d Mon Sep 17 00:00:00 2001 From: Charles Kinuthia Date: Tue, 10 Dec 2024 08:24:07 +0100 Subject: [PATCH 11/36] fix typo '+3' now maps to ISM+3 --- scripts/self_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/self_test.py b/scripts/self_test.py index 47940aec6b..501c7200f7 100755 --- a/scripts/self_test.py +++ b/scripts/self_test.py @@ -63,7 +63,7 @@ MODES = { "5_1_4": "5_1_4", "7_1_4": "7_1_4", }, - "-ISM": {"1": "ISM1", "2": "ISM2", "3": "ISM3", "4": "ISM4", "+1": "ISM+1", "+2": "ISM+2", "+3": "ISM3", "+4": "ISM+4"}, + "-ISM": {"1": "ISM1", "2": "ISM2", "3": "ISM3", "4": "ISM4", "+1": "ISM+1", "+2": "ISM+2", "+3": "ISM+3", "+4": "ISM+4"}, "-SBA": { "-3": "HOA3", "3": "HOA3", -- GitLab From e18cb771e69a142f223988e2b1918d998f72e74c Mon Sep 17 00:00:00 2001 From: vaclav Date: Tue, 10 Dec 2024 08:35:49 +0100 Subject: [PATCH 12/36] correct command-line in self_test.prm --- scripts/config/self_test.prm | 4 ++-- scripts/config/self_test_ltv.prm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/config/self_test.prm b/scripts/config/self_test.prm index ce1b05b845..26197f434d 100644 --- a/scripts/config/self_test.prm +++ b/scripts/config/self_test.prm @@ -567,11 +567,11 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 ../IVAS_dec BINAURAL 48 bit testv/stv+4ISM48n+non_diegetic_pan.wav_brate_256000-48_DTX_binaural.tst // 4 ISM with extended metadata at 128 kbps, 48 kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out, rendconf dir w id -../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 128000 48 testv/stv4ISM48n.wav bit +../IVAS_cod -ism +4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 128000 48 testv/stv4ISM48n.wav bit ../IVAS_dec -render_config testv/rend_config_combined.cfg -dpid 3 0 2 1 BINAURAL_ROOM_REVERB 48 bit testv/stv4ISM48n+combined_render_config_brate_128000-48-binaural_room_reverb.wav // 4 ISM with extended metadata at 128 kbps, 48 kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out -../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 128000 48 testv/stv4ISM48n.wav bit +../IVAS_cod -ism +4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 128000 48 testv/stv4ISM48n.wav bit ../IVAS_dec BINAURAL_ROOM_REVERB 48 bit testv/stv4ISM48n.wav_BINAURAL_ROOM_REVERB_128000_48-48.tst diff --git a/scripts/config/self_test_ltv.prm b/scripts/config/self_test_ltv.prm index 55ab4fb49e..fce8ba29d4 100644 --- a/scripts/config/self_test_ltv.prm +++ b/scripts/config/self_test_ltv.prm @@ -566,11 +566,11 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 ../IVAS_dec BINAURAL 48 bit testv/ltv48_4ISM_non_diegetic_pan.wav_brate_256000-48_DTX_binaural.tst // 4 ISM with extended metadata at 128 kbps, 48 kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out, rendconf dir w id -../IVAS_cod -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 128000 48 testv/ltv48_4ISM.wav bit +../IVAS_cod -ism +4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 128000 48 testv/ltv48_4ISM.wav bit ../IVAS_dec -render_config testv/rend_config_combined.cfg -dpid 0 0 0 0 BINAURAL_ROOM_REVERB 48 bit testv/ltv48_4ISM+combined_render_config_brate_128000-48-binaural_room_reverb.wav // 4 ISM with extended metadata at 128 kbps, 48 kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out -../IVAS_cod -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 128000 48 testv/ltv48_4ISM.wav bit +../IVAS_cod -ism +4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 128000 48 testv/ltv48_4ISM.wav bit ../IVAS_dec BINAURAL_ROOM_REVERB 48 bit testv/ltv48_4ISM.wav_BINAURAL_ROOM_REVERB_128000-48-48.tst -- GitLab From eb9213a5d4fb9490cae5eb729fe6bd660b256afe Mon Sep 17 00:00:00 2001 From: malenov Date: Tue, 10 Dec 2024 09:56:27 +0100 Subject: [PATCH 13/36] put {} in the empty-body 'for' loop to be properly instrumented --- lib_lc3plus/fft/cfft.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib_lc3plus/fft/cfft.c b/lib_lc3plus/fft/cfft.c index 6ec89eb299..d796f0a213 100644 --- a/lib_lc3plus/fft/cfft.c +++ b/lib_lc3plus/fft/cfft.c @@ -126,13 +126,13 @@ static void scramble(LC3_FLOAT* re, LC3_FLOAT* im, LC3_INT n, LC3_INT s) LC3_FLOAT tmp; LC3_INT m, k, j; - for (m = 1, j = 0; m < (n - 1); m++) { - { - for (k = n >> 1; (!((j ^= k) & k)); k >>= 1) - ; - } + for (m = 1, j = 0; m < (n - 1); m++) + { + for (k = n >> 1; (!((j ^= k) & k)); k >>= 1) + {} - if (j > m) { + if (j > m) + { tmp = re[s * m]; re[s * m] = re[s * j]; re[s * j] = tmp; -- GitLab From 6cdb1c6acea8b37792a2cc3275aae0c024f232a2 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Tue, 10 Dec 2024 11:15:11 +0100 Subject: [PATCH 14/36] use capital P in grep for "Planar" to correctly exclude modes --- ci/complexity_measurements/getWmops.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/complexity_measurements/getWmops.sh b/ci/complexity_measurements/getWmops.sh index 8a46dd003a..acbbf288a5 100755 --- a/ci/complexity_measurements/getWmops.sh +++ b/ci/complexity_measurements/getWmops.sh @@ -81,7 +81,7 @@ ret_val=0 mode_arg="" # for OSBA, there are just too many modes... -> only select HOA3 ones if [ "$ivas_format" == "OSBA" ]; then - osba_hoa3_modes=$(./scripts/runIvasCodec.py -C OSBA -l | grep "HOA3" | grep -v "planar") + osba_hoa3_modes=$(./scripts/runIvasCodec.py -C OSBA -l | grep "HOA3" | grep -v "Planar") mode_arg="-m $osba_hoa3_modes" fi -- GitLab From 1d8f909fcd90dfa39d2ca472267baeaf9d69761a Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Wed, 11 Dec 2024 08:39:12 +0100 Subject: [PATCH 15/36] fix complexity jobs with no ref for the bar graphs --- ci/complexity_measurements/genWebpageData.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/complexity_measurements/genWebpageData.py b/ci/complexity_measurements/genWebpageData.py index 77ae645b0a..89247620e3 100644 --- a/ci/complexity_measurements/genWebpageData.py +++ b/ci/complexity_measurements/genWebpageData.py @@ -425,7 +425,7 @@ def create_display_strings( displays.append(display) - if which == "wmops_per_op": + if which == "wmops_per_op" and has_comparison: # flot.js' "stack: true" depends on the order of data arrays # reorder here instead of reworking above loop displays_encs = displays[0].split(", \n") -- GitLab From b9c20513dbb19bd0dfabef119e80ef70b2d452b8 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Wed, 11 Dec 2024 08:40:37 +0100 Subject: [PATCH 16/36] increase width of wmops-per-op graph --- ci/complexity_measurements/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/complexity_measurements/style.css b/ci/complexity_measurements/style.css index 764ed0d94f..ebce0e7677 100755 --- a/ci/complexity_measurements/style.css +++ b/ci/complexity_measurements/style.css @@ -53,7 +53,7 @@ hr { } #wmops_per_op-graph { height:500px; - width:1600px; + width:2400px; float:left; } #wmops-48kHz-graph { -- GitLab From 091a5f5d2808b4f3f59b5f7be119b435d4e6fd90 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Wed, 11 Dec 2024 12:46:33 +0100 Subject: [PATCH 17/36] do not treat warnings as errors in instrumented build job --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 546c729556..c7ed779541 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -508,7 +508,6 @@ build-codec-instrumented-linux: timeout: "10 minutes" script: - *print-common-info - - *activate-Werror-linux - ./scripts/prepare_instrumentation.sh - make -j -C scripts/c-code_instrument -- GitLab From 5e68ab0a945b751c41074cbb3c78e61cb2091b30 Mon Sep 17 00:00:00 2001 From: malenovsky Date: Wed, 11 Dec 2024 12:05:54 +0000 Subject: [PATCH 18/36] Revert previous modification --- lib_lc3plus/fft/cfft.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib_lc3plus/fft/cfft.c b/lib_lc3plus/fft/cfft.c index d796f0a213..6ec89eb299 100644 --- a/lib_lc3plus/fft/cfft.c +++ b/lib_lc3plus/fft/cfft.c @@ -126,13 +126,13 @@ static void scramble(LC3_FLOAT* re, LC3_FLOAT* im, LC3_INT n, LC3_INT s) LC3_FLOAT tmp; LC3_INT m, k, j; - for (m = 1, j = 0; m < (n - 1); m++) - { - for (k = n >> 1; (!((j ^= k) & k)); k >>= 1) - {} - - if (j > m) + for (m = 1, j = 0; m < (n - 1); m++) { { + for (k = n >> 1; (!((j ^= k) & k)); k >>= 1) + ; + } + + if (j > m) { tmp = re[s * m]; re[s * m] = re[s * j]; re[s * j] = tmp; -- GitLab From 06282d9681d559c9f8ea96919b939b2cf1768bd5 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Wed, 11 Dec 2024 15:19:35 +0100 Subject: [PATCH 19/36] swtch to all-passthrough in the encoder prm file - exception for OMASA: EXT is not supported by ivas-float-update, so use BINAURAL for now - same for one nondiegetic panning testcase. it is commented out for now --- scripts/config/self_test_basop_encoder.prm | 786 +++++++++------------ 1 file changed, 339 insertions(+), 447 deletions(-) diff --git a/scripts/config/self_test_basop_encoder.prm b/scripts/config/self_test_basop_encoder.prm index 97506e3c68..0bf6f800ab 100644 --- a/scripts/config/self_test_basop_encoder.prm +++ b/scripts/config/self_test_basop_encoder.prm @@ -7,13 +7,9 @@ // the name of the test vector located in ./testv directory, these files will be compared for bit-exactness // (the easiest way how to achieve this is to use the name of the test vector itself, as shown below) -// stereo bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, DTX on, MONO out -//../IVAS_cod -dtx -stereo ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/stvST48n.wav bit -//../IVAS_dec MONO 48 bit testv/stvST48n.wav_stereo_sw_48-48_DTX_MONO.tst - // stereo bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, DTX on, stereo out -//../IVAS_cod -dtx -stereo ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/stvST48c.wav bit -//../IVAS_dec stereo48 bit testv/stvST48c.wav_stereo_sw_48-48_DTX_stereo.tst +//../IVAS_cod -dtx -stereo ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/stvST48n.wav bit +../IVAS_dec STEREO 48 bit testv/stvST48n.wav_stereo_sw_48-48_DTX_stereo.tst // stereo bitrate switching from 13.2 kbps to 128 kbps, 32kHz in, 32kHz out ../IVAS_cod -stereo ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 32 testv/stvST32c.wav bit @@ -63,16 +59,16 @@ ../IVAS_cod -max_band testv/ivas_bws_20fr_start_WB.txt -stereo -dtx 32000 48 testv/stvST48n.wav bit ../IVAS_dec STEREO 48 bit testv/stvST48n.wav_stereo_32000_48-48_DTX.tst -// stereo at 32 kbps, 32kHz in, 48kHz out, MONO out +// stereo at 32 kbps, 32kHz in, 48kHz out, STEREO out ../IVAS_cod -stereo 32000 32 testv/stvST32c.wav bit -../IVAS_dec MONO 48 bit testv/stvST32c.wav_stereo_32000_32-48_MONO.tst +../IVAS_dec STEREO 48 bit testv/stvST32c.wav_stereo_32000_32-48_STEREO.tst -// stereo at 32 kbps, 32kHz in, 32kHz out, DTX on, MONO out +// stereo at 32 kbps, 32kHz in, 32kHz out, DTX on, STEREO out ../IVAS_cod -stereo -dtx 32000 32 testv/stvST32n.wav bit -../IVAS_dec MONO 32 bit testv/stvST32n.wav_stereo_32000_32-32_DTX_MONO.tst +../IVAS_dec STEREO 32 bit testv/stvST32n.wav_stereo_32000_32-32_DTX_STEREO.tst -// stereo at 32 kbps, 16kHz in, 16kHz out -../IVAS_cod -stereo -dtx 32000 16 testv/stvST16n.wav bit +// stereo at 32 kbps, 16kHz in, 16kHz out, DTX on +../IVAS_cod -dtx -stereo -dtx 32000 16 testv/stvST16n.wav bit ../IVAS_dec STEREO 16 bit testv/stvST16n.wav_stereo_32000_16-16_DTX.tst // stereo at 32 kbps, 16kHz in, 16kHz out @@ -91,9 +87,9 @@ ../IVAS_cod -stereo 24400 32 testv/stvST32c.wav bit ../IVAS_dec STEREO 32 bit testv/stvST32c.wav_stereo_24400_32-32.tst -// stereo at 24.4 kbps, 16kHz in, 16kHz out, DTX on, MONO out +// stereo at 24.4 kbps, 16kHz in, 16kHz out, DTX on, STEREO out ../IVAS_cod -stereo -dtx 24400 16 testv/stvST16n.wav bit -../IVAS_dec MONO 16 bit testv/stvST16n.wav_stereo_24400_16-16_DTX_MONO.tst +../IVAS_dec STEREO 16 bit testv/stvST16n.wav_stereo_24400_16-16_DTX_STEREO.tst // stereo at 24.4 kbps, 16kHz in, 16kHz out ../IVAS_cod -stereo 24400 16 testv/stvST16c.wav bit @@ -135,9 +131,9 @@ ../IVAS_cod -stereo 13200 16 testv/stvST16c.wav bit ../IVAS_dec STEREO 16 bit testv/stvST16c.wav_stereo_13200_16-16.tst -// stereo at 128 kbps, 48kHz in, 48kHz out, MONO out +// stereo at 128 kbps, 48kHz in, 48kHz out, STEREO out ../IVAS_cod -stereo 128000 48 testv/stvST48c.wav bit -../IVAS_dec MONO 48 bit testv/stvST48c.wav_stereo_128000_48-48_MONO.tst +../IVAS_dec STEREO 48 bit testv/stvST48c.wav_stereo_128000_48-48_STEREO.tst // stereo at 128 kbps, 32kHz in, 32kHz out ../IVAS_cod -stereo 128000 32 testv/stvST32c.wav bit @@ -159,9 +155,9 @@ ../IVAS_cod -sba -1 ../scripts/switchPaths/sw_13k2_512k.bin 32 testv/stvFOA32c.wav bit ../IVAS_dec FOA 32 bit testv/stvFOA32c.wav_sw_32-32_DTX_FOA.tst -// SBA planar 3OA bitrate switching from 24.4 kbps to 256 kbps, 48kHz in, 48kHz out, 7_1_4 out +// SBA planar 3OA bitrate switching from 24.4 kbps to 256 kbps, 48kHz in, 48kHz out, HOA3 out ../IVAS_cod -sba -3 ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/stv3OA48c.wav bit -../IVAS_dec 7_1_4 48 bit testv/stv3OA48c.wav_sw_48-48_7_1_4.tst +../IVAS_dec HOA3 48 bit testv/stv3OA48c.wav_sw_48-48_HOA3.tst // SBA planar 3OA bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, HOA3 out ../IVAS_cod -sba -3 ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stv3OA48c.wav bit @@ -175,131 +171,111 @@ ../IVAS_cod -sba 1 96000 48 testv/stvFOA48c.wav bit ../IVAS_dec FOA 48 bit testv/stvFOA48c.wav_SBA_96000_48-48_FOA.tst -// SBA at 96 kbps, 32kHz in, 32kHz out, STEREO out +// SBA at 96 kbps, 32kHz in, 32kHz out, FOA out ../IVAS_cod -sba 1 96000 32 testv/stvFOA32c.wav bit -../IVAS_dec STEREO 32 bit testv/stvFOA32c.wav_SBA_96000_32-32_STEREO.tst +../IVAS_dec FOA 32 bit testv/stvFOA32c.wav_SBA_96000_32-32_FOA.tst // SBA at 80 kbps, 32kHz in, 32kHz out, HOA3 out ../IVAS_cod -sba 3 80000 32 testv/stv3OA32c.wav bit ../IVAS_dec HOA3 32 bit testv/stv3OA32c.wav_SBA_80000_32-32_HOA3.tst -// SBA at 64 kpbs, 48kHz in, 48kHz out, BINAURAL out, DTX +// SBA at 64 kpbs, 48kHz in, 48kHz out, FOA out, DTX ../IVAS_cod -dtx -sba 1 64000 48 testv/stvFOA48c.wav bit -../IVAS_dec BINAURAL 48 bit testv/stvFOA48c.wav_SBA_64000_48-48_DTX_BINAURAL.tst +../IVAS_dec FOA 48 bit testv/stvFOA48c.wav_SBA_64000_48-48_DTX_FOA.tst -// SBA at 64 kbps, 48kHz in, 48kHz out, 5_1_4 out +// SBA at 64 kbps, 48kHz in, 48kHz out, FOA out ../IVAS_cod -sba 1 64000 48 testv/stvFOA48c.wav bit -../IVAS_dec 5_1_4 48 bit testv/stvFOA48c.wav_SBA_64000_48-48_5_1_4.tst +../IVAS_dec FOA 48 bit testv/stvFOA48c.wav_SBA_64000_48-48_FOA.tst // SBA at 64 kbps, 32kHz in, 32kHz out, FOA out, DTX ../IVAS_cod -dtx -sba 1 64000 32 testv/stvFOA32c.wav bit ../IVAS_dec FOA 32 bit testv/stvFOA32c.wav_SBA_64000_32-32_DTX_FOA.tst -// SBA at 48 kbps, 48kHz in, 48kHz out, DTX on, 5_1 out +// SBA at 48 kbps, 48kHz in, 48kHz out, DTX on, HOA3 out ../IVAS_cod -sba 3 -dtx 48000 48 testv/stv3OA48c.wav bit -../IVAS_dec 5_1 48 bit testv/stv3OA48c.wav_SBA_48000_48-48_DTX_5_1.tst +../IVAS_dec HOA3 48 bit testv/stv3OA48c.wav_SBA_48000_48-48_DTX_HOA3.tst -// SBA at 48 kbps, 48kHz in, 48kHz out, 5_1_2 out +// SBA at 48 kbps, 48kHz in, 48kHz out, HOA3 out ../IVAS_cod -sba 3 48000 48 testv/stv3OA48c.wav bit -../IVAS_dec 5_1_2 48 bit testv/stv3OA48c.wav_SBA_48000_48-48_5_1_2.tst +../IVAS_dec HOA3 48 bit testv/stv3OA48c.wav_SBA_48000_48-48_HOA3.tst -// SBA at 48 kbps, 32kHz in, 32kHz out, MONO out +// SBA at 48 kbps, 32kHz in, 32kHz out, HOA3 out ../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit -../IVAS_dec MONO 32 bit testv/stv3OA32c.wav_SBA_48000_32-32_MONO.tst +../IVAS_dec HOA3 32 bit testv/stv3OA32c.wav_SBA_48000_32-32_HOA3.tst -// SBA at 48 kbps, 32kHz in, 32kHz out, DTX on, BINAURAL out +// SBA at 48 kbps, 32kHz in, 32kHz out, DTX on, HOA3 out ../IVAS_cod -sba 3 -dtx 48000 32 testv/stv3OA32c.wav bit -../IVAS_dec BINAURAL 32 bit testv/stv3OA32c.wav_SBA_48000_32-32_DTX_Binaural.tst +../IVAS_dec HOA3 32 bit testv/stv3OA32c.wav_SBA_48000_32-32_DTX_Binaural.tst -// SBA at 32 kbps, 48kHz in, 48kHz out, MONO out, DTX, bandwidth switching +// SBA at 32 kbps, 48kHz in, 48kHz out, FOA out, DTX, bandwidth switching ../IVAS_cod -max_band testv/ivas_bws_20fr_start_FB.txt -dtx -sba 1 32000 48 testv/stvFOA48c.wav bit -../IVAS_dec MONO 48 bit testv/stvFOA48c.wav_SBA_32000_48-48_DTX_MONO.tst +../IVAS_dec FOA 48 bit testv/stvFOA48c.wav_SBA_32000_48-48_DTX_FOA.tst // SBA at 32 kbps, 32kHz in, 32kHz out, FOA out ../IVAS_cod -sba 1 32000 32 testv/stvFOA32c.wav bit ../IVAS_dec FOA 32 bit testv/stvFOA32c.wav_SBA_32000_32-32_FOA.tst -// SBA at 256 kbps, 48kHz in, 48kHz out, 7_1 out +// SBA at 256 kbps, 48kHz in, 48kHz out, FOA out ../IVAS_cod -sba 1 256000 48 testv/stvFOA48c.wav bit -../IVAS_dec 7_1 48 bit testv/stvFOA48c.wav_SBA_256000_48-48_7_1.tst +../IVAS_dec FOA 48 bit testv/stvFOA48c.wav_SBA_256000_48-48_FOA.tst // SBA at 256 kbps, 32kHz in, 32kHz out, FOA out ../IVAS_cod -sba 1 256000 32 testv/stvFOA32c.wav bit ../IVAS_dec FOA 32 bit testv/stvFOA32c.wav_SBA_256000_32-32_FOA.tst -// SBA at 24.4 kbps, 32kHz in, 32kHz out, STEREO out +// SBA at 24.4 kbps, 32kHz in, 32kHz out, HOA3 out ../IVAS_cod -sba 3 24400 32 testv/stv3OA32c.wav bit -../IVAS_dec STEREO 32 bit testv/stv3OA32c.wav_SBA_24400_32-32_stereo.tst +../IVAS_dec HOA3 32 bit testv/stv3OA32c.wav_SBA_24400_32-32_HOA3.tst -// SBA at 24.4 kbps, 32kHz in, 32kHz out, DTX on, BINAURAL out +// SBA at 24.4 kbps, 32kHz in, 32kHz out, DTX on, HOA3 out ../IVAS_cod -sba 3 -dtx 24400 32 testv/stv3OA32c.wav bit -../IVAS_dec BINAURAL 32 bit testv/stv3OA32c.wav_SBA_24400_32-32_DTX_Binaural.tst +../IVAS_dec HOA3 32 bit testv/stv3OA32c.wav_SBA_24400_32-32_DTX_HOA3.tst -// SBA at 192 kbps, 48kHz in, 48kHz out, HOA2 out +// SBA at 192 kbps, 48kHz in, 48kHz out, HOA3 out ../IVAS_cod -sba 3 192000 48 testv/stv3OA48c.wav bit -../IVAS_dec HOA2 48 bit testv/stv3OA48c.wav_SBA_192000_48-48_HOA2.tst +../IVAS_dec HOA3 48 bit testv/stv3OA48c.wav_SBA_192000_48-48_HOA3.tst -// SBA at 160 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM out +// SBA at 160 kbps, 48kHz in, 48kHz out, FOA out ../IVAS_cod -sba 1 160000 48 testv/stvFOA48c.wav bit -../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/stvFOA48c.wav_SBA_160000_48-48_BINAURAL_ROOM.tst +../IVAS_dec FOA 48 bit testv/stvFOA48c.wav_SBA_160000_48-48_BINAURAL_ROOM.tst // SBA at 160 kbps, 32kHz in, 32kHz out, FOA out ../IVAS_cod -sba 1 160000 32 testv/stvFOA32c.wav bit ../IVAS_dec FOA 32 bit testv/stvFOA32c.wav_SBA_160000_32-32_FOA.tst -// SBA at 16.4 kbps, 32kHz in, 32kHz out, 7_1_4 out +// SBA at 16.4 kbps, 32kHz in, 32kHz out, HOA3 out ../IVAS_cod -sba 3 16400 32 testv/stv3OA32c.wav bit -../IVAS_dec 7_1_4 32 bit testv/stv3OA32c.wav_SBA_16400_32-32_7_1_4.tst +../IVAS_dec HOA3 32 bit testv/stv3OA32c.wav_SBA_16400_32-32_HOA3.tst -// SBA at 13.2 kbps, 48kHz in, 48kHz out, BINAURAL out +// SBA at 13.2 kbps, 48kHz in, 48kHz out, FOA out ../IVAS_cod -sba 1 13200 48 testv/stvFOA48c.wav bit -../IVAS_dec BINAURAL 48 bit testv/stvFOA32c.wav_SBA_13200_48-48_BINAURAL.tst +../IVAS_dec FOA 48 bit testv/stvFOA32c.wav_SBA_13200_48-48_FOA.tst // SBA at 13.2 kbps, 32kHz in, 32kHz out, HOA3 out, bandwidth switching ../IVAS_cod -max_band testv/ivas_bws_20fr_start_WB.txt -sba 3 13200 32 testv/stv3OA32c.wav bit ../IVAS_dec HOA3 32 bit testv/stv3OA32c.wav_SBA_13200_32-32_HOA3.tst -// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, HR +// SBA at 128 kbps, 32kHz in, 32kHz out, HOA3 out, HR ../IVAS_cod -sba 3 128000 32 testv/stv3OA32c.wav bit -../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.wav_SBA_128000_32-32_Binaural_room_Headrot.tst +../IVAS_dec HOA3 32 bit testv/stv3OA32c.wav_SBA_128000_32-32_HOA3_Headrot.tst // SBA FOA bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, FOA out ../IVAS_cod -sba 1 -max_band fb ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stvFOA48c.wav bit ../IVAS_dec FOA 48 bit testv/stvFOA48c.wav_sw_48-48_FOA.tst -// SBA FOA bitrate switching from 13.2 kbps to 192 kbps, 48kHz in, 48kHz out, BINAURAL out +// SBA FOA bitrate switching from 13.2 kbps to 192 kbps, 48kHz in, 48kHz out, FOA out ../IVAS_cod -sba 1 ../scripts/switchPaths/sw_13k2_192k_50fr.bin 48 testv/stvFOA48c.wav bit -../IVAS_dec BINAURAL 48 bit testv/stvFOA48c.wav_sw_48-48_BINAURAL.tst +../IVAS_dec FOA 48 bit testv/stvFOA48c.wav_sw_48-48_FOA.tst -// SBA FOA bitrate switching from 13.2 kbps to 192 kbps, 32kHz in, 32kHz out, DTX on, FOAout +// SBA FOA bitrate switching from 13.2 kbps to 192 kbps, 32kHz in, 32kHz out, DTX on, FOA out ../IVAS_cod -dtx -sba 1 ../scripts/switchPaths/sw_13k2_192k_50fr.bin 32 testv/stvFOA32c.wav bit ../IVAS_dec FOA 32 bit testv/stvFOA32c.wav_sw_32-32_DTX_FOA.tst -// SBA FOA bitrate switching from 13.2 kbps to 192 kbps, 32kHz in, 32kHz out, DTX on, BINAURAL out -../IVAS_cod -dtx -sba 1 ../scripts/switchPaths/sw_13k2_192k_50fr.bin 32 testv/stvFOA32c_cut_.004.wav bit -../IVAS_dec BINAURAL 32 bit testv/stvFOA32c.wav_sw_32-32_DTX_BINAURAL.tst - -// SBA 3OA bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, STEREO out -../IVAS_cod -sba 3 ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stv3OA48c.wav bit -../IVAS_dec STEREO 48 bit testv/stv3OA48c.wav_sw_48-48_STEREO.tst - -// SBA 3OA bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, MONO out -../IVAS_cod -sba 3 ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stv3OA48c.wav bit -../IVAS_dec MONO 48 bit testv/stv3OA48c.wav_sw_48-48_MONO.tst - // SBA 3OA bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, HOA3 out ../IVAS_cod -sba 3 ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stv3OA48c.wav bit ../IVAS_dec HOA3 48 bit testv/stv3OA48c.wav_sw_48-48_HOA3.tst -// SBA 3OA bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, FOA out -../IVAS_cod -sba 3 ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stv3OA48c.wav bit -../IVAS_dec FOA 48 bit testv/stv3OA48c.wav_sw_48-48_FOA.tst - -// SBA 3OA bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, BINAURAL out (Model from file) -../IVAS_cod -sba 3 ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stv3OA48c.wav bit -../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin BINAURAL 48 bit testv/stv3OA48c.wav_sw_48-48_BINAURAL.tst - -// SBA 3OA bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, DTX on, HOA3out +// SBA 3OA bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, DTX on, HOA3 out ../IVAS_cod -dtx -sba 3 ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/stv3OA48c.wav bit ../IVAS_dec HOA3 48 bit testv/stv3OA48c.wav_sw_48-48_DTX_HOA3.tst @@ -307,370 +283,358 @@ ../IVAS_cod -dtx -sba 3 ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 32 testv/stv3OA32c_cut_.004.wav bit ../IVAS_dec HOA3 32 bit testv/stv3OA32c.wav_sw_32-32_DTX_HOA3.tst -// SBA 3OA at 96 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out default configuration +// SBA 3OA at 96 kbps, 48kHz in, 48kHz out, HOA3 out ../IVAS_cod -sba 3 512000 48 testv/stv3OA48c.wav bit -../IVAS_dec BINAURAL_ROOM_REVERB 48 bit testv/stv3OA48c.wav_BINAURAL_ROOM_REVERB_96000_48-48.tst +../IVAS_dec HOA3 48 bit testv/stv3OA48c.wav_HOA3_96000_48-48.tst -// SBA 3OA at 512 kbps, 48kHz in, 48kHz out, BINAURAL out, bandwidth switching +// SBA 3OA at 512 kbps, 48kHz in, 48kHz out, HOA3 out, bandwidth switching ../IVAS_cod -max_band testv/ivas_bws_20fr_start_SWB.txt -sba 3 512000 48 testv/stv3OA48c.wav bit -../IVAS_dec BINAURAL 48 bit testv/stv3OA48c.wav_SBA_512000_48-48_binaural.tst +../IVAS_dec HOA3 48 bit testv/stv3OA48c.wav_SBA_512000_48-48_HOA3.tst -// SBA 3OA 4ISM at 96 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out custom configuration +// SBA 3OA 4ISM at 96 kbps, 48kHz in, 48kHz out, HOA3 ../IVAS_cod -sba 3 96000 48 testv/stv3OA48c.wav bit -../IVAS_dec -render_config testv/rend_config_recreation.cfg BINAURAL_ROOM_REVERB 48 bit testv/stv3OA48c.wav_BINAURAL_ROOM_REVERB_96000_48-48_custom_configuration.tst +../IVAS_dec HOA3 48 bit testv/stv3OA48c.wav_HOA3_96000_48-48.tst -// SBA 2OA bitrate switching from 16.4 kbps to 512 kbps, 48kHz in, 48kHz out, FOA out +// SBA 2OA bitrate switching from 16.4 kbps to 512 kbps, 48kHz in, 48kHz out, HOA2 out ../IVAS_cod -sba 2 ../scripts/switchPaths/sw_16k4_512k_50fr.bin 48 testv/stv2OA48c.wav bit -../IVAS_dec FOA 48 bit testv/stv2OA48c.wav_sw_48-48_FOA.tst +../IVAS_dec HOA2 48 bit testv/stv2OA48c.wav_sw_48-48_HOA2.tst // SBA 2OA bitrate switching from 13.2 kbps to 512 kbps, 32kHz in, 32kHz out, HOA2 out ../IVAS_cod -sba 2 ../scripts/switchPaths/sw_13k2_512k.bin 32 testv/stv2OA32c.wav bit ../IVAS_dec HOA2 32 bit testv/stv2OA32c.wav_sw_32-32_DTX_HOA2.tst -// SBA 2OA at 384 kbps, 32kHz in, 32kHz out, STEREO out, bandwidth switching +// SBA 2OA at 384 kbps, 32kHz in, 32kHz out, HOA2 out, bandwidth switching ../IVAS_cod -max_band testv/ivas_bws_20fr_start_WB.txt -sba 2 384000 32 testv/stv2OA32c.wav bit -../IVAS_dec STEREO 32 bit testv/stv2OA32c.wav_SBA_384000_32-32_stereo.tst +../IVAS_dec HOA2 32 bit testv/stv2OA32c.wav_SBA_384000_32-32_HOA2.tst -// Planar SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL_ROOM_REVERB out, Config renderer, HR +// Planar SBA at 48 kbps, 32kHz in, 32kHz out, HOA3 out ../IVAS_cod -sba -2 48000 32 testv/stv2OA32c.wav bit -../IVAS_dec -t testv/headrot.csv -render_config testv/rend_config_renderer.cfg BINAURAL_ROOM_REVERB 32 bit testv/stv2OA32c.pcm_planarSBA_48000_32-32_BinauralRoomReverb_Config_renderer_Headrot.tst +../IVAS_dec HOA3 32 bit testv/stv2OA32c.pcm_planarSBA_48000_32-32_HOA3.tst -// Planar SBA at 128 kbps, 48kHZ in, 32kHz out, BINAURAL_ROOM_REVERB out (Model from file), Config renderer, HR +// Planar SBA at 128 kbps, 48kHZ in, 32kHz out, FOA out ../IVAS_cod -sba -1 128000 48 testv/stvFOA48c.wav bit -../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin -t testv/headrot_case00_3000_q.csv -render_config testv/rend_config_renderer.cfg BINAURAL_ROOM_REVERB 32 bit testv/stvFOA48c.pcm_planarSBA_128000_48-32_BinauralRoomReverb_Config_renderer_Headrot_BinauralFile.tst +../IVAS_dec FOA 32 bit testv/stvFOA48c.pcm_planarSBA_128000_48-32_BinauralRoomReverb_Config_renderer_Headrot_BinauralFile.tst -// OSBA planar 3OA 4ISM at 512 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM IR out +// OSBA planar 3OA 4ISM at 512 kbps, 48 kHz in, 48 kHz out, EXT out ../IVAS_cod -ism_sba 4 -3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 512000 48 testv/stvOSBA_4ISM_3OA48c.wav bit -../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/stvOSBA_4ISM_p3OA48c.wav_BINAURAL_ROOM_IR_512000_48-48.tst +../IVAS_dec EXT 48 bit testv/stvOSBA_4ISM_p3OA48c.wav_EXT_512000_48-48.tst -// OSBA planar 2OA 4ISM at 512 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM REVERB (Model from file) out +// OSBA planar 2OA 4ISM at 512 kbps, 48 kHz in, 48 kHz out, EXT out ../IVAS_cod -ism_sba 4 -2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 512000 48 testv/stvOSBA_4ISM_2OA48c.wav bit -../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin BINAURAL_ROOM_REVERB 48 bit testv/stvOSBA_4ISM_p3OA48c.wav_BINAURAL_ROOM_REVERB_512000_48-48.tst +../IVAS_dec EXT 48 bit testv/stvOSBA_4ISM_p3OA48c.wav_EXT_512000_48-48.tst -// OSBA FOA 4ISM at 512 kbps, 48kHz in, 48kHz out, BINAURAL (Model from file) out +// OSBA FOA 4ISM at 512 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -ism_sba 4 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 512000 48 testv/stvOSBA_4ISM_FOA48c.wav bit -../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin BINAURAL 48 bit testv/stvOSBA_4ISM_FOA48c.wav_BINAURAL_512000_48-48.tst +../IVAS_dec EXT 48 bit testv/stvOSBA_4ISM_FOA48c.wav_EXT_512000_48-48.tst -// OSBA FOA 4ISM at 512 kbps, 32kHz in, 48kHz out, STEREO out +// OSBA FOA 4ISM at 512 kbps, 32kHz in, 48kHz out, EXT 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 +../IVAS_dec EXT 48 bit testv/stvOSBA_4ISM_FOA32c.wav_EXT_512000_32-48.tst -// OSBA FOA 4ISM at 384 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR (Model from file) out +// OSBA FOA 4ISM at 384 kbps, 32kHz in, 32kHz out, EXT out ../IVAS_cod -ism_sba 4 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 384000 32 testv/stvOSBA_4ISM_FOA32c.wav bit -../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin BINAURAL_ROOM_IR 32 bit testv/stvOSBA_4ISM_FOA32c.wav_BINAURAL_384000_32-32.tst +../IVAS_dec EXT 32 bit testv/stvOSBA_4ISM_FOA32c.wav_EXT_384000_32-32.tst -// OSBA FOA 4ISM at 256 kbps, 48kHz in, 48kHz out, FOA out +// OSBA FOA 4ISM at 256 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -ism_sba 4 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stvOSBA_4ISM_FOA48c.wav bit -../IVAS_dec FOA 48 bit testv/stvOSBA_4ISM_FOA48c.wav_FOA_256000_48-48.tst +../IVAS_dec EXT 48 bit testv/stvOSBA_4ISM_FOA48c.wav_EXT56000_48-48.tst -// OSBA FOA 3ISM at 128 kbps, 48kHz in, 48kHz out, 7_1_4 out +// OSBA FOA 3ISM at 128 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -ism_sba 3 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 128000 48 testv/stvOSBA_3ISM_FOA48c.wav bit -../IVAS_dec 7_1_4 48 bit testv/stvOSBA_3ISM_FOA48c.wav_7_1_4_128000_48-48.tst +../IVAS_dec EXT 48 bit testv/stvOSBA_3ISM_FOA48c.wav_EXT_128000_48-48.tst -// OSBA FOA 1ISM at 48 kbps, 16kHz in, 16kHz out, BINAURAL_ROOM_REVERB (Model from file) out +// OSBA FOA 1ISM at 48 kbps, 16kHz in, 16kHz out, EXT out ../IVAS_cod -ism_sba 1 1 testv/stvISM1.csv 32000 16 testv/stvOSBA_1ISM_FOA16c.wav bit -../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL_ROOM_REVERB 16 bit testv/stvOSBA_1ISM_FOA16c.wav_BINAURAL_ROOM_REVERB_32000_16-16.tst +../IVAS_dec EXT 16 bit testv/stvOSBA_1ISM_FOA16c.wav_EXT_32000_16-16.tst -// OSBA FOA 1ISM at 32 kbps, 48kHz in, 48kHz out, BINAURAL out +// OSBA FOA 1ISM at 32 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -ism_sba 1 1 testv/stvISM1.csv 32000 48 testv/stvOSBA_1ISM_FOA48c.wav bit -../IVAS_dec BINAURAL 48 bit testv/stvOSBA_1ISM_FOA48c.wav_BINAURAL_32000_48-48.tst +../IVAS_dec EXT 48 bit testv/stvOSBA_1ISM_FOA48c.wav_EXT_32000_48-48.tst -// OSBA 3OA 4ISM bitrate switching 16.4 to 512, 48kHz in, 48kHz out, BINAURAL out, headtracking +// OSBA 3OA 4ISM bitrate switching 16.4 to 512, 48kHz in, 48kHz out, EXT out ../IVAS_cod -ism_sba 4 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv ../scripts/switchPaths/sw_16k4_512k_50fr.bin 48 testv/stvOSBA_4ISM_3OA48c.wav bit -../IVAS_dec -t testv/headrot.csv BINAURAL 48 bit testv/stvOSBA_4ISM_3OA48c.wav_BINAURAL_sw_16k4_512k_48-48.tst +../IVAS_dec EXT 48 bit testv/stvOSBA_4ISM_3OA48c.wav_EXT_sw_16k4_512k_48-48.tst -// OSBA 3OA 4ISM bitrate switching 13.2 to 512, 48kHz in, 48kHz out, BINAURAL out +// OSBA 3OA 4ISM bitrate switching 13.2 to 512, 48kHz in, 48kHz 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 48 testv/stvOSBA_4ISM_3OA48c.wav bit -../IVAS_dec BINAURAL 48 bit testv/stvOSBA_4ISM_3OA48c.wav_BINAURAL_sw_13k2_512k_48-48.tst +../IVAS_dec EXT 48 bit testv/stvOSBA_4ISM_3OA48c.wav_EXT_sw_13k2_512k_48-48.tst // OSBA 3OA 4ISM bitrate switching 13.2 to 512, 32kHz in, 48kHz 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-48.tst -// OSBA 3OA 4ISM at 64 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out +// OSBA 3OA 4ISM at 64 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -ism_sba 4 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 64000 48 testv/stvOSBA_4ISM_3OA48c.wav bit -../IVAS_dec -render_config testv/rend_config_recreation.cfg BINAURAL_ROOM_REVERB 48 bit testv/stvOSBA_4ISM_3OA48c.wav_BINAURAL_ROOM_REVERB_64000_48-48_custom_configuration.tst +../IVAS_dec EXT 48 bit testv/stvOSBA_4ISM_3OA48c.wav_EXT_64000_48-48_EXT.tst -// OSBA 3OA 4ISM at 512 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out +// OSBA 3OA 4ISM at 512 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -ism_sba 4 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 512000 48 testv/stvOSBA_4ISM_3OA48c.wav bit -../IVAS_dec -render_config testv/rend_config_hospital_patientroom.cfg BINAURAL_ROOM_REVERB 48 bit testv/stvOSBA_4ISM_3OA48c.wav_BINAURAL_ROOM_REVERB_512000_48-48_custom_configuration.tst +../IVAS_dec EXT 48 bit testv/stvOSBA_4ISM_3OA48c.wav_EXT_512000_48-48_EXT.tst -// OSBA 3OA 4ISM at 48 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out +// OSBA 3OA 4ISM at 48 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -ism_sba 4 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 48000 48 testv/stvOSBA_4ISM_3OA48c.wav bit -../IVAS_dec -render_config testv/rend_config_recreation.cfg BINAURAL_ROOM_REVERB 48 bit testv/stvOSBA_4ISM_3OA48c.wav_BINAURAL_ROOM_REVERB_48000_48-48_custom_configuration.tst +../IVAS_dec EXT 48 bit testv/stvOSBA_4ISM_3OA48c.wav_EXT_48000_48-48_EXT.tst -// OSBA 3OA 4ISM at 16.4 kbps, 48kHz in, 48kHz out, 5_1 out +// OSBA 3OA 4ISM at 16.4 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -ism_sba 4 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 16400 48 testv/stvOSBA_4ISM_3OA48c.wav bit -../IVAS_dec 5_1 48 bit testv/stvOSBA_4ISM_3OA48c.wav_5_1_16400_48-48.tst +../IVAS_dec EXT 48 bit testv/stvOSBA_4ISM_3OA48c.wav_EXT_16400_48-48.tst -// OSBA 3OA 3ISM at 160 kbps, 16kHz in, 48kHz out, BINAURAL ROOM IR out +// OSBA 3OA 3ISM at 160 kbps, 16kHz in, 48kHz out, EXT out ../IVAS_cod -ism_sba 3 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 160000 16 testv/stvOSBA_3ISM_3OA16c.wav bit -../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/stvOSBA_3ISM_3OA416c.wav_BINAURAL_ROOM_IR_160000_16-48.tst +../IVAS_dec EXT 48 bit testv/stvOSBA_3ISM_3OA416c.wav_EXT_160000_16-48.tst -// OSBA 3OA 3ISM at 128 kbps, 48kHz in, 48kHz out, BINAURAL out +// OSBA 3OA 3ISM at 128 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -ism_sba 3 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 128000 48 testv/stvOSBA_3ISM_3OA48c.wav bit -../IVAS_dec BINAURAL 48 bit testv/stvOSBA_3ISM_3OA48c.wav_BINAURAL_128000_48-48.tst +../IVAS_dec EXT 48 bit testv/stvOSBA_3ISM_3OA48c.wav_EXT_128000_48-48.tst -// OSBA 3OA 2ISM at 256 kbps, 48kHz in, 48kHz out, 7_1 out +// OSBA 3OA 2ISM at 256 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -ism_sba 2 3 testv/stvISM1.csv testv/stvISM2.csv 256000 48 testv/stvOSBA_2ISM_3OA48c.wav bit -../IVAS_dec 7_1 48 bit testv/stvOSBA_2ISM_3OA48c.wav_7_1_256000_48-48.tst +../IVAS_dec EXT 48 bit testv/stvOSBA_2ISM_3OA48c.wav_EXT56000_48-48.tst -// OSBA 3OA 2ISM at 256 kbps, 32kHz in, 32kHz out, HOA3 out +// OSBA 3OA 2ISM at 256 kbps, 32kHz in, 32kHz out, HOA2 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_HOA3_256000_32-32.tst +../IVAS_dec HOA2 32 bit testv/stvOSBA_2ISM_3OA32c.wav_HOA2_256000_32-32.tst // OSBA 3OA 1ISM at 512 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -ism_sba 1 3 testv/stvISM1.csv 512000 48 testv/stvOSBA_1ISM_3OA48c.wav bit ../IVAS_dec EXT 48 bit testv/stvOSBA_1ISM_3OA48c.wav_EXT_512000_48-48.tst -// OSBA 3ISM 3OA at bitrate switching 13.2 to 512 kbps, 48kHz in, 32kHz out, BINAURAL ROOM REVERB out +// OSBA 3ISM 3OA at bitrate switching 13.2 to 512 kbps, 48kHz in, 32kHz out, EXT out ../IVAS_cod -ism_sba 3 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stvOSBA_3ISM_3OA48c.wav bit -../IVAS_dec BINAURAL_ROOM_REVERB 32 bit testv/stvOSBA_3ISM_3OA48c.wav_BINAURAL_ROOM_REVERB_sw_48-32.tst +../IVAS_dec EXT 32 bit testv/stvOSBA_3ISM_3OA48c.wav_EXT_sw_48-32.tst -// OSBA 3ISM 2OA at bitrate switching 13.2 to 512 kbps, 48kHz in, 32kHz out, STEREO out +// OSBA 3ISM 2OA at bitrate switching 13.2 to 512 kbps, 48kHz in, 32kHz out, EXT out ../IVAS_cod -ism_sba 3 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stvOSBA_3ISM_2OA48c.wav bit -../IVAS_dec STEREO 32 bit testv/stvOSBA_3ISM_2OA48c.wav_STEREO_sw_48-32.tst +../IVAS_dec EXT 32 bit testv/stvOSBA_3ISM_2OA48c.wav_EXT_sw_48-32.tst -// OSBA 2OA 4ISM at 384 kbps, 48kHz in, 48kHz out, BINAURAL out +// OSBA 2OA 4ISM at 384 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -ism_sba 4 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 384000 48 testv/stvOSBA_4ISM_2OA48c.wav bit -../IVAS_dec BINAURAL 48 bit testv/stvOSBA_4ISM_2OA48c.wav_BINAURAL_384000_48-48.tst +../IVAS_dec EXT 48 bit testv/stvOSBA_4ISM_2OA48c.wav_EXT_384000_48-48.tst -// OSBA 2OA 3ISM at 96 kbps, 48kHz in, 48kHz out, STEREO out +// OSBA 2OA 3ISM at 96 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -ism_sba 3 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 96000 48 testv/stvOSBA_3ISM_2OA48c.wav bit -../IVAS_dec STEREO 48 bit testv/stvOSBA_3ISM_2OA48c.wav_STEREO_96000_48-48.tst +../IVAS_dec EXT 48 bit testv/stvOSBA_3ISM_2OA48c.wav_EXT_96000_48-48.tst -// OSBA 2OA 3ISM at 384 kbps, 16kHz in, 16kHz out, MONO out +// OSBA 2OA 3ISM at 384 kbps, 16kHz in, 16kHz out, EXT 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 +../IVAS_dec EXT 16 bit testv/stvOSBA_3ISM_2OA16c.wav_EXT56000_16-16.tst -// OSBA 2OA 2ISM at 64 kbps, 32kHz in, 16kHz out, BINAURAL ROOM REVERB out +// OSBA 2OA 2ISM at 64 kbps, 32kHz in, 16kHz out, EXT out ../IVAS_cod -ism_sba 2 2 testv/stvISM1.csv testv/stvISM2.csv 48000 32 testv/stvOSBA_2ISM_2OA32c.wav bit -../IVAS_dec BINAURAL_ROOM_REVERB 16 bit testv/stvOSBA_2ISM_2OA32c.wav_MONO_64000_32-16.tst +../IVAS_dec EXT 16 bit testv/stvOSBA_2ISM_2OA32c.wav_EXT_64000_32-16.tst -// OSBA 2OA 2ISM at 48 kbps, 48kHz in, 48kHz out, MONO out +// OSBA 2OA 2ISM at 48 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -ism_sba 2 2 testv/stvISM1.csv testv/stvISM2.csv 48000 48 testv/stvOSBA_2ISM_2OA48c.wav bit -../IVAS_dec MONO 48 bit testv/stvOSBA_2ISM_2OA48c.wav_MONO_48000_48-48.tst +../IVAS_dec EXT 48 bit testv/stvOSBA_2ISM_2OA48c.wav_EXT_48000_48-48.tst -// OSBA 2OA 1ISM at 24.4 kbps, 48kHz in, 48kHz out, FOA out +// OSBA 2OA 1ISM at 24.4 kbps, 48kHz in, 48kHz out, HOA2 out ../IVAS_cod -ism_sba 1 2 testv/stvISM1.csv 24400 48 testv/stvOSBA_1ISM_2OA48c.wav bit -../IVAS_dec FOA 48 bit testv/stvOSBA_1ISM_2OA48c.wav_FOA_24400_48-48.tst +../IVAS_dec HOA2 48 bit testv/stvOSBA_1ISM_2OA48c.wav_HOA2_24400_48-48.tst -// OMASA 2Dir2TC 4ISM at br sw techs 13.2 to 512 kbps start 384 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out +// OMASA 2Dir2TC 4ISM at br sw techs 13.2 to 512 kbps start 384 kbps, 48kHz in, 48kHz out, BINAURAL out ../IVAS_cod -ism_masa 4 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv2MASA2TC48c.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_384k_omasatechs_4ism.bin 48 testv/stvOMASA_4ISM_2MASA2TC48c.wav bit -../IVAS_dec BINAURAL_ROOM_REVERB 48 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_BINAURAL_ROOM_REVERB_sw_48-48.tst +../IVAS_dec BINAURAL 48 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_BINAURAL_sw_48-48.tst -// OMASA 2Dir2TC 4ISM at 64 kbps, 48kHz in, 48kHz out, HOA2 out +// OMASA 2Dir2TC 4ISM at 64 kbps, 48kHz in, 48kHz out, BINAURAL out ../IVAS_cod -ism_masa 4 2 testv/stvISM1.csv NULL NULL testv/stvISM4.csv testv/stv2MASA2TC48c.met 64000 48 testv/stvOMASA_4ISM_2MASA2TC48c.wav bit -../IVAS_dec HOA2 48 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_HOA2_64000_48-48.tst +../IVAS_dec BINAURAL 48 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_BINAURAL_64000_48-48.tst -// OMASA 2Dir2TC 4ISM at 384 kbps, 48kHz in, 48kHz out, EXT out +// OMASA 2Dir2TC 4ISM at 384 kbps, 48kHz in, 48kHz out, BINAURAL out ../IVAS_cod -ism_masa 4 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv2MASA2TC48c.met 384000 48 testv/stvOMASA_4ISM_2MASA2TC48c.wav bit -../IVAS_dec EXT 48 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_EXT_384000_48-48.tst +../IVAS_dec BINAURAL 48 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_BINAURAL_384000_48-48.tst -// OMASA 2Dir2TC 4ISM at 256 kbps, 48kHz in, 48kHz out, EXT out +// OMASA 2Dir2TC 4ISM at 256 kbps, 48kHz in, 48kHz out, BINAURAL out ../IVAS_cod -ism_masa 4 2 testv/stvISM1.csv testv/stvISM2.csv NULL testv/stvISM4.csv testv/stv2MASA2TC48c.met 256000 48 testv/stvOMASA_4ISM_2MASA2TC48c.wav bit -../IVAS_dec EXT 48 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_EXT_256000_48-48.tst +../IVAS_dec BINAURAL 48 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_BINAURAL56000_48-48.tst -// OMASA 2Dir2TC 4ISM at 192 kbps, 48kHz in, 48kHz out, STEREO out +// OMASA 2Dir2TC 4ISM at 192 kbps, 48kHz in, 48kHz out, BINAURAL out ../IVAS_cod -ism_masa 4 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv2MASA2TC48c.met 192000 48 testv/stvOMASA_4ISM_2MASA2TC48c.wav bit -../IVAS_dec STEREO 48 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_STEREO_192000_48-48.tst +../IVAS_dec BINAURAL 48 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_BINAURAL_192000_48-48.tst -// OMASA 2Dir2TC 4ISM at 13.2 kbps, 48kHz in, 48kHz out, MONO out +// OMASA 2Dir2TC 4ISM at 13.2 kbps, 48kHz in, 48kHz out, BINAURAL out ../IVAS_cod -ism_masa 4 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv2MASA2TC48c.met 13200 48 testv/stvOMASA_4ISM_2MASA2TC48c.wav bit -../IVAS_dec MONO 48 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_MONO_13200_48-48.tst +../IVAS_dec BINAURAL 48 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_BINAURAL_13200_48-48.tst -// OMASA 2Dir2TC 4ISM 48 kbps 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out custom configuration +// OMASA 2Dir2TC 4ISM 48 kbps 48kHz in, 48kHz out, BINAURAL ../IVAS_cod -ism_masa 4 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv2MASA2TC48c.met 48000 48 testv/stvOMASA_4ISM_2MASA2TC48c.wav bit -../IVAS_dec -render_config testv/rend_config_hospital_patientroom.cfg BINAURAL_ROOM_REVERB 48 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_BINAURAL_ROOM_REVERB_48000_48-48_custom_configuration.tst +../IVAS_dec BINAURAL 48 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_BINAURAL_48000_48-48_BINAURAL.tst -// OMASA 2Dir2TC 3ISM at br sw techs 13.2 to 512 kbps start 160 kbps, 48kHz in, 48kHz out, MONO out +// OMASA 2Dir2TC 3ISM at br sw techs 13.2 to 512 kbps start 160 kbps, 48kHz in, 48kHz out, BINAURAL out ../IVAS_cod -ism_masa 3 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stv2MASA2TC48c.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_160k_omasatechs_3ism.bin 48 testv/stvOMASA_3ISM_2MASA2TC48c.wav bit -../IVAS_dec MONO 48 bit testv/stvOMASA_3ISM_2MASA2TC48c.wav_MONO_sw_48-48.tst +../IVAS_dec BINAURAL 48 bit testv/stvOMASA_3ISM_2MASA2TC48c.wav_BINAURAL_sw_48-48.tst -// OMASA 2Dir2TC 3ISM at 80 kbps, 32kHz in, 16kHz out, 5.1.4 out +// OMASA 2Dir2TC 3ISM at 80 kbps, 32kHz in, 16kHz out, BINAURAL.4 out ../IVAS_cod -ism_masa 3 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stv2MASA2TC48c.met 80000 32 testv/stvOMASA_3ISM_2MASA2TC32c.wav bit -../IVAS_dec 5_1_4 16 bit testv/stvOMASA_3ISM_2MASA2TC32c.wav_5_1_4_80000_32-16.tst +../IVAS_dec BINAURAL 16 bit testv/stvOMASA_3ISM_2MASA2TC32c.wav_BINAURAL_80000_32-16.tst -// OMASA 2Dir2TC 3ISM at 48 kbps, 48kHz in, 48kHz out, MONO out +// OMASA 2Dir2TC 3ISM at 48 kbps, 48kHz in, 48kHz out, BINAURAL out ../IVAS_cod -ism_masa 3 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stv2MASA2TC48c.met 48000 48 testv/stvOMASA_3ISM_2MASA2TC48c.wav bit -../IVAS_dec MONO 48 bit testv/stvOMASA_3ISM_2MASA2TC48c.wav_MONO_48000_48-48.tst +../IVAS_dec BINAURAL 48 bit testv/stvOMASA_3ISM_2MASA2TC48c.wav_BINAURAL_48000_48-48.tst -// OMASA 2Dir2TC 3ISM at 32 kbps, 48kHz in, 48kHz out, 5.1.2 out +// OMASA 2Dir2TC 3ISM at 32 kbps, 48kHz in, 48kHz out, BINAURAL out ../IVAS_cod -ism_masa 3 2 NULL NULL NULL testv/stv2MASA2TC48c.met 32000 48 testv/stvOMASA_3ISM_2MASA2TC48c.wav bit -../IVAS_dec 5_1_2 48 bit testv/stvOMASA_3ISM_2MASA2TC48c.wav_5_1_2_32000_48-48.tst +../IVAS_dec BINAURAL 48 bit testv/stvOMASA_3ISM_2MASA2TC48c.wav_BINAURAL_32000_48-48.tst -// OMASA 2Dir2TC 2ISM at br sw techs 13.2 to 512 kbps start 48 kbps, 48kHz in, 48kHz out, 7.1 out +// OMASA 2Dir2TC 2ISM at br sw techs 13.2 to 512 kbps start 48 kbps, 48kHz in, 48kHz out, BINAURAL out ../IVAS_cod -ism_masa 2 2 testv/stvISM1.csv NULL testv/stv2MASA2TC48c.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_48k_omasatechs_2ism.bin 48 testv/stvOMASA_2ISM_2MASA2TC48c.wav bit -../IVAS_dec 7_1 48 bit testv/stvOMASA_2ISM_2MASA2TC48c.wav_7_1_sw_48-48.tst +../IVAS_dec BINAURAL 48 bit testv/stvOMASA_2ISM_2MASA2TC48c.wav_BINAURAL_sw_48-48.tst -// OMASA 2Dir2TC 2ISM at 32 kbps, 48kHz in, 48kHz out, STEREO out, FER at 5% +// OMASA 2Dir2TC 2ISM at 32 kbps, 48kHz in, 48kHz out, BINAURAL out ../IVAS_cod -ism_masa 2 2 testv/stvISM1.csv testv/stvISM2.csv testv/stv2MASA2TC48c.met 32000 48 testv/stvOMASA_2ISM_2MASA2TC48c.wav bit -../IVAS_dec STEREO 48 bit testv/stvOMASA_2ISM_2MASA2TC48c.wav_STEREO_32000_48-48.tst +../IVAS_dec BINAURAL 48 bit testv/stvOMASA_2ISM_2MASA2TC48c.wav_BINAURAL_32000_48-48.tst -// OMASA 2Dir2TC 1ISM at br sw techs 13.2 to 512 kbps start 24.4 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_IR out +// OMASA 2Dir2TC 1ISM at br sw techs 13.2 to 512 kbps start 24.4 kbps, 48kHz in, 48kHz out, BINAURAL out ../IVAS_cod -ism_masa 1 2 testv/stvISM1.csv testv/stv2MASA2TC48c.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_24k4_omasatechs_1ism.bin 48 testv/stvOMASA_1ISM_2MASA2TC48c.wav bit -../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/stvOMASA_1ISM_2MASA2TC48c.wav_BINAURAL_ROOM_IR_sw_48-48.tst +../IVAS_dec BINAURAL 48 bit testv/stvOMASA_1ISM_2MASA2TC48c.wav_BINAURAL_sw_48-48.tst // OMASA 2Dir2TC 1ISM at 13.2 kbps, 48kHz in, 48kHz out, BINAURAL out ../IVAS_cod -ism_masa 1 2 NULL testv/stv2MASA2TC48c.met 13200 48 testv/stvOMASA_1ISM_2MASA2TC48c.wav bit ../IVAS_dec BINAURAL 48 bit testv/stvOMASA_1ISM_2MASA2TC48c.wav_BINAURAL_13200_48-48.tst -// OMASA 2Dir1TC 4ISM at 24.4 kbps, 48kHz in, 48kHz out, STEREO out +// OMASA 2Dir1TC 4ISM at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL out ../IVAS_cod -ism_masa 4 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv2MASA1TC48c.met 24400 48 testv/stvOMASA_4ISM_2MASA1TC48c.wav bit -../IVAS_dec STEREO 48 bit testv/stvOMASA_4ISM_2MASA1TC48c.wav_STEREO_24400_48-48.tst +../IVAS_dec BINAURAL 48 bit testv/stvOMASA_4ISM_2MASA1TC48c.wav_BINAURAL4400_48-48.tst -// OMASA 2Dir1TC 3ISM at br sw techs 13.2 to 512 kbps start 48 kbps, 48kHz in, 32kHz out, STEREO out +// OMASA 2Dir1TC 3ISM at br sw techs 13.2 to 512 kbps start 48 kbps, 48kHz in, 32kHz out, BINAURAL out ../IVAS_cod -ism_masa 3 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stv2MASA1TC48c.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_48k_omasatechs_3ism.bin 48 testv/stvOMASA_3ISM_2MASA1TC48c.wav bit -../IVAS_dec STEREO 32 bit testv/stvOMASA_3ISM_2MASA1TC48c.wav_STEREO_sw_48-32.tst +../IVAS_dec BINAURAL 32 bit testv/stvOMASA_3ISM_2MASA1TC48c.wav_BINAURAL_sw_48-32.tst -// OMASA 2Dir1TC 3ISM at 96 kbps, 48kHz in, 48kHz out, MONO out +// OMASA 2Dir1TC 3ISM at 96 kbps, 48kHz in, 48kHz out, BINAURAL out ../IVAS_cod -ism_masa 3 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stv2MASA1TC48c.met 96000 48 testv/stvOMASA_3ISM_2MASA1TC48c.wav bit -../IVAS_dec MONO 48 bit testv/stvOMASA_3ISM_2MASA1TC48c.wav_MONO_96000_48-48.tst +../IVAS_dec BINAURAL 48 bit testv/stvOMASA_3ISM_2MASA1TC48c.wav_BINAURAL_96000_48-48.tst -// OMASA 2Dir1TC 3ISM at 24.4 kbps, 48kHz in, 16kHz out, FOA out +// OMASA 2Dir1TC 3ISM at 24.4 kbps, 48kHz in, 16kHz out, BINAURAL out ../IVAS_cod -ism_masa 3 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stv2MASA1TC48c.met 24400 48 testv/stvOMASA_3ISM_2MASA1TC48c.wav bit -../IVAS_dec FOA 16 bit testv/stvOMASA_3ISM_2MASA1TC48c.wav_FOA_24400_48-16.tst +../IVAS_dec BINAURAL 16 bit testv/stvOMASA_3ISM_2MASA1TC48c.wav_BINAURAL_24400_48-16.tst -// OMASA 2Dir1TC 1ISM at 512 kbps, 32kHz in, 48kHz out, 7.1.4 out +// OMASA 2Dir1TC 1ISM at 512 kbps, 32kHz in, 48kHz out, BINAURAL out ../IVAS_cod -ism_masa 1 1 testv/stvISM1.csv testv/stv2MASA1TC48c.met 512000 32 testv/stvOMASA_1ISM_2MASA1TC32c.wav bit -../IVAS_dec 7_1_4 48 bit testv/stvOMASA_1ISM_2MASA1TC32c.wav_7_1_4_512000_32-48.tst +../IVAS_dec BINAURAL 48 bit testv/stvOMASA_1ISM_2MASA1TC32c.wav_BINAURAL_512000_32-48.tst -// OMASA 1Dir2TC 4ISM at br sw techs 13.2 to 512 kbps start 80 kbps, 48kHz in, 48kHz out, FOA out +// OMASA 1Dir2TC 4ISM at br sw techs 13.2 to 512 kbps start 80 kbps, 48kHz in, 48kHz out, BINAURAL out ../IVAS_cod -ism_masa 4 2 NULL testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv1MASA2TC48c.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_80k_omasatechs_4ism.bin 48 testv/stvOMASA_4ISM_1MASA2TC48c.wav bit -../IVAS_dec FOA 48 bit testv/stvOMASA_4ISM_1MASA2TC48c.wav_FOA_sw_48-48.tst +../IVAS_dec BINAURAL 48 bit testv/stvOMASA_4ISM_1MASA2TC48c.wav_BINAURAL_sw_48-48.tst -// OMASA 1Dir2TC 4ISM at 80 kbps, 48kHz in, 48kHz out, MONO out +// OMASA 1Dir2TC 4ISM at 80 kbps, 48kHz in, 48kHz out, BINAURAL out ../IVAS_cod -ism_masa 4 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv1MASA2TC48c.met 80000 48 testv/stvOMASA_4ISM_1MASA2TC48c.wav bit -../IVAS_dec MONO 48 bit testv/stvOMASA_4ISM_1MASA2TC48c.wav_MONO_80000_48-48.tst +../IVAS_dec BINAURAL 48 bit testv/stvOMASA_4ISM_1MASA2TC48c.wav_BINAURAL_80000_48-48.tst -// OMASA 1Dir2TC 4ISM at 32 kbps, 48kHz in, 48kHz out, FOA out +// OMASA 1Dir2TC 4ISM at 32 kbps, 48kHz in, 48kHz out, BINAURAL out ../IVAS_cod -ism_masa 4 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv1MASA2TC48c.met 32000 48 testv/stvOMASA_4ISM_1MASA2TC48c.wav bit -../IVAS_dec FOA 48 bit testv/stvOMASA_4ISM_1MASA2TC48c.wav_FOA_32000_48-48.tst +../IVAS_dec BINAURAL 48 bit testv/stvOMASA_4ISM_1MASA2TC48c.wav_BINAURAL_32000_48-48.tst -// OMASA 1Dir2TC 3ISM at br sw techs 13.2 to 512 kbps start 24.4 kbps, 32kHz in, 48kHz out, 5.1.2 out +// OMASA 1Dir2TC 3ISM at br sw techs 13.2 to 512 kbps start 24.4 kbps, 32kHz in, 48kHz out, BINAURAL out ../IVAS_cod -ism_masa 3 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stv1MASA2TC48c.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_24k4_omasatechs_3ism.bin 32 testv/stvOMASA_3ISM_1MASA2TC32c.wav bit -../IVAS_dec 5_1_2 48 bit testv/stvOMASA_3ISM_1MASA2TC32c.wav_5_1_2_sw_32-48.tst +../IVAS_dec BINAURAL 48 bit testv/stvOMASA_3ISM_1MASA2TC32c.wav_BINAURAL_sw_32-48.tst -// OMASA 1Dir2TC 3ISM at 32 kbps, 48kHz in, 16kHz out, STEREO out +// OMASA 1Dir2TC 3ISM at 32 kbps, 48kHz in, 16kHz out, BINAURAL out ../IVAS_cod -ism_masa 3 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stv1MASA2TC48c.met 32000 48 testv/stvOMASA_3ISM_1MASA2TC48c.wav bit -../IVAS_dec STEREO 16 bit testv/stvOMASA_3ISM_1MASA2TC48c.wav_STEREO_32000_48-16.tst +../IVAS_dec BINAURAL 16 bit testv/stvOMASA_3ISM_1MASA2TC48c.wav_BINAURAL_32000_48-16.tst -// OMASA 1Dir2TC 3ISM at 160 kbps, 16kHz in, 32kHz out, HOA3 out +// OMASA 1Dir2TC 3ISM at 160 kbps, 16kHz in, 32kHz out, BINAURAL out ../IVAS_cod -ism_masa 3 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stv1MASA2TC48c.met 160000 16 testv/stvOMASA_3ISM_1MASA2TC16c.wav bit -../IVAS_dec HOA3 32 bit testv/stvOMASA_3ISM_1MASA2TC16c.wav_HOA3_160000_16-32.tst +../IVAS_dec BINAURAL 32 bit testv/stvOMASA_3ISM_1MASA2TC16c.wav_BINAURAL_160000_16-32.tst -// OMASA 1Dir2TC 2ISM at 256 kbps, 48kHz in, 32kHz out, BINAURAL_ROOM_IR out +// OMASA 1Dir2TC 2ISM at 256 kbps, 48kHz in, 32kHz out, BINAURAL out ../IVAS_cod -ism_masa 2 2 testv/stvISM1.csv NULL testv/stv1MASA2TC48c.met 256000 48 testv/stvOMASA_2ISM_1MASA2TC48c.wav bit -../IVAS_dec BINAURAL_ROOM_IR 32 bit testv/stvOMASA_2ISM_1MASA2TC48c.wav_BINAURAL_ROOM_IR_256000_48-32.tst +../IVAS_dec BINAURAL 32 bit testv/stvOMASA_2ISM_1MASA2TC48c.wav_BINAURAL56000_48-32.tst -// OMASA 1Dir2TC 1ISM at 128 kbps, 48kHz in, 48kHz out, EXT out, bandwidth switching +// OMASA 1Dir2TC 1ISM at 128 kbps, 48kHz in, 48kHz out, BINAURAL out, bandwidth switching ../IVAS_cod -max_band testv/ivas_bws_20fr_start_SWB.txt -ism_masa 1 2 testv/stvISM1.csv testv/stv1MASA2TC48c.met 128000 48 testv/stvOMASA_1ISM_1MASA2TC48c.wav bit -../IVAS_dec EXT 48 bit testv/stvOMASA_1ISM_1MASA2TC48c.wav_EXT_128000_48-48.tst +../IVAS_dec BINAURAL 48 bit testv/stvOMASA_1ISM_1MASA2TC48c.wav_BINAURAL_128000_48-48.tst // OMASA 1Dir1TC 4ISM at br sw techs 13.2 to 512 kbps start 32 kbps, 48kHz in, 48kHz out, BINAURAL out ../IVAS_cod -ism_masa 4 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv1MASA1TC48c.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_32k_omasatechs_4ism.bin 48 testv/stvOMASA_4ISM_1MASA1TC48c.wav bit ../IVAS_dec BINAURAL 48 bit testv/stvOMASA_4ISM_1MASA1TC48c.wav_BINAURAL_sw_48-48.tst -// OMASA 1Dir1TC 4ISM at 48 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out +// OMASA 1Dir1TC 4ISM at 48 kbps, 48kHz in, 48kHz out, BINAURAL out ../IVAS_cod -ism_masa 4 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv1MASA1TC48c.met 48000 48 testv/stvOMASA_4ISM_1MASA1TC48c.wav bit -../IVAS_dec BINAURAL_ROOM_REVERB 48 bit testv/stvOMASA_4ISM_1MASA1TC48c.wav_BINAURAL_ROOM_REVERB_48000_48-48.tst - -// OMASA 1Dir1TC 4ISM 48 kbps 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out custom configuration -../IVAS_cod -ism_masa 4 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv1MASA1TC48c.met 48000 48 testv/stvOMASA_4ISM_1MASA1TC48c.wav bit -../IVAS_dec -render_config testv/rend_config_hospital_patientroom.cfg BINAURAL_ROOM_REVERB 48 bit testv/stvOMASA_4ISM_1MASA1TC48c.wav_BINAURAL_ROOM_REVERB_48000_48-48_custom_configuration.tst +../IVAS_dec BINAURAL 48 bit testv/stvOMASA_4ISM_1MASA1TC48c.wav_BINAURAL_48000_48-48.tst // OMASA 1Dir1TC 3ISM at 64 kbps, 32kHz in, 32kHz out, BINAURAL out ../IVAS_cod -ism_masa 3 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stv1MASA1TC48c.met 64000 32 testv/stvOMASA_3ISM_1MASA1TC32c.wav bit ../IVAS_dec BINAURAL 32 bit testv/stvOMASA_3ISM_1MASA1TC32c.wav_BINAURAL_64000_32-32.tst -// OMASA 1Dir1TC 2ISM at 16.4 kbps, 16kHz in, 48kHz out, 5.1 out +// OMASA 1Dir1TC 2ISM at 16.4 kbps, 16kHz in, 48kHz out, BINAURAL out ../IVAS_cod -ism_masa 2 1 testv/stvISM1.csv testv/stvISM2.csv testv/stv1MASA1TC48c.met 16400 16 testv/stvOMASA_2ISM_1MASA1TC16c.wav bit -../IVAS_dec 5_1 48 bit testv/stvOMASA_2ISM_1MASA1TC16c.wav_5_1_16400_16-48.tst +../IVAS_dec BINAURAL 48 bit testv/stvOMASA_2ISM_1MASA1TC16c.wav_BINAURAL_16400_16-48.tst -// Multi-channel 7_1_4 bitrate switching from 24.4 kbps to 256 kbps, 48kHz in, 32kHz out, STEREO out +// Multi-channel 7_1_4 bitrate switching from 24.4 kbps to 256 kbps, 48kHz in, 32kHz out, 7_1_4 out ../IVAS_cod -mc 7_1_4 ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/stv714MC48c.wav bit -../IVAS_dec STEREO 32 bit testv/stv714MC48c.wav_sw_48-32_stereo.tst - -// Multi-channel 7_1_4 bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, HOA3 out -../IVAS_cod -mc 7_1_4 ../scripts/switchPaths/sw_mctech_5fr.bin 48 testv/stv714MC48c.wav bit -../IVAS_dec HOA3 48 bit testv/stv51MC48c.wav_sw_48-48_HOA3.tst +../IVAS_dec 7_1_4 32 bit testv/stv714MC48c.wav_sw_48-32_7_1_4.tst // Multi-channel 7_1_4 bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, 7_1_4 out ../IVAS_cod -mc 7_1_4 ../scripts/switchPaths/sw_mctech_5fr.bin 48 testv/stv714MC48c.wav bit -../IVAS_dec 7_1_4 48 bit testv/stv714MC48c.wav_sw_48-48_7_1_4.tst - -// Multi-channel 7_1_4 bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, BINAURAL out (Model from file) -../IVAS_cod -mc 7_1_4 ../scripts/switchPaths/sw_mctech_5fr.bin 48 testv/stv714MC48c.wav bit -../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin BINAURAL 48 bit testv/stv51MC48c.wav_sw_48-48_BINAURAL.tst +../IVAS_dec 7_1_4 48 bit testv/stv51MC48c.wav_sw_48-48_7_1_4.tst -// Multi-channel 7_1_4 at 96 kbps, 48kHz in, 48kHz out, STEREO out +// Multi-channel 7_1_4 at 96 kbps, 48kHz in, 48kHz out, 7_1_4 out ../IVAS_cod -mc 7_1_4 96000 48 testv/stv714MC48c.wav bit -../IVAS_dec STEREO 48 bit testv/stv714MC48c.wav_MC714_96000_48-48_Stereo.tst +../IVAS_dec 7_1_4 48 bit testv/stv714MC48c.wav_MC714_96000_48-48_7_1_4.tst -// Multi-channel 7_1_4 at 64 kbps, 48kHz in, 48kHz out, MONO out +// Multi-channel 7_1_4 at 64 kbps, 48kHz in, 48kHz out, 7_1_4 out ../IVAS_cod -mc 7_1_4 64000 48 testv/stv714MC48c.wav bit -../IVAS_dec MONO 48 bit testv/stv714MC48c.wav_MC714_64000_48-48_MONO.tst +../IVAS_dec 7_1_4 48 bit testv/stv714MC48c.wav_MC714_64000_48-48_7_1_4.tst -// Multi-channel 7_1_4 at 512 kbps, 48kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out default configuration +// Multi-channel 7_1_4 at 512 kbps, 48kHz in, 48 kHz out, 7_1_4 out default configuration ../IVAS_cod -mc 7_1_4 512000 48 testv/stv714MC48c.wav bit -../IVAS_dec BINAURAL_ROOM_REVERB 48 bit testv/stv71MC48c.wav_BINAURAL_ROOM_REVERB_512000_48-48.tst +../IVAS_dec 7_1_4 48 bit testv/stv71MC48c.wav_7_1_4_512000_48-48.tst -// Multi-channel 7_1_4 at 48 kbps, 48kHz in, 48kHz out, MONO out, bandwidth switching +// Multi-channel 7_1_4 at 48 kbps, 48kHz in, 48kHz out, 7_1_4 out, bandwidth switching ../IVAS_cod -max_band testv/ivas_bws_20fr_start_SWB.txt -mc 7_1_4 48000 48 testv/stv714MC48c.wav bit -../IVAS_dec MONO 48 bit testv/stv714MC48c.wav_MC714_48000_48-48_Mono_bwsw.tst +../IVAS_dec 7_1_4 48 bit testv/stv714MC48c.wav_MC714_48000_48-48_7_1_4_bwsw.tst // Multi-channel 7_1_4 at 256 kbps, 48kHz in, 48kHz out, 7_1_4 out ../IVAS_cod -mc 7_1_4 256000 48 testv/stv714MC48c.wav bit ../IVAS_dec 7_1_4 48 bit testv/stv714MC48c.wav_MC714_256000_48-48_7_1_4.tst -// Multi-channel 7_1_4 at 160 kbps, 48kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out default configuration +// Multi-channel 7_1_4 at 160 kbps, 48kHz in, 48 kHz out, 7_1_4 out default configuration ../IVAS_cod -mc 7_1_4 160000 48 testv/stv714MC48c.wav bit -../IVAS_dec BINAURAL_ROOM_REVERB 48 bit testv/stv71MC48c.wav_BINAURAL_ROOM_REVERB_160000_48-48.tst +../IVAS_dec 7_1_4 48 bit testv/stv71MC48c.wav_7_1_4_160000_48-48.tst // Multi-channel 7_1 bitrate switching from 24.4 kbps to 256 kbps, 48kHz in, 16kHz out, 7_1 out ../IVAS_cod -mc 7_1 ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/stv71MC48c.wav bit ../IVAS_dec 7_1 16 bit testv/stv71MCMC48c.wav_sw_48-16_7_1.tst -// Multi-channel 7_1 bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, BINAURAL out (model from file), head rotation +// Multi-channel 7_1 bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, 7_1 out ../IVAS_cod -mc 7_1 ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stv71MC48c.wav bit -../IVAS_dec -t testv/headrot.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin BINAURAL 48 bit testv/stv71C48c.wav_sw_48-48_Binaural_model_file_headrot.tst +../IVAS_dec 7_1 48 bit testv/stv71C48c.wav_sw_48-48_7_1_model_file_headrot.tst -// Multi-channel 7_1 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out Config renderer +// Multi-channel 7_1 at 512 kbps, 48kHz in, 48kHz out, 7_1 ../IVAS_cod -mc 7_1 512000 48 testv/stv71MC48c.wav bit -../IVAS_dec -render_config testv/rend_config_renderer.cfg BINAURAL_ROOM_REVERB 48 bit testv/stv71MC48c.wav_MC71_512000_48-48_MC_Config_renderer.tst +../IVAS_dec 7_1 48 bit testv/stv71MC48c.wav_MC71_512000_48-48_7_1_Config_renderer.tst // Multi-channel 5_1_4 bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 32kHz out, 5_1_4 out ../IVAS_cod -mc 5_1_4 ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stv514MC48c.wav bit ../IVAS_dec 5_1_4 32 bit testv/stv514MC48c.wav_sw_48-32_5_1_4.tst -// Multi-channel 5_1_4 at 512 kbps, 48kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out default configuration +// Multi-channel 5_1_4 at 512 kbps, 48kHz in, 48 kHz out, 7_1 out default configuration ../IVAS_cod -mc 5_1_4 512000 48 testv/stv514MC48c.wav bit -../IVAS_dec BINAURAL_ROOM_REVERB 48 bit testv/stv51MC48c.wav_BINAURAL_ROOM_REVERB_512000_48-48.tst +../IVAS_dec 7_1 48 bit testv/stv51MC48c.wav_7_1_512000_48-48.tst -// Multi-channel 5_1_4 at 48 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_IR out, HR +// Multi-channel 5_1_4 at 48 kbps, 48kHz in, 48kHz out, 7_1 out ../IVAS_cod -mc 5_1_4 48000 48 testv/stv514MC48c.wav bit -../IVAS_dec -t testv/headrot.csv BINAURAL_ROOM_IR 48 bit testv/stv514MC48c.wav_MC514_48000_48-48_BinauralRoom_Headrot.tst +../IVAS_dec 7_1 48 bit testv/stv514MC48c.wav_MC514_48000_48-48_7_1.tst // Multi-channel 5_1_2 bitrate switching from 24.4 kbps to 256 kbps, 48kHz in, 48kHz out, 5_1_2 out ../IVAS_cod -mc 5_1_2 ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/stv512MC48c.wav bit ../IVAS_dec 5_1_2 48 bit testv/stv512MC48c.wav_sw_48-48_5_1_2.tst -// Multi-channel 5_1_2 bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 16kHz out, BINAURAL_ROOM out +// Multi-channel 5_1_2 bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 16kHz out, 5_1_2 out ../IVAS_cod -mc 5_1_2 ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stv512MC48c.wav bit -../IVAS_dec BINAURAL_ROOM_IR 16 bit testv/stv512MC48c.wav_sw_48-16_Binaural_room.tst +../IVAS_dec 5_1_2 16 bit testv/stv512MC48c.wav_sw_48-16_5_1_2.tst -// Multi-channel 5_1_2 at 80 kbps, 48kHz in, 48kHz out, 5_1 out +// Multi-channel 5_1_2 at 80 kbps, 48kHz in, 48kHz out, 5_1_2 out ../IVAS_cod -mc 5_1_2 80000 48 testv/stv512MC48c.wav bit -../IVAS_dec 5_1 48 bit testv/stv512MC48c.wav_MC512_80000_48-48_5_1.tst +../IVAS_dec 5_1_2 48 bit testv/stv512MC48c.wav_MC512_80000_48-48_5_1_2.tst -// Multi-channel 5_1_2 at 64 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out Config renderer, HR +// Multi-channel 5_1_2 at 64 kbps, 48kHz in, 48kHz out, 5_1_2 ../IVAS_cod -mc 5_1_2 64000 48 testv/stv512MC48c.wav bit -../IVAS_dec -render_config testv/rend_config_renderer.cfg -t testv/headrot_case04_3000_q.csv BINAURAL_ROOM_REVERB 48 bit testv/stv512MC48c.wav_MC512_64000_48-48_MC_Config_renderer-HR.tst +../IVAS_dec 5_1_2 48 bit testv/stv512MC48c.wav_MC512_64000_48-48_5_1_2.tst -// Multi-channel 5_1_2 at 32 kbps, 48kHz in, 48kHz out, STEREO out +// Multi-channel 5_1_2 at 32 kbps, 48kHz in, 48kHz out, 5_1_2 out ../IVAS_cod -mc 5_1_2 32000 48 testv/stv512MC48c.wav bit -../IVAS_dec STEREO 48 bit testv/stv512MC48c.wav_MC512_32000_48-48_Stereo.tst +../IVAS_dec 5_1_2 48 bit testv/stv512MC48c.wav_MC512_32000_48-48_5_1_2.tst // Multi-channel 5_1_2 at 160 kbps, 48kHz in, 48kHz out, 5_1_2 out ../IVAS_cod -mc 5_1_2 160000 48 testv/stv512MC48c.wav bit @@ -678,37 +642,29 @@ // Multi-channel 5_1 bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, 5_1 out ../IVAS_cod -mc 5_1 ../scripts/switchPaths/sw_mctech_5fr.bin 48 testv/stv51MC48c.wav bit -../IVAS_dec HOA3 48 bit testv/stv51MC48c.wav_sw_48-48_5_1.tst +../IVAS_dec 5_1 48 bit testv/stv51MC48c.wav_sw_48-48_5_1.tst -// Multi-channel 5_1 bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, 7_1_4 out -../IVAS_cod -mc 5_1 ../scripts/switchPaths/sw_mctech_5fr.bin 48 testv/stv51MC48c.wav bit -../IVAS_dec 7_1_4 48 bit testv/stv51MC48c.wav_sw_48-48_7_1_4.tst - -// Multi-channel 5_1 bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 16kHz out, BINAURAL_ROOM_REVERB out -../IVAS_cod -mc 5_1 ../scripts/switchPaths/sw_mctech_5fr.bin 48 testv/stv51MC48c.wav bit -../IVAS_dec BINAURAL_ROOM_REVERB 16 bit testv/stv51MC48c.wav_sw_48-16_Binaural_room.tst - -// Multi-channel 5_1 bitrate switching from 13.2 kbps to 512 kbps, 32kHz in, 48kHz out, BINAURAL_ROOM_IR out +// Multi-channel 5_1 bitrate switching from 13.2 kbps to 512 kbps, 32kHz in, 48kHz out, 5_1 out ../IVAS_cod -mc 5_1 ../scripts/switchPaths/sw_mctech_5fr.bin 32 testv/stv51MC32c.wav bit -../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/stv51MC32c.wav_sw_32-48_Binaural_room.tst +../IVAS_dec 5_1 48 bit testv/stv51MC32c.wav_sw_32-48_5_1.tst // Multi-channel 5_1 at 96 kbps, 48kHz in, 48kHz out, bandwidth switching ../IVAS_cod -max_band testv/ivas_bws_20fr_start_FB.txt -mc 5_1 96000 48 testv/stv51MC48c.wav bit ../IVAS_dec 5_1 48 bit testv/stv51MC48c.wav_MC51_96000_48-48_5_1.tst -// Multi-channel 5_1 at 80 kbps, 48kHz in, 32kHz out, BINAURAL_ROOM_REVERB out Config renderer, HR +// Multi-channel 5_1 at 80 kbps, 48kHz in, 32kHz out, 5_1 out ../IVAS_cod -mc 5_1 80000 48 testv/stv51MC48c.wav bit -../IVAS_dec -render_config testv/rend_config_renderer.cfg -t ../scripts/trajectories/full-circle-4s.csv BINAURAL_ROOM_REVERB 32 bit testv/stv51MC48c.wav_MC51_80000_48-32_MC_Config_renderer.tst +../IVAS_dec 5_1 32 bit testv/stv51MC48c.wav_MC51_80000_48-32_MC_Config_renderer.tst -// Multi-channel 5_1 at 64 kbps, 48kHz in, 48kHz out, BINAURAL out +// Multi-channel 5_1 at 64 kbps, 48kHz in, 48kHz out, 5_1 out ../IVAS_cod -mc 5_1 64000 48 testv/stv51MC48c.wav bit -../IVAS_dec BINAURAL 48 bit testv/stv51MC48c.wav_MC51_64000_48-48_Binaural.tst +../IVAS_dec 5_1 48 bit testv/stv51MC48c.wav_MC51_64000_48-48_5_1.tst -// Multi-channel 5_1 at 512 kbps, 48kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out default configuration +// Multi-channel 5_1 at 512 kbps, 48kHz in, 48 kHz out, 5_1 ../IVAS_cod -mc 5_1 512000 48 testv/stv51MC48c.wav bit -../IVAS_dec BINAURAL_ROOM_REVERB 48 bit testv/stv51MC48c.wav_BINAURAL_ROOM_REVERB_512000_48-48.tst +../IVAS_dec 5_1 48 bit testv/stv51MC48c.wav_5_1_512000_48-48.tst -// Multi-channel 5_1 at 48 kbps, 48kHz in, 48kHz out +// Multi-channel 5_1 at 48 kbps, 48kHz in, 48kHz out, 5_1 out ../IVAS_cod -mc 5_1 48000 48 testv/stv51MC48c.wav bit ../IVAS_dec 5_1 48 bit testv/stv51MC48c.wav_MC51_48000_48-48_5_1.tst @@ -716,61 +672,49 @@ ../IVAS_cod -mc 5_1 384000 48 testv/stv51MC48c.wav bit ../IVAS_dec 5_1 48 bit testv/stv51MC48c.wav_MC51_384000_48-48_5_1.tst -// Multi-channel 5_1 at 256 kbps, 48kHz in, 48kHz out, STEREO out +// Multi-channel 5_1 at 256 kbps, 48kHz in, 48kHz out, 5_1 out ../IVAS_cod -mc 5_1 256000 48 testv/stv51MC48c.wav bit -../IVAS_dec STEREO 48 bit testv/stv51MC48c.wav_MC51_256000_48-48_stereo.tst +../IVAS_dec 5_1 48 bit testv/stv51MC48c.wav_MC51_256000_48-48_5_1.tst -// Multi-channel 5_1 at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL out +// Multi-channel 5_1 at 24.4 kbps, 48kHz in, 48kHz out, 5_1 out ../IVAS_cod -mc 5_1 24400 48 testv/stv51MC48c.wav bit -../IVAS_dec BINAURAL 48 bit testv/stv51MC48c.wav_MC51_24400_48-48_Binaural.tst +../IVAS_dec 5_1 48 bit testv/stv51MC48c.wav_MC51_24400_48-48_5_1.tst -// Multi-channel 5_1 at 192 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out +// Multi-channel 5_1 at 192 kbps, 48kHz in, 48kHz out, 5_1 out ../IVAS_cod -mc 5_1 192000 48 testv/stv51MC48c.wav bit -../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/stv51MC48c.wav_MC51_192000_48-48_BinauralRoom.tst +../IVAS_dec 5_1 48 bit testv/stv51MC48c.wav_MC51_192000_48-48_5_1.tst // Multi-channel 5_1 at 13.2 kbps, 48kHz in, 48kHz out ../IVAS_cod -mc 5_1 13200 48 testv/stv51MC48c.wav bit ../IVAS_dec 5_1 48 bit testv/stv51MC48c.wav_MC51_13200_48-48_5_1.tst -// Multi-channel 5_1 at 128 kbps, 48kHz in, 48kHz out, BINAURAL out +// Multi-channel 5_1 at 128 kbps, 48kHz in, 48kHz out, 5_1 out ../IVAS_cod -mc 5_1 128000 48 testv/stv51MC48c.wav bit -../IVAS_dec BINAURAL 48 bit testv/stv51MC48c.wav_MC51_128000_48-48_Binaural.tst +../IVAS_dec 5_1 48 bit testv/stv51MC48c.wav_MC51_128000_48-48_5_1.tst // MASA 2dir 2TC bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 2 testv/stv2MASA2TC48c.met ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stv2MASA2TC48c.wav bit ../IVAS_dec EXT 48 bit testv/stv2MASA2TC48c.wav_sw_48-48_EXT.tst -// MASA 2dir 2TC bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, BINAURAL out -../IVAS_cod -masa 2 testv/stv2MASA2TC48c.met ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stv2MASA2TC48c.wav bit -../IVAS_dec BINAURAL 48 bit testv/stv2MASA2TC48c.wav_sw_48-48_BINAURAL.tst - -// MASA 2dir 2TC bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, 7_1 out -../IVAS_cod -masa 2 testv/stv2MASA2TC48c.met ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stv2MASA2TC48c.wav bit -../IVAS_dec 7_1 48 bit testv/stv2MASA2TC48c.wav_sw_48-48_7_1.tst - -// MASA 2dir 2TC bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 16kHz out, BINAURAL out -../IVAS_cod -masa 2 testv/stv2MASA2TC48c.met ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stv2MASA2TC48c.wav bit -../IVAS_dec BINAURAL 16 bit testv/stv2MASA2TC48c.wav_sw_48-16_BINAURAL.tst - // MASA 2dir 2TC at 96 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 2 testv/stv2MASA2TC48c.met 96000 48 testv/stv2MASA2TC48c.wav bit ../IVAS_dec EXT 48 bit testv/stv2MASA2TC48c.wav_96000_48-48_EXT.tst -// MASA 2dir 2TC at 64 kbps, 48kHz in, 48kHz out, EXTERNAL out +// MASA 2dir 2TC at 64 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 2 testv/stv2MASA2TC48c.met 64000 48 testv/stv2MASA2TC48c.wav bit -../IVAS_dec EXT 48 bit testv/stv2MASA2TC48c.wav_64000_48-48_external.tst +../IVAS_dec EXT 48 bit testv/stv2MASA2TC48c.wav_64000_48-48_EXT.tst -// MASA 2dir 2TC at 512 kbps, 48kHz in, 48kHz out, 5_1 out +// MASA 2dir 2TC at 512 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 2 testv/stv2MASA2TC48c.met 512000 48 testv/stv2MASA2TC48c.wav bit -../IVAS_dec 5_1 48 bit testv/stv2MASA2TC48c.wav_512000_48-48_5_1.tst +../IVAS_dec EXT 48 bit testv/stv2MASA2TC48c.wav_512000_48-48_EXT.tst -// MASA 2dir 2TC at 48 kbps, 48kHz in, 48kHz out, 5_1 out, bandwidth switching +// MASA 2dir 2TC at 48 kbps, 48kHz in, 48kHz out, EXT out, bandwidth switching ../IVAS_cod -max_band testv/ivas_bws_20fr_start_FB.txt -masa 2 testv/stv2MASA2TC48c.met 48000 48 testv/stv2MASA2TC48c.wav bit -../IVAS_dec 5_1 48 bit testv/stv2MASA2TC48c.wav_48000_48-48_5_1.tst +../IVAS_dec EXT 48 bit testv/stv2MASA2TC48c.wav_48000_48-48_EXT.tst -// MASA 2dir 2TC at 384 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM out +// MASA 2dir 2TC at 384 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 2 testv/stv2MASA2TC48c.met 384000 48 testv/stv2MASA2TC48c.wav bit -../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/stv2MASA2TC48c.wav_384000_48-48_BinauralRoom.tst +../IVAS_dec EXT 48 bit testv/stv2MASA2TC48c.wav_384000_48-48_EXTRoom.tst // MASA 2dir 2TC at 32 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 2 testv/stv2MASA2TC48c.met 32000 48 testv/stv2MASA2TC48c.wav bit @@ -780,9 +724,9 @@ ../IVAS_cod -masa 2 testv/stv2MASA2TC48c.met 256000 48 testv/stv2MASA2TC48c.wav bit ../IVAS_dec EXT 48 bit testv/stv2MASA2TC48c.wav_256000_48-48_EXT.tst -// MASA 2dir 2TC at 192 kbps, 48kHz in, 48kHz out, 5_1_4 out +// MASA 2dir 2TC at 192 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 2 testv/stv2MASA2TC48c.met 192000 48 testv/stv2MASA2TC48c.wav bit -../IVAS_dec 5_1_4 48 bit testv/stv2MASA2TC48c.wav_192000_48-48_5_1_4.tst +../IVAS_dec EXT 48 bit testv/stv2MASA2TC48c.wav_192000_48-48_EXT.tst // MASA 2dir 2TC at 160 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 2 testv/stv2MASA2TC48c.met 160000 48 testv/stv2MASA2TC48c.wav bit @@ -800,234 +744,182 @@ ../IVAS_cod -masa 1 testv/stv2MASA1TC48c.met 24400 48 testv/stv2MASA1TC48c.wav bit ../IVAS_dec EXT 32 bit testv/stv2MASA1TC48c.wav_24400_48-32_EXT.tst -// MASA 2dir 1TC at 128 kbps, 48kHz in, 48kHz out, BINAURAL out +// MASA 2dir 1TC at 128 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 1 testv/stv2MASA1TC48c.met 128000 48 testv/stv2MASA1TC48c.wav bit -../IVAS_dec BINAURAL 48 bit testv/stv2MASA1TC48c.wav_128000_48-48_BINAURAL.tst +../IVAS_dec EXT 48 bit testv/stv2MASA1TC48c.wav_128000_48-48_EXT.tst -// MASA 1dir 2TC bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, MONO out +// MASA 1dir 2TC bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 2 testv/stv1MASA2TC48n.met ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stv1MASA2TC48n.wav bit -../IVAS_dec MONO 48 bit testv/stv1MASA2TC48n.wav_sw_48-48_MONO.tst +../IVAS_dec EXT 48 bit testv/stv1MASA2TC48n.wav_sw_48-48_EXT.tst -// MASA 1dir 2TC bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, DTX on, BINAURAL out +// MASA 1dir 2TC bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, DTX on, EXT out ../IVAS_cod -dtx -masa 2 testv/stv1MASA2TC48n.met ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stv1MASA2TC48n.wav bit -../IVAS_dec BINAURAL 48 bit testv/stv1MASA2TC48n.wav_sw_48-48_DTX_BINAURAL.tst - -// MASA 1dir 2TC bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, BINAURAL out (Model from file) -../IVAS_cod -masa 2 testv/stv1MASA2TC48n.met ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stv1MASA2TC48n.wav bit -../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin BINAURAL 48 bit testv/stv1MASA2TC48n.wav_sw_48-48_BINAURAL.tst - -// MASA 1dir 2TC bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, 7_1 out -../IVAS_cod -masa 2 testv/stv1MASA2TC48n.met ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stv1MASA2TC48n.wav bit -../IVAS_dec 7_1 48 bit testv/stv1MASA2TC48n.wav_sw_48-48_7_1.tst +../IVAS_dec EXT 48 bit testv/stv1MASA2TC48n.wav_sw_48-48_DTX_EXT.tst -// MASA 1dir 2TC bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 32kHz out, MONO out -../IVAS_cod -masa 2 testv/stv1MASA2TC48n.met ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stv1MASA2TC48n.wav bit -../IVAS_dec MONO 32 bit testv/stv1MASA2TC48n.wav_sw_48-32_MONO.tst - -// MASA 1dir 2TC bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 16kHz out, BINAURAL out -../IVAS_cod -masa 2 testv/stv1MASA2TC48n.met ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stv1MASA2TC48n.wav bit -../IVAS_dec BINAURAL 16 bit testv/stv1MASA2TC48n.wav_sw_48-16_BINAURAL.tst - -// MASA 1dir 2TC at 96 kbps, 48kHz in, 48kHz out, MONO out +// MASA 1dir 2TC at 96 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 2 testv/stv1MASA2TC48c.met 96000 48 testv/stv1MASA2TC48c.wav bit -../IVAS_dec MONO 48 bit testv/stv1MASA2TC48c.wav_96000_48-48_MONO.tst +../IVAS_dec EXT 48 bit testv/stv1MASA2TC48c.wav_96000_48-48_EXT.tst -// MASA 1dir 2TC at 80 kbps, 32kHz in, 16kHz out, STEREO out +// MASA 1dir 2TC at 80 kbps, 32kHz in, 16kHz out, EXT out ../IVAS_cod -masa 2 testv/stv1MASA2TC32c.met 80000 32 testv/stv1MASA2TC32c.wav bit -../IVAS_dec STEREO 16 bit testv/stv1MASA2TC32c.wav_80000_32-16_STEREO.tst +../IVAS_dec EXT 16 bit testv/stv1MASA2TC32c.wav_80000_32-16_EXT.tst // MASA 1dir 2TC at 64 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 2 testv/stv1MASA2TC48c.met 64000 48 testv/stv1MASA2TC48c.wav bit ../IVAS_dec EXT 48 bit testv/stv1MASA2TC48c.wav_64000_48-48_EXT.tst -// MASA 1dir 2TC at 48 kbps, 48kHz in, 48kHz out, 7_1_4 out +// MASA 1dir 2TC at 48 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 2 testv/stv1MASA2TC48c.met 48000 48 testv/stv1MASA2TC48c.wav bit -../IVAS_dec 7_1_4 48 bit testv/stv1MASA2TC48c.wav_48000_48-48_7_1_4.tst +../IVAS_dec EXT 48 bit testv/stv1MASA2TC48c.wav_48000_48-48_EXT.tst -// MASA 1dir 2TC at 32.0 kbps, 48kHz in, 48kHz out, DTX on, 5_1 out +// MASA 1dir 2TC at 32.0 kbps, 48kHz in, 48kHz out, DTX on, EXT out ../IVAS_cod -dtx -masa 2 testv/stv1MASA2TC48n.met 32000 48 testv/stv1MASA2TC48n.wav bit -../IVAS_dec 5_1 48 bit testv/stv1MASA2TC48n.wav_32000_48-48_DTX_5_1.tst +../IVAS_dec EXT 48 bit testv/stv1MASA2TC48n.wav_32000_48-48_DTX_EXT.tst -// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out +// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 2 testv/stv1MASA2TC48c.met 32000 48 testv/stv1MASA2TC48c.wav bit -../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/stv1MASA2TC48c.wav_32000_48-48_BinauralRoom.tst +../IVAS_dec EXT 48 bit testv/stv1MASA2TC48c.wav_32000_48-48_EXTRoom.tst -// MASA 1dir 2TC at 256 kbps, 48kHz in, 48kHz out, 5_1 out +// MASA 1dir 2TC at 256 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 2 testv/stv1MASA2TC48c.met 256000 48 testv/stv1MASA2TC48c.wav bit -../IVAS_dec 5_1 48 bit testv/stv1MASA2TC48c.wav_256000_48-48_5_1.tst +../IVAS_dec EXT 48 bit testv/stv1MASA2TC48c.wav_256000_48-48_EXT.tst -// MASA 1dir 2TC at 24.4 kbps, 48kHz in, 48kHz out, STEREO out +// MASA 1dir 2TC at 24.4 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 2 testv/stv1MASA2TC48c.met 24400 48 testv/stv1MASA2TC48c.wav bit -../IVAS_dec STEREO 48 bit testv/stv1MASA2TC48c.wav_24400_48-48_STEREO.tst +../IVAS_dec EXT 48 bit testv/stv1MASA2TC48c.wav_24400_48-48_EXT.tst -// MASA 1dir 2TC at 160 kbps, 48kHz in, 48kHz out, HOA3 out +// MASA 1dir 2TC at 160 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 2 testv/stv1MASA2TC48c.met 160000 48 testv/stv1MASA2TC48c.wav bit -../IVAS_dec HOA3 48 bit testv/stv1MASA2TC48c.wav_160000_48-48_HOA3.tst +../IVAS_dec EXT 48 bit testv/stv1MASA2TC48c.wav_160000_48-48_EXT.tst -// MASA 1dir 2TC at 16.4 kbps, 48kHz in, 48kHz out, DTX on, FOA out +// MASA 1dir 2TC at 16.4 kbps, 48kHz in, 48kHz out, DTX on, EXT out ../IVAS_cod -dtx -masa 2 testv/stv1MASA2TC48n.met 16400 48 testv/stv1MASA2TC48n.wav bit -../IVAS_dec FOA 48 bit testv/stv1MASA2TC48n.wav_16400_48-48_DTX_FOA.tst +../IVAS_dec EXT 48 bit testv/stv1MASA2TC48n.wav_16400_48-48_DTX_EXT.tst -// MASA 1dir 2TC at 16.4 kbps, 48kHz in, 48kHz out, 5_1 out +// MASA 1dir 2TC at 16.4 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 2 testv/stv1MASA2TC48c.met 16400 48 testv/stv1MASA2TC48c.wav bit -../IVAS_dec 5_1 48 bit testv/stv1MASA2TC48c.wav_16400_48-48_5_1.tst +../IVAS_dec EXT 48 bit testv/stv1MASA2TC48c.wav_16400_48-48_EXT.tst // MASA 1dir 2TC at 16.4 kbps, 16kHz in, 48kHz out, EXT out ../IVAS_cod -masa 2 testv/stv1MASA2TC16c.met 16400 16 testv/stv1MASA2TC16c.wav bit ../IVAS_dec EXT 48 bit testv/stv1MASA2TC16c.wav_16400_16-48_EXT.tst -// MASA 1dir 2TC at 13.2 kbps, 48kHz in, 48kHz out, 5_1 out, bandwidth switching +// MASA 1dir 2TC at 13.2 kbps, 48kHz in, 48kHz out, EXT out, bandwidth switching ../IVAS_cod -max_band testv/ivas_bws_20fr_start_WB.txt -masa 2 testv/stv1MASA2TC48c.met 13200 48 testv/stv1MASA2TC48c.wav bit -../IVAS_dec 5_1 48 bit testv/stv1MASA2TC48c.wav_13200_48-48_5_1.tst +../IVAS_dec EXT 48 bit testv/stv1MASA2TC48c.wav_13200_48-48_EXT.tst // MASA 1dir 2TC at 128 kbps, 48kHz in, 48kHz out, DTX on, EXT out ../IVAS_cod -dtx -masa 2 testv/stv1MASA2TC48n.met 128000 48 testv/stv1MASA2TC48n.wav bit ../IVAS_dec EXT 48 bit testv/stv1MASA2TC48n.wav_128000_48-48_DTX_EXT.tst -// MASA 1dir 1TC bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, STEREO out -../IVAS_cod -masa 1 testv/stv1MASA1TC48n.met ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/stv1MASA1TC48n.wav bit -../IVAS_dec STEREO 48 bit testv/stv1MASA1TC48n.wav_sw_48-48_STEREO.tst - -// MASA 1dir 1TC bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, STEREO out -../IVAS_cod -masa 1 testv/stv1MASA1TC48n.met ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/stv1MASA1TC48n.wav bit -../IVAS_dec STEREO 48 bit testv/stv1MASA1TC48n.wav_sw_48-48_STEREO.tst - -// MASA 1dir 1TC bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, FOA out +// MASA 1dir 1TC bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 1 testv/stv1MASA1TC48n.met ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/stv1MASA1TC48n.wav bit -../IVAS_dec FOA 48 bit testv/stv1MASA1TC48n.wav_sw_48-48_FOA.tst +../IVAS_dec EXT 48 bit testv/stv1MASA1TC48n.wav_sw_48-48_EXT.tst -// MASA 1dir 1TC bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, FOA out -../IVAS_cod -masa 1 testv/stv1MASA1TC48n.met ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/stv1MASA1TC48n.wav bit -../IVAS_dec FOA 48 bit testv/stv1MASA1TC48n.wav_sw_48-48_FOA.tst - -// MASA 1dir 1TC bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, BINAURAL out -../IVAS_cod -masa 1 testv/stv1MASA1TC48n.met ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/stv1MASA1TC48n.wav bit -../IVAS_dec BINAURAL 48 bit testv/stv1MASA1TC48n.wav_sw_48-48_BINAURAL.tst - -// MASA 1dir 1TC bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, 5_1 out -../IVAS_cod -masa 1 testv/stv1MASA1TC48n.met ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/stv1MASA1TC48n.wav bit -../IVAS_dec 5_1 48 bit testv/stv1MASA1TC48n.wav_sw_48-48_5_1.tst - -// MASA 1dir 1TC bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 32kHz out, 5_1 out -../IVAS_cod -masa 1 testv/stv1MASA1TC48n.met ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/stv1MASA1TC48n.wav bit -../IVAS_dec 5_1 32 bit testv/stv1MASA1TC48n.wav_sw_48-32_5_1.tst - -// MASA 1dir 1TC at 64 kbps, 48kHz in, 48kHz out, STEREO out +// MASA 1dir 1TC at 64 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 1 testv/stv1MASA1TC48c.met 64000 48 testv/stv1MASA1TC48c.wav bit -../IVAS_dec STEREO 48 bit testv/stv1MASA1TC48c.wav_64000_48-48_STEREO.tst +../IVAS_dec EXT 48 bit testv/stv1MASA1TC48c.wav_64000_48-48_EXT.tst -// MASA 1dir 1TC at 48 kbps, 48kHz in, 48kHz out, MONO out +// MASA 1dir 1TC at 48 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 1 testv/stv1MASA1TC48c.met 48000 48 testv/stv1MASA1TC48c.wav bit -../IVAS_dec MONO 48 bit testv/stv1MASA1TC48c.wav_48000_48-48_MONO.tst +../IVAS_dec EXT 48 bit testv/stv1MASA1TC48c.wav_48000_48-48_EXT.tst // MASA 1dir 1TC at 48 kbps, 32kHz in, 48kHz out, EXT out ../IVAS_cod -masa 1 testv/stv1MASA1TC32c.met 48000 32 testv/stv1MASA1TC32c.wav bit ../IVAS_dec EXT 48 bit testv/stv1MASA1TC32c.wav_48000_32-48_EXT.tst -// MASA 1dir 1TC at 32 kbps, 48kHz in, 48kHz out, 7_1_4 +// MASA 1dir 1TC at 32 kbps, 48kHz in, 48kHz out, EXT ../IVAS_cod -masa 1 testv/stv1MASA1TC48c.met 32000 48 testv/stv1MASA1TC48c.wav bit -../IVAS_dec 7_1_4 48 bit testv/stv1MASA1TC48c.wav_32000_48-48_7_1_4.tst +../IVAS_dec EXT 48 bit testv/stv1MASA1TC48c.wav_32000_48-48_EXT.tst -// MASA 1dir 1TC at 256kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out default configuration +// MASA 1dir 1TC at 256kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 1 testv/stv1MASA1TC48c.met 256000 48 testv/stv1MASA1TC48c.wav bit -../IVAS_dec BINAURAL_ROOM_REVERB 48 bit testv/stv1MASA1TC48c.wav_BINAURAL_ROOM_REVERB_256000_48-48.tst +../IVAS_dec EXT 48 bit testv/stv1MASA1TC48c.wav_EXT_256000_48-48.tst -// MASA 1dir 1TC at 24.4 kbps, 48kHz in, 48kHz out, DTX on, BINAURAL out +// MASA 1dir 1TC at 24.4 kbps, 48kHz in, 48kHz out, DTX on, EXT out ../IVAS_cod -dtx -masa 1 testv/stv1MASA1TC48n.met 24400 48 testv/stv1MASA1TC48n.wav bit -../IVAS_dec BINAURAL 48 bit testv/stv1MASA1TC48n.wav_24400_48-48_DTX_BINAURAL.tst +../IVAS_dec EXT 48 bit testv/stv1MASA1TC48n.wav_24400_48-48_DTX_EXT.tst -// MASA 1dir 1TC at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out +// MASA 1dir 1TC at 24.4 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 1 testv/stv1MASA1TC48c.met 24400 48 testv/stv1MASA1TC48c.wav bit -../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/stv1MASA1TC48c.wav_24400_48-48_BinauralRoom.tst +../IVAS_dec EXT 48 bit testv/stv1MASA1TC48c.wav_24400_48-48_EXTRoom.tst -// MASA 1dir 1TC at 16.4 kbps, 48kHz in, 48kHz out, HOA3 out +// MASA 1dir 1TC at 16.4 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 1 testv/stv1MASA1TC48c.met 16400 48 testv/stv1MASA1TC48c.wav bit -../IVAS_dec HOA3 48 bit testv/stv1MASA1TC48c.wav_16400_48-48_HOA3.tst +../IVAS_dec EXT 48 bit testv/stv1MASA1TC48c.wav_16400_48-48_EXT.tst -// MASA 1dir 1TC at 13.2 kbps, 48kHz in, 48kHz out, DTX on, 7_1_4 out +// MASA 1dir 1TC at 13.2 kbps, 48kHz in, 48kHz out, DTX on, EXT out ../IVAS_cod -dtx -masa 1 testv/stv1MASA1TC48n.met 13200 48 testv/stv1MASA1TC48n.wav bit -../IVAS_dec 7_1_4 48 bit testv/stv1MASA1TC48n.wav_13200_48-48_DTX_7_1_4.tst +../IVAS_dec EXT 48 bit testv/stv1MASA1TC48n.wav_13200_48-48_DTX_EXT.tst -// MASA 1dir 1TC at 13.2 kbps, 48kHz in, 48kHz out, BINAURAL out, bandwidth switching +// MASA 1dir 1TC at 13.2 kbps, 48kHz in, 48kHz out, EXT out, bandwidth switching ../IVAS_cod -max_band testv/ivas_bws_20fr_start_SWB.txt -masa 1 testv/stv1MASA1TC48c.met 13200 48 testv/stv1MASA1TC48c.wav bit -../IVAS_dec BINAURAL 48 bit testv/stv1MASA1TC48c.wav_13200_48-48_BINAURAL.tst +../IVAS_dec EXT 48 bit testv/stv1MASA1TC48c.wav_13200_48-48_EXT.tst // EVS non-diegetic panning at 64 kbps, 48kHz in, 48kHz out, STEREO out ../IVAS_cod 64000 48 testv/stv48c.wav bit ../IVAS_dec -non_diegetic_pan -50 48 bit testv/stv48c.pcm_EVS_64000_48-48_STEREO_NON-DIEGETIC-PAN_-50.tst -// 4 ISm with metadata at 32 kbps, 48 kHz in, 48 kHz out, FOA out +// 4 ISm with metadata at 32 kbps, 48 kHz in, 48 kHz out, EXT out ../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 32000 48 testv/stv4ISM48s.wav bit -../IVAS_dec FOA 48 bit testv/stv4ISM48s.wav_32000_48-48_FOA.tst +../IVAS_dec EXT 48 bit testv/stv4ISM48s.wav_32000_48-48_EXT.tst -// 4 ISm with metadata at 256 kbps, 48 kHz in, 48 kHz out, TD BINAURAL out, HR, OT +// 4 ISm with metadata at 256 kbps, 48 kHz in, 48 kHz out, EXT out ../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stv4ISM48s.wav bit -../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL 48 bit testv/stv4ISM48s.pcm_256000_48-48_TDHR_OtrAvg.tst +../IVAS_dec EXT 48 bit testv/stv4ISM48s.pcm_256000_48-48_EXT.tst // 4 ISM with metadata bitrate switching from 24.4 kbps to 256 kbps, 48 kHz in, 48 kHz out, EXT out ../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/stv4ISM48s.wav bit ../IVAS_dec EXT 48 bit testv/stv4ISM48s.wav_brate_sw_48-48_EXT.tst -// 4 ISM with metadata at 96 kbps, 48 kHz in, 48 kHz out, Custom LS setup out +// 4 ISM with metadata at 96 kbps, 48 kHz in, 48 kHz out ../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 96000 48 testv/stv4ISM48s.wav bit -../IVAS_dec testv/ls_setup_16ch_8+4+4.txt 48 bit testv/stv4ISM48s.wav_96000_48-48_MC_custom_setup.tst +../IVAS_dec EXT 48 bit testv/stv4ISM48s.wav_96000_48-48_EXT.tst -// 4 ISM with metadata at 80 kbps, 48 kHz in, 48 kHz out, HOA2 out +// 4 ISM with metadata at 80 kbps, 48 kHz in, 48 kHz out, EXT out ../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 80000 48 testv/stv4ISM48s.wav bit -../IVAS_dec HOA2 48 bit testv/stv4ISM48s.wav_80000_48-48_HOA2.tst +../IVAS_dec EXT 48 bit testv/stv4ISM48s.wav_80000_48-48_EXT.tst -// 4 ISM with metadata at 64 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM IR out +// 4 ISM with metadata at 64 kbps, 48 kHz in, 48 kHz out, EXT out ../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 64000 48 testv/stv4ISM48s.wav bit -../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/stv4ISM48s.wav_64000_48-48_binaural_room.tst +../IVAS_dec EXT 48 bit testv/stv4ISM48s.wav_64000_48-48_EXT_room.tst -// 4 ISM with metadata at 512 kbps, 48 kHz in, 48 kHz out, 5_1 +// 4 ISM with metadata at 512 kbps, 48 kHz in, 48 kHz out, EXT ../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 512000 48 testv/stv4ISM48s.wav bit -../IVAS_dec 5_1 48 bit testv/stv4ISM48s.wav_512000_48-48_5_1.tst +../IVAS_dec EXT 48 bit testv/stv4ISM48s.wav_512000_48-48_EXT.tst -// 4 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, DTX on, BINAURAL ROOM IR out +// 4 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, DTX on, EXT out ../IVAS_cod -dtx -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 48000 48 testv/stv4ISM48n.wav bit -../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/stv4ISM48n.wav_48000_48-48_DTX_TD_binaural_room.tst - -// 4 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, FOA out -../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 32000 48 testv/stv4ISM48s.wav bit -../IVAS_dec FOA 48 bit testv/stv4ISM48s.wav_32000_48-48_FOA.tst +../IVAS_dec EXT 48 bit testv/stv4ISM48n.wav_48000_48-48_DTX_TD_EXT.tst -// 4 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, DTX on, BINAURAL out +// 4 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, DTX on, EXT out ../IVAS_cod -dtx -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 32000 48 testv/stv4ISM48n.wav bit -../IVAS_dec BINAURAL 48 bit testv/stv4ISM48n.wav_32000_48-48_DTX_BINAURAL.tst +../IVAS_dec EXT 48 bit testv/stv4ISM48n.wav_32000_48-48_DTX_EXT.tst -// 4 ISM with metadata at 256 kbps, 48 kHz in, 48 kHz out, EXT out -../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stv4ISM48s.wav bit -../IVAS_dec EXT 48 bit testv/stv4ISM48s.wav_256000_48-48_EXT.tst - -// 4 ISM with metadata at 160 kbps, 48 kHz in, 48 kHz out, STEREO out +// 4 ISM with metadata at 160 kbps, 48 kHz in, 48 kHz out, EXT out ../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 160000 48 testv/stv4ISM48s.wav bit -../IVAS_dec STEREO 48 bit testv/stv4ISM48s.wav_160000_48-48_STEREO.tst +../IVAS_dec EXT 48 bit testv/stv4ISM48s.wav_160000_48-48_EXT.tst // 4 ISM with metadata at 128 kbps, 48 kHz in, 48 kHz out, EXT out, bandwidth switching ../IVAS_cod -max_band testv/ivas_bws_20fr_start_SWB.txt -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 128000 48 testv/stv4ISM48s.wav bit ../IVAS_dec EXT 48 bit testv/stv4ISM48s.wav_128000_48-48_EXT.tst -// 4 ISM with extended metadata at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out, HR, directivity configuration +// 4 ISM with extended metadata at 256 kbps, 48 kHz in, 48 kHz out, EXT out ../IVAS_cod -ism +4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stv4ISM48s.wav bit -../IVAS_dec -render_config testv/config_directivity_txt.cfg -t testv/headrot_case04_3000_q.csv BINAURAL 48 bit testv/stv+4ISM48s.wav_256000_48-48_binaural_file_TDHR_DirConfig.tst +../IVAS_dec EXT 48 bit testv/stv+4ISM48s.wav_256000_48-48_EXT.tst -// 4 ISM with extended metadata and non diegetic pan object switching bitrate 256 kbps, 48 kHz in, 48 kHz out, DTX on, BINAURAL out +// 4 ISM with extended metadata and non diegetic pan object switching bitrate 256 kbps, 48 kHz in, 48 kHz out, DTX on, EXT out ../IVAS_cod -dtx -ism +4 testv/stvISM1.csv NULL testv/stvISM_with_no_diegetic_switch.csv testv/stvISM4.csv 256000 48 testv/stv4ISM48n.wav bit -../IVAS_dec BINAURAL 48 bit testv/stv+4ISM48n+non_diegetic_pan.wav_brate_256000-48_DTX_binaural.tst +../IVAS_dec EXT 48 bit testv/stv+4ISM48n+non_diegetic_pan.wav_brate_256000-48_DTX_EXT.tst -// 4 ISM with and without metadata bitrate switching from 24.4 kbps to 256 kbps, 48 kHz in, 48 kHz out, DTX on, HOA3 out +// 4 ISM with and without metadata bitrate switching from 24.4 kbps to 256 kbps, 48 kHz in, 48 kHz out, DTX on, EXT out ../IVAS_cod -dtx -ism 4 testv/stvISM1.csv NULL NULL testv/stvISM4.csv ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/stv4ISM48n.wav bit -../IVAS_dec HOA3 48 bit testv/stv4ISM48n.wav_brate_sw_48-48_DTX_hoa3.tst +../IVAS_dec EXT 48 bit testv/stv4ISM48n.wav_brate_sw_48-48_DTX_EXT.tst // 4 ISM with and without extended metadata bitrate switching from 24.4 kbps to 256 kbps, 48 kHz in, 48 kHz out, DTX on, EXT out ../IVAS_cod -dtx -ism +4 testv/stvISM1.csv NULL testv/stvISM3.csv testv/stvISM4.csv ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/stv4ISM48n.wav bit ../IVAS_dec EXT 48 bit testv/stv+4ISM48n.wav_brate_sw_48-48_DTX_EXT.tst -// 4 ISM w and wo md br switching 24.4 kbps to 256 kbps, 48 kHz in, 48 kHz out, DTX on, BINAURAL_ROOM_IR out (Model from file) -../IVAS_cod -dtx -ism 4 testv/stvISM1.csv NULL NULL testv/stvISM4.csv ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/stv4ISM48n.wav bit -../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin BINAURAL_ROOM_IR 48 bit testv/stv4ISM48n.wav_brate_sw_48-48_DTX_hoa3.tst - // 3 ISM with metadata at 96 kbps, 48 kHz in, 48 kHz out, EXT out ../IVAS_cod -ism 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 96000 48 testv/stv3ISM48s.wav bit ../IVAS_dec EXT 48 bit testv/stv3ISM48s.96000_48-48_EXT.tst @@ -1038,51 +930,51 @@ // 3 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, EXT out ../IVAS_cod -ism 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 48000 48 testv/stv3ISM48s.wav bit -../IVAS_dec EXT 48 bit testv/stv3ISM48s.48000_48-48_MONO.tst +../IVAS_dec EXT 48 bit testv/stv3ISM48s.48000_48-48_EXT.tst -// 3 ISM with metadata at 384 kbps, 48 kHz in, 32 kHz out, 7_1_4 out +// 3 ISM with metadata at 384 kbps, 48 kHz in, 32 kHz out, EXT out ../IVAS_cod -ism 3 testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 384000 48 testv/stv3ISM48s.wav bit -../IVAS_dec 7_1_4 32 bit testv/stv3ISM48s.wav_384000_48-32_7_1_4.tst +../IVAS_dec EXT 32 bit testv/stv3ISM48s.wav_384000_48-32_EXT.tst -// 3 ISM with metadata at 24.4 kbps, 48 kHz in, 48 kHz out, 7_1 out +// 3 ISM with metadata at 24.4 kbps, 48 kHz in, 48 kHz out, EXT out ../IVAS_cod -ism 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 24400 48 testv/stv3ISM48s.wav bit -../IVAS_dec 7_1 48 bit testv/stv3ISM48s.wav_24400_48-48_7_1.tst +../IVAS_dec EXT 48 bit testv/stv3ISM48s.wav_24400_48-48_EXT.tst -// 3 ISM with metadata at 192 kbps, 48 kHz in, 48 kHz out, BINAURAL out (Model from file) +// 3 ISM with metadata at 192 kbps, 48 kHz in, 48 kHz out, EXT out ../IVAS_cod -ism 3 testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 192000 48 testv/stv3ISM48s.wav bit -../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin BINAURAL 48 bit testv/stv3ISM48s.wav_192000_48-48_binauralfile.tst +../IVAS_dec EXT 48 bit testv/stv3ISM48s.wav_192000_48-48_EXTfile.tst -// 3 ISM with metadata at 128 kbps, 48 kHz in, 32 kHz out, HOA3 out +// 3 ISM with metadata at 128 kbps, 48 kHz in, 32 kHz out, EXT out ../IVAS_cod -ism 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 128000 48 testv/stv3ISM48s.wav bit -../IVAS_dec HOA3 32 bit testv/stv3ISM48s.wav_128000_48-32_HOA3.tst +../IVAS_dec EXT 32 bit testv/stv3ISM48s.wav_128000_48-32_EXT.tst -// 2 ISM with metadata at 80 kbps, 48 kHz in, 48 kHz out, DTX on, stereo out +// 2 ISM with metadata at 80 kbps, 48 kHz in, 48 kHz out, DTX on, EXT out ../IVAS_cod -dtx -ism 2 testv/stvISM1.csv testv/stvISM2.csv 80000 48 testv/stvST48n.wav bit -../IVAS_dec STEREO 48 bit testv/stvST48n.wav_2ISM_80000_48-48_DTX_STEREO.tst +../IVAS_dec EXT 48 bit testv/stvST48n.wav_2ISM_80000_48-48_DTX_EXT.tst -// 2 ISM with metadata at 64 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM IR out +// 2 ISM with metadata at 64 kbps, 48 kHz in, 48 kHz out, EXT out ../IVAS_cod -ism 2 testv/stvISM3.csv testv/stvISM4.csv 64000 48 testv/stv2ISM48s.wav bit -../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/stv2ISM48s.wav_64000_48-48_binaural_room.tst +../IVAS_dec EXT 48 bit testv/stv2ISM48s.wav_64000_48-48_EXT_room.tst // 2 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, EXT out ../IVAS_cod -ism 2 testv/stvISM3.csv testv/stvISM4.csv 48000 48 testv/stv2ISM48s.wav bit ../IVAS_dec EXT 48 bit testv/stv2ISM48s.wav_48000_48-48_EXT.tst -// 2 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, DTX on, HOA2 out +// 2 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, DTX on, EXT out ../IVAS_cod -dtx -ism 2 testv/stvISM1.csv testv/stvISM2.csv 32000 48 testv/stvST48n.wav bit -../IVAS_dec HOA2 48 bit testv/stvST48n.wav_2ISM_32000_48-48_DTX_HOA2.tst +../IVAS_dec EXT 48 bit testv/stvST48n.wav_2ISM_32000_48-48_DTX_EXT.tst -// 2 ISM with metadata at 160 kbps, 48 kHz in, 32 kHz out, BINAURAL out +// 2 ISM with metadata at 160 kbps, 48 kHz in, 32 kHz out, EXT out ../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 160000 48 testv/stv2ISM48s.wav bit -../IVAS_dec BINAURAL 32 bit testv/stv2ISM48s.wav_160000_48-32_binaural.tst +../IVAS_dec EXT 32 bit testv/stv2ISM48s.wav_160000_48-32_EXT.tst -// 2 ISM with metadata at 16.4 kbps, 48 kHz in, 48 kHz out, STEREO out +// 2 ISM with metadata at 16.4 kbps, 48 kHz in, 48 kHz out, EXT out ../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 16400 48 testv/stv2ISM48s.wav bit -../IVAS_dec STEREO 48 bit testv/stv2ISM48s.wav_16400_48-48_STEREO.tst +../IVAS_dec EXT 48 bit testv/stv2ISM48s.wav_16400_48-48_EXT.tst -// 2 ISM with metadata at 128 kbps, 48 kHz in, 32 kHz out, BINAURAL out (Model from file), HR +// 2 ISM with metadata at 128 kbps, 48 kHz in, 32 kHz out, EXT out ../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 128000 48 testv/stv2ISM48s.wav bit -../IVAS_dec -t testv/headrot_case01_3000_q.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin BINAURAL 32 bit testv/stv2ISM48s.wav_128000_48-32_binaural_file_TDHR.tst +../IVAS_dec EXT 32 bit testv/stv2ISM48s.wav_128000_48-32_EXT_file_TDHR.tst // 1 ISM with metadata bitrate switching from 13.2 kbps to 128 kbps, 32 kHz in, 32 kHz out, EXT out, DTX on ../IVAS_cod -dtx -ism 1 testv/stvISM1.csv ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 32 testv/stv32c.wav bit @@ -1092,30 +984,30 @@ ../IVAS_cod -max_band testv/ivas_bws_20fr_start_FB.txt -ism 1 testv/stvISM1.csv 96000 48 testv/stv1ISM48s.wav bit ../IVAS_dec EXT 16 bit testv/stv1ISM48s.wav_96000_48-16_EXT.tst -// 1 ISM with metadata at 80 kbps, 48 kHz in, 16 kHz out, BINAURAL out (Model from file), HR +// 1 ISM with metadata at 80 kbps, 48 kHz in, 16 kHz out, EXT out ../IVAS_cod -ism 1 testv/stvISM1.csv 80000 48 testv/stv1ISM48s.wav bit -../IVAS_dec -t testv/headrot_case00_3000_q.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL 16 bit testv/stv1ISM48s.wav_80000_48-16_binaural_file_TDHR.tst +../IVAS_dec EXT 16 bit testv/stv1ISM48s.wav_80000_48-16_EXT_file_TDHR.tst -// 1 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM IR out, HR +// 1 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, EXT out, HR ../IVAS_cod -ism 1 testv/stvISM1.csv 48000 48 testv/stv1ISM48s.wav bit -../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL_ROOM_IR 48 bit testv/stv1ISM48s.wav_64000_48-48_binaural_room_HR.tst +../IVAS_dec EXT 48 bit testv/stv1ISM48s.wav_64000_48-48_EXT_room_HR.tst -// 1 ISM with metadata at 32 kbps, 32 kHz in, 32 kHz out, DTX on, MONO out +// 1 ISM with metadata at 32 kbps, 32 kHz in, 32 kHz out, DTX on, EXT out ../IVAS_cod -dtx -ism 1 testv/stvISM1.csv 32000 32 testv/stv32n.wav bit -../IVAS_dec MONO 32 bit testv/stv32n.wav_1ISM_32000_32-32_DTX_MONO.tst +../IVAS_dec EXT 32 bit testv/stv32n.wav_1ISM_32000_32-32_DTX_EXT.tst -// 1 ISM with metadata at 16.4 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM IR out, bandwidth switching +// 1 ISM with metadata at 16.4 kbps, 48 kHz in, 48 kHz out, EXT out, bandwidth switching ../IVAS_cod -max_band testv/ivas_bws_20fr_start_WB.txt -ism 1 testv/stvISM1.csv 16400 48 testv/stv1ISM48s.wav bit -../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/stv1ISM48s.wav_16400_48-48_binaural_room.tst +../IVAS_dec EXT 48 bit testv/stv1ISM48s.wav_16400_48-48_EXT_room.tst // 1 ISM with metadata at 13.2 kbps, 48 kHz in, 48 kHz out, EXT out ../IVAS_cod -ism 1 testv/stvISM1.csv 13200 48 testv/stv1ISM48s.wav bit ../IVAS_dec EXT 48 bit testv/stv1ISM48s.wav_13200_48-48_EXT.tst -// 1 ISM with metadata at 13.2 kbps, 48 kHz in, 48 kHz out, DTX on, BINAURAL out +// 1 ISM with metadata at 13.2 kbps, 48 kHz in, 48 kHz out, DTX on, EXT out ../IVAS_cod -dtx -ism 1 testv/stvISM1.csv 13200 48 testv/stv48n.wav bit -../IVAS_dec BINAURAL 48 bit testv/stv48n.wav_1ISM_13200_48-48_DTX_BINAURAL.tst +../IVAS_dec EXT 48 bit testv/stv48n.wav_1ISM_13200_48-48_DTX_EXT.tst -// 1 ISM non-diegetic panning at 32 kbps, 48kHz in, 48kHz out, STEREO out -../IVAS_cod -ism 1 testv/stvISM1.csv 32000 48 testv/stv1ISM48s.wav bit -../IVAS_dec -non_diegetic_pan 80 STEREO 48 bit testv/stv1ISM48s.pcm_ISM_32000_48-48_STEREO_NON-DIEGETIC-PAN_80.tst +// 1 ISM non-diegetic panning at 32 kbps, 48kHz in, 48kHz out, EXT out +//../IVAS_cod -ism 1 testv/stvISM1.csv 32000 48 testv/stv1ISM48s.wav bit +//../IVAS_dec -non_diegetic_pan 80 EXT 48 bit testv/stv1ISM48s.pcm_ISM_32000_48-48_EXT_NON-DIEGETIC-PAN_80.tst -- GitLab From 355031f618c7f2728f3d6a6a95e5c64ee1a4cf1e Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Wed, 11 Dec 2024 17:09:50 +0100 Subject: [PATCH 20/36] first version of ltv basop enc .prm file *MASA still needs fixing --- .../config/self_test_ltv_basop_encoder.prm | 1013 +++++++++++++++++ 1 file changed, 1013 insertions(+) create mode 100644 scripts/config/self_test_ltv_basop_encoder.prm diff --git a/scripts/config/self_test_ltv_basop_encoder.prm b/scripts/config/self_test_ltv_basop_encoder.prm new file mode 100644 index 0000000000..d8ff498a4c --- /dev/null +++ b/scripts/config/self_test_ltv_basop_encoder.prm @@ -0,0 +1,1013 @@ +// Self-test parameter file +// +// - each test must have a tag (unique name) which must be entered as a comment (you can use // /* or rem comment) +// - the following line must be the encoder command line +// - the following line must be the decoder command line +// - if the name of the output file are exactly the same as +// the name of the test vector located in ./testv directory, these files will be compared for bit-exactness +// (the easiest way how to achieve this is to use the name of the test vector itself, as shown below) + +// stereo bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, DTX on, stereo out +//../IVAS_cod -dtx -stereo ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/ltv48_STEREO.wav bit +../IVAS_dec STEREO 48 bit testv/ltv48_STEREO.wav_stereo_sw_48-48_DTX_stereo.tst + +// stereo bitrate switching from 13.2 kbps to 128 kbps, 32kHz in, 32kHz out +../IVAS_cod -stereo ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 32 testv/ltv32_STEREO.wav bit +../IVAS_dec STEREO 32 bit testv/ltv32_STEREO.wav_stereo_sw_32-32.tst + +// stereo at 96 kbps, 32kHz in, 32kHz out +../IVAS_cod -stereo 96000 32 testv/ltv32_STEREO.wav bit +../IVAS_dec STEREO 32 bit testv/ltv32_STEREO.wav_stereo_96000_32-32.tst + +// stereo at 96 kbps, 16kHz in, 16kHz out +../IVAS_cod -stereo 96000 16 testv/ltv16_STEREO.wav bit +../IVAS_dec STEREO 16 bit testv/ltv16_STEREO.wav_stereo_96000_16-16.tst + +// stereo at 64 kbps, 32kHz in, 32kHz out, bandwidth switching +../IVAS_cod -max_band testv/ivas_bws_20fr_start_FB.txt -stereo 64000 32 testv/ltv32_STEREO.wav bit +../IVAS_dec STEREO 32 bit testv/ltv32_STEREO.wav_stereo_64000_32-32.tst + +// stereo at 64 kbps, 16kHz in, 16kHz out +../IVAS_cod -stereo 64000 16 testv/ltv16_STEREO.wav bit +../IVAS_dec STEREO 16 bit testv/ltv16_STEREO.wav_stereo_64000_16-16.tst + +// stereo at 48 kbps, 48 kHz in, 48 kHz out, DTX on, bandwidth switching +../IVAS_cod -max_band testv/ivas_bws_20fr_start_SWB.txt -stereo -dtx 48000 48 testv/ltv48_STEREO.wav bit +../IVAS_dec STEREO 48 bit testv/ltv48_STEREO.wav_stereo_48000_48-48_DTX.tst + +// stereo at 48 kbps, 32kHz in, 32kHz out +../IVAS_cod -stereo 48000 32 testv/ltv32_STEREO.wav bit +../IVAS_dec STEREO 32 bit testv/ltv32_STEREO.wav_stereo_48000_32-32.tst + +// stereo at 48 kbps, 32 kHz in, 32 kHz out, DTX on +../IVAS_cod -stereo -dtx 48000 32 testv/ltv32_STEREO.wav bit +../IVAS_dec STEREO 32 bit testv/ltv32_STEREO.wav_stereo_48000_32-32_DTX.tst + +// stereo at 48 kbps, 16kHz in, 16kHz out +../IVAS_cod -stereo 48000 16 testv/ltv16_STEREO.wav bit +../IVAS_dec STEREO 16 bit testv/ltv16_STEREO.wav_stereo_48000_16-16.tst + +// stereo at 48 kbps, 16 kHz in, 16 kHz out, DTX on +../IVAS_cod -stereo -dtx 48000 16 testv/ltv16_STEREO.wav bit +../IVAS_dec STEREO 16 bit testv/ltv16_STEREO.wav_stereo_48000_16-16_DTX.tst + +// stereo at 32 kbps, 48kHz in, 48kHz out, bandwidth switching +../IVAS_cod -stereo -max_band testv/bwidth_cntl.txt 32000 48 testv/ltv48_STEREO.wav bit +../IVAS_dec STEREO 48 bit testv/ltv48_STEREO.wav_stereo_32000_48-48_bandwidth_sw.tst + +// stereo at 32 kbps, 48kHz in, 48kHz out, DTX on, bandwidth switching +../IVAS_cod -max_band testv/ivas_bws_20fr_start_WB.txt -stereo -dtx 32000 48 testv/ltv48_STEREO.wav bit +../IVAS_dec STEREO 48 bit testv/ltv48_STEREO.wav_stereo_32000_48-48_DTX.tst + +// stereo at 32 kbps, 32kHz in, 48kHz out, STEREO out +../IVAS_cod -stereo 32000 32 testv/ltv32_STEREO.wav bit +../IVAS_dec STEREO 48 bit testv/ltv32_STEREO.wav_stereo_32000_32-48_STEREO.tst + +// stereo at 32 kbps, 32kHz in, 32kHz out, DTX on, STEREO out +../IVAS_cod -stereo -dtx 32000 32 testv/ltv32_STEREO.wav bit +../IVAS_dec STEREO 32 bit testv/ltv32_STEREO.wav_stereo_32000_32-32_DTX_STEREO.tst + +// stereo at 32 kbps, 16kHz in, 16kHz out, DTX on +../IVAS_cod -dtx -stereo -dtx 32000 16 testv/ltv16_STEREO.wav bit +../IVAS_dec STEREO 16 bit testv/ltv16_STEREO.wav_stereo_32000_16-16_DTX.tst + +// stereo at 32 kbps, 16kHz in, 16kHz out +../IVAS_cod -stereo 32000 16 testv/ltv16_STEREO.wav bit +../IVAS_dec STEREO 16 bit testv/ltv16_STEREO.wav_stereo_32000_16-16.tst + +// stereo at 24.4 kbps, 48kHz in, 48kHz out, DTX on +../IVAS_cod -stereo -dtx 24400 48 testv/ltv48_STEREO.wav bit +../IVAS_dec STEREO 48 bit testv/ltv48_STEREO.wav_24400_48_48_DTX.txt + +// stereo at 24.4 kbps, 32kHz in, 32kHz out, DTX on +../IVAS_cod -stereo -dtx 24400 32 testv/ltv32_STEREO.wav bit +../IVAS_dec STEREO 32 bit testv/ltv32_STEREO.wav_stereo_24400_32-32_DTX.tst + +// stereo at 24.4 kbps, 32kHz in, 32kHz out +../IVAS_cod -stereo 24400 32 testv/ltv32_STEREO.wav bit +../IVAS_dec STEREO 32 bit testv/ltv32_STEREO.wav_stereo_24400_32-32.tst + +// stereo at 24.4 kbps, 16kHz in, 16kHz out, DTX on, STEREO out +../IVAS_cod -stereo -dtx 24400 16 testv/ltv16_STEREO.wav bit +../IVAS_dec STEREO 16 bit testv/ltv16_STEREO.wav_stereo_24400_16-16_DTX_STEREO.tst + +// stereo at 24.4 kbps, 16kHz in, 16kHz out +../IVAS_cod -stereo 24400 16 testv/ltv16_STEREO.wav bit +../IVAS_dec STEREO 16 bit testv/ltv16_STEREO.wav_stereo_24400_16-16.tst + +// stereo at 16.4 kbps, 32kHz in, 32kHz out +../IVAS_cod -stereo 16400 32 testv/ltv32_STEREO.wav bit +../IVAS_dec STEREO 32 bit testv/ltv32_STEREO.wav_stereo_16400_32-32.tst + +// stereo at 16.4 kbps, 32kHz in, 16kHz out, DTX on +../IVAS_cod -stereo -dtx 16400 32 testv/ltv32_STEREO.wav bit +../IVAS_dec STEREO 16 bit testv/ltv32_STEREO.wav_stereo_16400_32-16_DTX.tst + +// stereo at 16.4 kbps, 16kHz in, 16kHz out, DTX on +../IVAS_cod -stereo -dtx 16400 16 testv/ltv16_STEREO.wav bit +../IVAS_dec STEREO 16 bit testv/ltv16_STEREO.wav_stereo_16400_16-16_DTX.tst + +// stereo at 16.4 kbps, 16kHz in, 16kHz out +../IVAS_cod -stereo 16400 16 testv/ltv16_STEREO.wav bit +../IVAS_dec STEREO 16 bit testv/ltv16_STEREO.wav_stereo_16400_16-16.tst + +// stereo at 13.2 kbps, 48kHz in, 48kHz out +../IVAS_cod -stereo 13200 48 testv/ltv48_STEREO.wav bit +../IVAS_dec STEREO 48 bit testv/ltv48_STEREO.wav_stereo_13200_48-48.tst + +// stereo at 13.2 kbps, 32kHz in, 32kHz out, DTX on +../IVAS_cod -stereo -dtx 13200 32 testv/ltv32_STEREO.wav bit +../IVAS_dec STEREO 32 bit testv/ltv32_STEREO.wav_stereo_13200_32-32_DTX.tst + +// stereo at 13.2 kbps, 32kHz in, 32kHz out +../IVAS_cod -stereo 13200 32 testv/ltv32_STEREO.wav bit +../IVAS_dec STEREO 32 bit testv/ltv32_STEREO.wav_stereo_13200_32-32.tst + +// stereo at 13.2 kbps, 16kHz in, 16kHz out, DTX on +../IVAS_cod -stereo -dtx 13200 16 testv/ltv16_STEREO.wav bit +../IVAS_dec STEREO 16 bit testv/ltv16_STEREO.wav_stereo_13200_16-16_DTX.tst + +// stereo at 13.2 kbps, 16kHz in, 16kHz out +../IVAS_cod -stereo 13200 16 testv/ltv16_STEREO.wav bit +../IVAS_dec STEREO 16 bit testv/ltv16_STEREO.wav_stereo_13200_16-16.tst + +// stereo at 128 kbps, 48kHz in, 48kHz out, STEREO out +../IVAS_cod -stereo 128000 48 testv/ltv48_STEREO.wav bit +../IVAS_dec STEREO 48 bit testv/ltv48_STEREO.wav_stereo_128000_48-48_STEREO.tst + +// stereo at 128 kbps, 32kHz in, 32kHz out +../IVAS_cod -stereo 128000 32 testv/ltv32_STEREO.wav bit +../IVAS_dec STEREO 32 bit testv/ltv32_STEREO.wav_stereo_128000_32-32.tst + +// stereo at 128 kbps, 16kHz in, 16kHz out +../IVAS_cod -stereo 128000 16 testv/ltv16_STEREO.wav bit +../IVAS_dec STEREO 16 bit testv/ltv16_STEREO.wav_stereo_128000_16-16.tst + +// Stereo downmix to bit-exact EVS at 24400 kbps, 48kHz in, 48kHz out +../IVAS_cod -stereo_dmx_evs 24400 48 testv/ltv48_STEREO.wav bit +../IVAS_dec 48 bit testv/ltv48_STEREO.wav_StereoDmxEVS_24400_48-48.tst + +// Stereo downmix to bit-exact EVS at 13200 kbps, 32kHz in, 32kHz out +../IVAS_cod -stereo_dmx_evs 13200 32 testv/ltv32_STEREO.wav bit +../IVAS_dec 32 bit testv/ltv32_STEREO.wav_StereoDmxEVS_13200_32-32.tst + +// SBA planar FOA bitrate switching from 13.2 kbps to 512 kbps, 32kHz in, 32kHz out, FOA out +../IVAS_cod -sba -1 ../scripts/switchPaths/sw_13k2_512k.bin 32 testv/ltv32_FOA.wav bit +../IVAS_dec FOA 32 bit testv/ltv32_FOA.wav_sw_32-32_DTX_FOA.tst + +// SBA planar 3OA bitrate switching from 24.4 kbps to 256 kbps, 48kHz in, 48kHz out, HOA3 out +../IVAS_cod -sba -3 ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/ltv48_HOA3.wav bit +../IVAS_dec HOA3 48 bit testv/ltv48_HOA3.wav_sw_48-48_HOA3.tst + +// SBA planar 3OA bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, HOA3 out +../IVAS_cod -sba -3 ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/ltv48_HOA3.wav bit +../IVAS_dec HOA3 48 bit testv/ltv48_HOA3.wav_sw_48-48_DTX_HOA3.tst + +// SBA planar 2OA bitrate switching from 13.2 kbps to 128 kbps, 32kHz in, 32kHz out, DTX on, HOA2out +../IVAS_cod -dtx -sba -2 ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 32 testv/ltv32_HOA2.wav bit +../IVAS_dec HOA2 32 bit testv/ltv32_HOA2.wav_sw_32-32_DTX_HOA2.tst + +// SBA at 96 kbps, 48kHz in, 48kHz out, FOA out +../IVAS_cod -sba 1 96000 48 testv/ltv48_FOA.wav bit +../IVAS_dec FOA 48 bit testv/ltv48_FOA.wav_SBA_96000_48-48_FOA.tst + +// SBA at 96 kbps, 32kHz in, 32kHz out, FOA out +../IVAS_cod -sba 1 96000 32 testv/ltv32_FOA.wav bit +../IVAS_dec FOA 32 bit testv/ltv32_FOA.wav_SBA_96000_32-32_FOA.tst + +// SBA at 80 kbps, 32kHz in, 32kHz out, HOA3 out +../IVAS_cod -sba 3 80000 32 testv/ltv32_HOA3.wav bit +../IVAS_dec HOA3 32 bit testv/ltv32_HOA3.wav_SBA_80000_32-32_HOA3.tst + +// SBA at 64 kpbs, 48kHz in, 48kHz out, FOA out, DTX +../IVAS_cod -dtx -sba 1 64000 48 testv/ltv48_FOA.wav bit +../IVAS_dec FOA 48 bit testv/ltv48_FOA.wav_SBA_64000_48-48_DTX_FOA.tst + +// SBA at 64 kbps, 48kHz in, 48kHz out, FOA out +../IVAS_cod -sba 1 64000 48 testv/ltv48_FOA.wav bit +../IVAS_dec FOA 48 bit testv/ltv48_FOA.wav_SBA_64000_48-48_FOA.tst + +// SBA at 64 kbps, 32kHz in, 32kHz out, FOA out, DTX +../IVAS_cod -dtx -sba 1 64000 32 testv/ltv32_FOA.wav bit +../IVAS_dec FOA 32 bit testv/ltv32_FOA.wav_SBA_64000_32-32_DTX_FOA.tst + +// SBA at 48 kbps, 48kHz in, 48kHz out, DTX on, HOA3 out +../IVAS_cod -sba 3 -dtx 48000 48 testv/ltv48_HOA3.wav bit +../IVAS_dec HOA3 48 bit testv/ltv48_HOA3.wav_SBA_48000_48-48_DTX_HOA3.tst + +// SBA at 48 kbps, 48kHz in, 48kHz out, HOA3 out +../IVAS_cod -sba 3 48000 48 testv/ltv48_HOA3.wav bit +../IVAS_dec HOA3 48 bit testv/ltv48_HOA3.wav_SBA_48000_48-48_HOA3.tst + +// SBA at 48 kbps, 32kHz in, 32kHz out, HOA3 out +../IVAS_cod -sba 3 48000 32 testv/ltv32_HOA3.wav bit +../IVAS_dec HOA3 32 bit testv/ltv32_HOA3.wav_SBA_48000_32-32_HOA3.tst + +// SBA at 48 kbps, 32kHz in, 32kHz out, DTX on, HOA3 out +../IVAS_cod -sba 3 -dtx 48000 32 testv/ltv32_HOA3.wav bit +../IVAS_dec HOA3 32 bit testv/ltv32_HOA3.wav_SBA_48000_32-32_DTX_Binaural.tst + +// SBA at 32 kbps, 48kHz in, 48kHz out, FOA out, DTX, bandwidth switching +../IVAS_cod -max_band testv/ivas_bws_20fr_start_FB.txt -dtx -sba 1 32000 48 testv/ltv48_FOA.wav bit +../IVAS_dec FOA 48 bit testv/ltv48_FOA.wav_SBA_32000_48-48_DTX_FOA.tst + +// SBA at 32 kbps, 32kHz in, 32kHz out, FOA out +../IVAS_cod -sba 1 32000 32 testv/ltv32_FOA.wav bit +../IVAS_dec FOA 32 bit testv/ltv32_FOA.wav_SBA_32000_32-32_FOA.tst + +// SBA at 256 kbps, 48kHz in, 48kHz out, FOA out +../IVAS_cod -sba 1 256000 48 testv/ltv48_FOA.wav bit +../IVAS_dec FOA 48 bit testv/ltv48_FOA.wav_SBA_256000_48-48_FOA.tst + +// SBA at 256 kbps, 32kHz in, 32kHz out, FOA out +../IVAS_cod -sba 1 256000 32 testv/ltv32_FOA.wav bit +../IVAS_dec FOA 32 bit testv/ltv32_FOA.wav_SBA_256000_32-32_FOA.tst + +// SBA at 24.4 kbps, 32kHz in, 32kHz out, HOA3 out +../IVAS_cod -sba 3 24400 32 testv/ltv32_HOA3.wav bit +../IVAS_dec HOA3 32 bit testv/ltv32_HOA3.wav_SBA_24400_32-32_HOA3.tst + +// SBA at 24.4 kbps, 32kHz in, 32kHz out, DTX on, HOA3 out +../IVAS_cod -sba 3 -dtx 24400 32 testv/ltv32_HOA3.wav bit +../IVAS_dec HOA3 32 bit testv/ltv32_HOA3.wav_SBA_24400_32-32_DTX_HOA3.tst + +// SBA at 192 kbps, 48kHz in, 48kHz out, HOA3 out +../IVAS_cod -sba 3 192000 48 testv/ltv48_HOA3.wav bit +../IVAS_dec HOA3 48 bit testv/ltv48_HOA3.wav_SBA_192000_48-48_HOA3.tst + +// SBA at 160 kbps, 48kHz in, 48kHz out, FOA out +../IVAS_cod -sba 1 160000 48 testv/ltv48_FOA.wav bit +../IVAS_dec FOA 48 bit testv/ltv48_FOA.wav_SBA_160000_48-48_BINAURAL_ROOM.tst + +// SBA at 160 kbps, 32kHz in, 32kHz out, FOA out +../IVAS_cod -sba 1 160000 32 testv/ltv32_FOA.wav bit +../IVAS_dec FOA 32 bit testv/ltv32_FOA.wav_SBA_160000_32-32_FOA.tst + +// SBA at 16.4 kbps, 32kHz in, 32kHz out, HOA3 out +../IVAS_cod -sba 3 16400 32 testv/ltv32_HOA3.wav bit +../IVAS_dec HOA3 32 bit testv/ltv32_HOA3.wav_SBA_16400_32-32_HOA3.tst + +// SBA at 13.2 kbps, 48kHz in, 48kHz out, FOA out +../IVAS_cod -sba 1 13200 48 testv/ltv48_FOA.wav bit +../IVAS_dec FOA 48 bit testv/ltv32_FOA.wav_SBA_13200_48-48_FOA.tst + +// SBA at 13.2 kbps, 32kHz in, 32kHz out, HOA3 out, bandwidth switching +../IVAS_cod -max_band testv/ivas_bws_20fr_start_WB.txt -sba 3 13200 32 testv/ltv32_HOA3.wav bit +../IVAS_dec HOA3 32 bit testv/ltv32_HOA3.wav_SBA_13200_32-32_HOA3.tst + +// SBA at 128 kbps, 32kHz in, 32kHz out, HOA3 out, HR +../IVAS_cod -sba 3 128000 32 testv/ltv32_HOA3.wav bit +../IVAS_dec HOA3 32 bit testv/ltv32_HOA3.wav_SBA_128000_32-32_HOA3_Headrot.tst + +// SBA FOA bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, FOA out +../IVAS_cod -sba 1 -max_band fb ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/ltv48_FOA.wav bit +../IVAS_dec FOA 48 bit testv/ltv48_FOA.wav_sw_48-48_FOA.tst + +// SBA FOA bitrate switching from 13.2 kbps to 192 kbps, 48kHz in, 48kHz out, FOA out +../IVAS_cod -sba 1 ../scripts/switchPaths/sw_13k2_192k_50fr.bin 48 testv/ltv48_FOA.wav bit +../IVAS_dec FOA 48 bit testv/ltv48_FOA.wav_sw_48-48_FOA.tst + +// SBA FOA bitrate switching from 13.2 kbps to 192 kbps, 32kHz in, 32kHz out, DTX on, FOA out +../IVAS_cod -dtx -sba 1 ../scripts/switchPaths/sw_13k2_192k_50fr.bin 32 testv/ltv32_FOA.wav bit +../IVAS_dec FOA 32 bit testv/ltv32_FOA.wav_sw_32-32_DTX_FOA.tst + +// SBA 3OA bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, HOA3 out +../IVAS_cod -sba 3 ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/ltv48_HOA3.wav bit +../IVAS_dec HOA3 48 bit testv/ltv48_HOA3.wav_sw_48-48_HOA3.tst + +// SBA 3OA bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, DTX on, HOA3 out +../IVAS_cod -dtx -sba 3 ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/ltv48_HOA3.wav bit +../IVAS_dec HOA3 48 bit testv/ltv48_HOA3.wav_sw_48-48_DTX_HOA3.tst + +// SBA 3OA bitrate switching from 13.2 kbps to 128 kbps, 32kHz in, 32kHz out, DTX on, HOA3 out +../IVAS_cod -dtx -sba 3 ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 32 testv/ltv32_HOA3.wav bit +../IVAS_dec HOA3 32 bit testv/ltv32_HOA3.wav_sw_32-32_DTX_HOA3.tst + +// SBA 3OA at 96 kbps, 48kHz in, 48kHz out, HOA3 out +../IVAS_cod -sba 3 512000 48 testv/ltv48_HOA3.wav bit +../IVAS_dec HOA3 48 bit testv/ltv48_HOA3.wav_HOA3_96000_48-48.tst + +// SBA 3OA at 512 kbps, 48kHz in, 48kHz out, HOA3 out, bandwidth switching +../IVAS_cod -max_band testv/ivas_bws_20fr_start_SWB.txt -sba 3 512000 48 testv/ltv48_HOA3.wav bit +../IVAS_dec HOA3 48 bit testv/ltv48_HOA3.wav_SBA_512000_48-48_HOA3.tst + +// SBA 3OA 4ISM at 96 kbps, 48kHz in, 48kHz out, HOA3 +../IVAS_cod -sba 3 96000 48 testv/ltv48_HOA3.wav bit +../IVAS_dec HOA3 48 bit testv/ltv48_HOA3.wav_HOA3_96000_48-48.tst + +// SBA 2OA bitrate switching from 16.4 kbps to 512 kbps, 48kHz in, 48kHz out, HOA2 out +../IVAS_cod -sba 2 ../scripts/switchPaths/sw_16k4_512k_50fr.bin 48 testv/ltv48_HOA2.wav bit +../IVAS_dec HOA2 48 bit testv/ltv48_HOA2.wav_sw_48-48_HOA2.tst + +// SBA 2OA bitrate switching from 13.2 kbps to 512 kbps, 32kHz in, 32kHz out, HOA2 out +../IVAS_cod -sba 2 ../scripts/switchPaths/sw_13k2_512k.bin 32 testv/ltv32_HOA2.wav bit +../IVAS_dec HOA2 32 bit testv/ltv32_HOA2.wav_sw_32-32_DTX_HOA2.tst + +// SBA 2OA at 384 kbps, 32kHz in, 32kHz out, HOA2 out, bandwidth switching +../IVAS_cod -max_band testv/ivas_bws_20fr_start_WB.txt -sba 2 384000 32 testv/ltv32_HOA2.wav bit +../IVAS_dec HOA2 32 bit testv/ltv32_HOA2.wav_SBA_384000_32-32_HOA2.tst + +// Planar SBA at 48 kbps, 32kHz in, 32kHz out, HOA3 out +../IVAS_cod -sba -2 48000 32 testv/ltv32_HOA2.wav bit +../IVAS_dec HOA3 32 bit testv/ltv2OA32c.pcm_planarSBA_48000_32-32_HOA3.tst + +// Planar SBA at 128 kbps, 48kHZ in, 32kHz out, FOA out +../IVAS_cod -sba -1 128000 48 testv/ltv48_FOA.wav bit +../IVAS_dec FOA 32 bit testv/ltvFOA48c.pcm_planarSBA_128000_48-32_BinauralRoomReverb_Config_renderer_Headrot_BinauralFile.tst + +// OSBA planar 3OA 4ISM at 512 kbps, 48 kHz in, 48 kHz out, EXT out +../IVAS_cod -ism_sba 4 -3 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv testv/ltv48_OSBA_4ISM_HOA3_ISM4.csv 512000 48 testv/ltv48_OSBA_4ISM_HOA3.wav bit +../IVAS_dec EXT 48 bit testv/ltvOSBA_4ISM_p3OA48c.wav_EXT_512000_48-48.tst + +// OSBA planar 2OA 4ISM at 512 kbps, 48 kHz in, 48 kHz out, EXT out +../IVAS_cod -ism_sba 4 -2 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv testv/ltv48_OSBA_4ISM_HOA3_ISM4.csv 512000 48 testv/ltv48_OSBA_4ISM_HOA2.wav bit +../IVAS_dec EXT 48 bit testv/ltvOSBA_4ISM_p3OA48c.wav_EXT_512000_48-48.tst + +// OSBA FOA 4ISM at 512 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 4 1 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv testv/ltv48_OSBA_4ISM_HOA3_ISM4.csv 512000 48 testv/ltv48_OSBA_4ISM_FOA.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_OSBA_4ISM_FOA.wav_EXT_512000_48-48.tst + +// OSBA FOA 4ISM at 512 kbps, 32kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 4 1 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv testv/ltv48_OSBA_4ISM_HOA3_ISM4.csv 512000 32 testv/ltv32_OSBA_4ISM_FOA.wav bit +../IVAS_dec EXT 48 bit testv/ltv32_OSBA_4ISM_FOA.wav_EXT_512000_32-48.tst + +// OSBA FOA 4ISM at 384 kbps, 32kHz in, 32kHz out, EXT out +../IVAS_cod -ism_sba 4 1 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv testv/ltv48_OSBA_4ISM_HOA3_ISM4.csv 384000 32 testv/ltv32_OSBA_4ISM_FOA.wav bit +../IVAS_dec EXT 32 bit testv/ltv32_OSBA_4ISM_FOA.wav_EXT_384000_32-32.tst + +// OSBA FOA 4ISM at 256 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 4 1 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv testv/ltv48_OSBA_4ISM_HOA3_ISM4.csv 256000 48 testv/ltv48_OSBA_4ISM_FOA.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_OSBA_4ISM_FOA.wav_EXT56000_48-48.tst + +// OSBA FOA 3ISM at 128 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 3 1 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv 128000 48 testv/ltv48_OSBA_3ISM_FOA.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_OSBA_3ISM_FOA.wav_EXT_128000_48-48.tst + +// OSBA FOA 1ISM at 48 kbps, 16kHz in, 16kHz out, EXT out +../IVAS_cod -ism_sba 1 1 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv 32000 16 testv/ltv16_OSBA_1ISM_FOA.wav bit +../IVAS_dec EXT 16 bit testv/ltv16_OSBA_1ISM_FOA.wav_EXT_32000_16-16.tst + +// OSBA FOA 1ISM at 32 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 1 1 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv 32000 48 testv/ltv48_OSBA_1ISM_FOA.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_OSBA_1ISM_FOA.wav_EXT_32000_48-48.tst + +// OSBA 3OA 4ISM bitrate switching 16.4 to 512, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 4 3 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv testv/ltv48_OSBA_4ISM_HOA3_ISM4.csv ../scripts/switchPaths/sw_16k4_512k_50fr.bin 48 testv/ltv48_OSBA_4ISM_HOA3.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_OSBA_4ISM_HOA3.wav_EXT_sw_16k4_512k_48-48.tst + +// OSBA 3OA 4ISM bitrate switching 13.2 to 512, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 4 3 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv testv/ltv48_OSBA_4ISM_HOA3_ISM4.csv ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/ltv48_OSBA_4ISM_HOA3.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_OSBA_4ISM_HOA3.wav_EXT_sw_13k2_512k_48-48.tst + +// OSBA 3OA 4ISM bitrate switching 13.2 to 512, 32kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 4 3 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv testv/ltv48_OSBA_4ISM_HOA3_ISM4.csv ../scripts/switchPaths/sw_13k2_512k.bin 32 testv/ltv32_OSBA_4ISM_HOA3.wav bit +../IVAS_dec EXT 48 bit testv/ltv32_OSBA_4ISM_HOA3.wav_EXT_sw_13k2_512k_32-48.tst + +// OSBA 3OA 4ISM at 64 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 4 3 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv testv/ltv48_OSBA_4ISM_HOA3_ISM4.csv 64000 48 testv/ltv48_OSBA_4ISM_HOA3.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_OSBA_4ISM_HOA3.wav_EXT_64000_48-48_EXT.tst + +// OSBA 3OA 4ISM at 512 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 4 3 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv testv/ltv48_OSBA_4ISM_HOA3_ISM4.csv 512000 48 testv/ltv48_OSBA_4ISM_HOA3.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_OSBA_4ISM_HOA3.wav_EXT_512000_48-48_EXT.tst + + +// OSBA 3OA 4ISM at 48 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 4 3 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv testv/ltv48_OSBA_4ISM_HOA3_ISM4.csv 48000 48 testv/ltv48_OSBA_4ISM_HOA3.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_OSBA_4ISM_HOA3.wav_EXT_48000_48-48_EXT.tst + +// OSBA 3OA 4ISM at 16.4 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 4 3 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv testv/ltv48_OSBA_4ISM_HOA3_ISM4.csv 16400 48 testv/ltv48_OSBA_4ISM_HOA3.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_OSBA_4ISM_HOA3.wav_EXT_16400_48-48.tst + +// OSBA 3OA 3ISM at 160 kbps, 16kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 3 3 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv 160000 16 testv/ltv16_OSBA_3ISM_HOA3.wav bit +../IVAS_dec EXT 48 bit testv/ltvOSBA_3ISM_3OA416c.wav_EXT_160000_16-48.tst + +// OSBA 3OA 3ISM at 128 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 3 3 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv 128000 48 testv/ltv48_OSBA_3ISM_HOA3.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_OSBA_3ISM_HOA3.wav_EXT_128000_48-48.tst + +// OSBA 3OA 2ISM at 256 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 2 3 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv 256000 48 testv/ltv48_OSBA_2ISM_HOA3.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_OSBA_2ISM_HOA3.wav_EXT56000_48-48.tst + +// OSBA 3OA 2ISM at 256 kbps, 32kHz in, 32kHz out, HOA2 out +../IVAS_cod -ism_sba 2 3 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv 256000 32 testv/ltv32_OSBA_2ISM_HOA3.wav bit +../IVAS_dec HOA2 32 bit testv/ltv32_OSBA_2ISM_HOA3.wav_HOA2_256000_32-32.tst + +// OSBA 3OA 1ISM at 512 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 1 3 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv 512000 48 testv/ltv48_OSBA_1ISM_HOA3.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_OSBA_1ISM_HOA3.wav_EXT_512000_48-48.tst + +// OSBA 3ISM 3OA at bitrate switching 13.2 to 512 kbps, 48kHz in, 32kHz out, EXT out +../IVAS_cod -ism_sba 3 3 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/ltv48_OSBA_3ISM_HOA3.wav bit +../IVAS_dec EXT 32 bit testv/ltv48_OSBA_3ISM_HOA3.wav_EXT_sw_48-32.tst + +// OSBA 3ISM 2OA at bitrate switching 13.2 to 512 kbps, 48kHz in, 32kHz out, EXT out +../IVAS_cod -ism_sba 3 2 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/ltv48_OSBA_3ISM_HOA2.wav bit +../IVAS_dec EXT 32 bit testv/ltv48_OSBA_3ISM_HOA2.wav_EXT_sw_48-32.tst + +// OSBA 2OA 4ISM at 384 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 4 2 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv testv/ltv48_OSBA_4ISM_HOA3_ISM4.csv 384000 48 testv/ltv48_OSBA_4ISM_HOA2.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_OSBA_4ISM_HOA2.wav_EXT_384000_48-48.tst + +// OSBA 2OA 3ISM at 96 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 3 2 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv 96000 48 testv/ltv48_OSBA_3ISM_HOA2.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_OSBA_3ISM_HOA2.wav_EXT_96000_48-48.tst + +// OSBA 2OA 3ISM at 384 kbps, 16kHz in, 16kHz out, EXT out +../IVAS_cod -ism_sba 3 2 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv 384000 16 testv/ltv16_OSBA_3ISM_HOA2.wav bit +../IVAS_dec EXT 16 bit testv/ltv16_OSBA_3ISM_HOA2.wav_EXT56000_16-16.tst + +// OSBA 2OA 2ISM at 64 kbps, 32kHz in, 16kHz out, EXT out +../IVAS_cod -ism_sba 2 2 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv 48000 32 testv/ltv32_OSBA_2ISM_HOA2.wav bit +../IVAS_dec EXT 16 bit testv/ltv32_OSBA_2ISM_HOA2.wav_EXT_64000_32-16.tst + +// OSBA 2OA 2ISM at 48 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 2 2 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv 48000 48 testv/ltv48_OSBA_2ISM_HOA2.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_OSBA_2ISM_HOA2.wav_EXT_48000_48-48.tst + +// OSBA 2OA 1ISM at 24.4 kbps, 48kHz in, 48kHz out, HOA2 out +../IVAS_cod -ism_sba 1 2 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv 24400 48 testv/ltv48_OSBA_1ISM_HOA2.wav bit +../IVAS_dec HOA2 48 bit testv/ltv48_OSBA_1ISM_HOA2.wav_HOA2_24400_48-48.tst + +// OMASA 2Dir2TC 4ISM at br sw techs 13.2 to 512 kbps start 384 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 4 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_MASA2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_384k_omasatechs_4ism.bin 48 testv/ltv48_OMASA_4ISM_2TC.wav bit +../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_4ISM_2TC.wav_BINAURAL_sw_48-48.tst + +// OMASA 2Dir2TC 4ISM at 64 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 4 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv NULL NULL testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_MASA2TC.met 64000 48 testv/ltv48_OMASA_4ISM_2TC.wav bit +../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_4ISM_2TC.wav_BINAURAL_64000_48-48.tst + +// OMASA 2Dir2TC 4ISM at 384 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 4 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_MASA2TC.met 384000 48 testv/ltv48_OMASA_4ISM_2TC.wav bit +../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_4ISM_2TC.wav_BINAURAL_384000_48-48.tst + +// OMASA 2Dir2TC 4ISM at 256 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 4 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv NULL testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_MASA2TC.met 256000 48 testv/ltv48_OMASA_4ISM_2TC.wav bit +../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_4ISM_2TC.wav_BINAURAL56000_48-48.tst + +// OMASA 2Dir2TC 4ISM at 192 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 4 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_MASA2TC.met 192000 48 testv/ltv48_OMASA_4ISM_2TC.wav bit +../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_4ISM_2TC.wav_BINAURAL_192000_48-48.tst + +// OMASA 2Dir2TC 4ISM at 13.2 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 4 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_MASA2TC.met 13200 48 testv/ltv48_OMASA_4ISM_2TC.wav bit +../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_4ISM_2TC.wav_BINAURAL_13200_48-48.tst + +// OMASA 2Dir2TC 4ISM 48 kbps 48kHz in, 48kHz out, BINAURAL +../IVAS_cod -ism_masa 4 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_MASA2TC.met 48000 48 testv/ltv48_OMASA_4ISM_2TC.wav bit +../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_4ISM_2TC.wav_BINAURAL_48000_48-48_BINAURAL.tst + +// OMASA 2Dir2TC 3ISM at br sw techs 13.2 to 512 kbps start 160 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 3 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_MASA2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_160k_omasatechs_3ism.bin 48 testv/ltv48_OMASA_3ISM_2TC.wav bit +../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_3ISM_2TC.wav_BINAURAL_sw_48-48.tst + +// OMASA 2Dir2TC 3ISM at 80 kbps, 32kHz in, 16kHz out, BINAURAL.4 out +../IVAS_cod -ism_masa 3 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_MASA2TC.met 80000 32 testv/ltv32_OMASA_3ISM_2TC.wav bit +../IVAS_dec BINAURAL 16 bit testv/ltv32_OMASA_3ISM_2TC.wav_BINAURAL_80000_32-16.tst + +// OMASA 2Dir2TC 3ISM at 48 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 3 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_MASA2TC.met 48000 48 testv/ltv48_OMASA_3ISM_2TC.wav bit +../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_3ISM_2TC.wav_BINAURAL_48000_48-48.tst + +// OMASA 2Dir2TC 3ISM at 32 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 3 2 NULL NULL NULL testv/ltv48_MASA2TC.met 32000 48 testv/ltv48_OMASA_3ISM_2TC.wav bit +../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_3ISM_2TC.wav_BINAURAL_32000_48-48.tst + +// OMASA 2Dir2TC 2ISM at br sw techs 13.2 to 512 kbps start 48 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 2 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv NULL testv/ltv48_MASA2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_48k_omasatechs_2ism.bin 48 testv/ltv48_OMASA_2ISM_2TC.wav bit +../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_2ISM_2TC.wav_BINAURAL_sw_48-48.tst + +// OMASA 2Dir2TC 2ISM at 32 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 2 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_MASA2TC.met 32000 48 testv/ltv48_OMASA_2ISM_2TC.wav bit +../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_2ISM_2TC.wav_BINAURAL_32000_48-48.tst + +// OMASA 2Dir2TC 1ISM at br sw techs 13.2 to 512 kbps start 24.4 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 1 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_MASA2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_24k4_omasatechs_1ism.bin 48 testv/ltv48_OMASA_1ISM_2TC.wav bit +../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_1ISM_2TC.wav_BINAURAL_sw_48-48.tst + +// OMASA 2Dir2TC 1ISM at 13.2 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 1 2 NULL testv/ltv48_MASA2TC.met 13200 48 testv/ltv48_OMASA_1ISM_2TC.wav bit +../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_1ISM_2TC.wav_BINAURAL_13200_48-48.tst + +// OMASA 1Dir2TC 4ISM at br sw techs 13.2 to 512 kbps start 80 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 4 2 NULL testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_MASA2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_80k_omasatechs_4ism.bin 48 testv/ltv48_OMASA_4ISM_2TC.wav bit +../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_4ISM_2TC.wav_BINAURAL_sw_48-48.tst + +// OMASA 1Dir2TC 4ISM at 80 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 4 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_MASA2TC.met 80000 48 testv/ltv48_OMASA_4ISM_2TC.wav bit +../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_4ISM_2TC.wav_BINAURAL_80000_48-48.tst + +// OMASA 1Dir2TC 4ISM at 32 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 4 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_MASA2TC.met 32000 48 testv/ltv48_OMASA_4ISM_2TC.wav bit +../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_4ISM_2TC.wav_BINAURAL_32000_48-48.tst + +// OMASA 1Dir2TC 3ISM at br sw techs 13.2 to 512 kbps start 24.4 kbps, 32kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 3 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_MASA2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_24k4_omasatechs_3ism.bin 32 testv/ltv32_OMASA_3ISM_2TC.wav bit +../IVAS_dec BINAURAL 48 bit testv/ltv32_OMASA_3ISM_2TC.wav_BINAURAL_sw_32-48.tst + +// OMASA 1Dir2TC 3ISM at 32 kbps, 48kHz in, 16kHz out, BINAURAL out +../IVAS_cod -ism_masa 3 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_MASA2TC.met 32000 48 testv/ltv48_OMASA_3ISM_2TC.wav bit +../IVAS_dec BINAURAL 16 bit testv/ltv48_OMASA_3ISM_2TC.wav_BINAURAL_32000_48-16.tst + +// OMASA 1Dir2TC 3ISM at 160 kbps, 16kHz in, 32kHz out, BINAURAL out +../IVAS_cod -ism_masa 3 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_MASA2TC.met 160000 16 testv/ltv16_OMASA_3ISM_2TC.wav bit +../IVAS_dec BINAURAL 32 bit testv/ltv16_OMASA_3ISM_2TC.wav_BINAURAL_160000_16-32.tst + +// OMASA 1Dir2TC 2ISM at 256 kbps, 48kHz in, 32kHz out, BINAURAL out +../IVAS_cod -ism_masa 2 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv NULL testv/ltv48_MASA2TC.met 256000 48 testv/ltv48_OMASA_2ISM_2TC.wav bit +../IVAS_dec BINAURAL 32 bit testv/ltv48_OMASA_2ISM_2TC.wav_BINAURAL56000_48-32.tst + +// OMASA 1Dir2TC 1ISM at 128 kbps, 48kHz in, 48kHz out, BINAURAL out, bandwidth switching +../IVAS_cod -max_band testv/ivas_bws_20fr_start_SWB.txt -ism_masa 1 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_MASA2TC.met 128000 48 testv/ltv48_OMASA_1ISM_2TC.wav bit +../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_1ISM_2TC.wav_BINAURAL_128000_48-48.tst + +// OMASA 2Dir1TC 4ISM at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 4 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_MASA1TC.met 24400 48 testv/ltv48_OMASA_4ISM_1TC.wav bit +../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_4ISM_1TC.wav_BINAURAL4400_48-48.tst + +// OMASA 2Dir1TC 3ISM at br sw techs 13.2 to 512 kbps start 48 kbps, 48kHz in, 32kHz out, BINAURAL out +../IVAS_cod -ism_masa 3 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_MASA1TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_48k_omasatechs_3ism.bin 48 testv/ltv48_OMASA_3ISM_1TC.wav bit +../IVAS_dec BINAURAL 32 bit testv/ltv48_OMASA_3ISM_1TC.wav_BINAURAL_sw_48-32.tst + +// OMASA 2Dir1TC 3ISM at 96 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 3 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_MASA1TC.met 96000 48 testv/ltv48_OMASA_3ISM_1TC.wav bit +../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_3ISM_1TC.wav_BINAURAL_96000_48-48.tst + +// OMASA 2Dir1TC 3ISM at 24.4 kbps, 48kHz in, 16kHz out, BINAURAL out +../IVAS_cod -ism_masa 3 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_MASA1TC.met 24400 48 testv/ltv48_OMASA_3ISM_1TC.wav bit +../IVAS_dec BINAURAL 16 bit testv/ltv48_OMASA_3ISM_1TC.wav_BINAURAL_24400_48-16.tst + +// OMASA 2Dir1TC 1ISM at 512 kbps, 32kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 1 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_MASA1TC.met 512000 32 testv/ltv32_OMASA_1ISM_1TC.wav bit +../IVAS_dec BINAURAL 48 bit testv/ltv32_OMASA_1ISM_1TC.wav_BINAURAL_512000_32-48.tst + +// OMASA 1Dir1TC 4ISM at br sw techs 13.2 to 512 kbps start 32 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 4 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_MASA1TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_32k_omasatechs_4ism.bin 48 testv/ltv48_OMASA_4ISM_1TC.wav bit +../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_4ISM_1TC.wav_BINAURAL_sw_48-48.tst + +// OMASA 1Dir1TC 4ISM at 48 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 4 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_MASA1TC.met 48000 48 testv/ltv48_OMASA_4ISM_1TC.wav bit +../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_4ISM_1TC.wav_BINAURAL_48000_48-48.tst + +// OMASA 1Dir1TC 3ISM at 64 kbps, 32kHz in, 32kHz out, BINAURAL out +../IVAS_cod -ism_masa 3 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_MASA1TC.met 64000 32 testv/ltv32_OMASA_3ISM_1TC.wav bit +../IVAS_dec BINAURAL 32 bit testv/ltv32_OMASA_3ISM_1TC.wav_BINAURAL_64000_32-32.tst + +// OMASA 1Dir1TC 2ISM at 16.4 kbps, 16kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 2 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_MASA1TC.met 16400 16 testv/ltv16_OMASA_2ISM_1TC.wav bit +../IVAS_dec BINAURAL 48 bit testv/ltv16_OMASA_2ISM_1TC.wav_BINAURAL_16400_16-48.tst + +// Multi-channel 7_1_4 bitrate switching from 24.4 kbps to 256 kbps, 48kHz in, 32kHz out, 7_1_4 out +../IVAS_cod -mc 7_1_4 ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/ltv48_MC714.wav bit +../IVAS_dec 7_1_4 32 bit testv/ltv48_MC714.wav_sw_48-32_7_1_4.tst + +// Multi-channel 7_1_4 bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, 7_1_4 out +../IVAS_cod -mc 7_1_4 ../scripts/switchPaths/sw_mctech_5fr.bin 48 testv/ltv48_MC714.wav bit +../IVAS_dec 7_1_4 48 bit testv/ltv48_MC51.wav_sw_48-48_7_1_4.tst + +// Multi-channel 7_1_4 at 96 kbps, 48kHz in, 48kHz out, 7_1_4 out +../IVAS_cod -mc 7_1_4 96000 48 testv/ltv48_MC714.wav bit +../IVAS_dec 7_1_4 48 bit testv/ltv48_MC714.wav_MC714_96000_48-48_7_1_4.tst + +// Multi-channel 7_1_4 at 64 kbps, 48kHz in, 48kHz out, 7_1_4 out +../IVAS_cod -mc 7_1_4 64000 48 testv/ltv48_MC714.wav bit +../IVAS_dec 7_1_4 48 bit testv/ltv48_MC714.wav_MC714_64000_48-48_7_1_4.tst + +// Multi-channel 7_1_4 at 512 kbps, 48kHz in, 48 kHz out, 7_1_4 out default configuration +../IVAS_cod -mc 7_1_4 512000 48 testv/ltv48_MC714.wav bit +../IVAS_dec 7_1_4 48 bit testv/ltv48_MC71.wav_7_1_4_512000_48-48.tst + +// Multi-channel 7_1_4 at 48 kbps, 48kHz in, 48kHz out, 7_1_4 out, bandwidth switching +../IVAS_cod -max_band testv/ivas_bws_20fr_start_SWB.txt -mc 7_1_4 48000 48 testv/ltv48_MC714.wav bit +../IVAS_dec 7_1_4 48 bit testv/ltv48_MC714.wav_MC714_48000_48-48_7_1_4_bwsw.tst + +// Multi-channel 7_1_4 at 256 kbps, 48kHz in, 48kHz out, 7_1_4 out +../IVAS_cod -mc 7_1_4 256000 48 testv/ltv48_MC714.wav bit +../IVAS_dec 7_1_4 48 bit testv/ltv48_MC714.wav_MC714_256000_48-48_7_1_4.tst + +// Multi-channel 7_1_4 at 160 kbps, 48kHz in, 48 kHz out, 7_1_4 out default configuration +../IVAS_cod -mc 7_1_4 160000 48 testv/ltv48_MC714.wav bit +../IVAS_dec 7_1_4 48 bit testv/ltv48_MC71.wav_7_1_4_160000_48-48.tst + +// Multi-channel 7_1 bitrate switching from 24.4 kbps to 256 kbps, 48kHz in, 16kHz out, 7_1 out +../IVAS_cod -mc 7_1 ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/ltv48_MC71.wav bit +../IVAS_dec 7_1 16 bit testv/ltv71MCMC48c.wav_sw_48-16_7_1.tst + +// Multi-channel 7_1 bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, 7_1 out +../IVAS_cod -mc 7_1 ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/ltv48_MC71.wav bit +../IVAS_dec 7_1 48 bit testv/ltv71C48c.wav_sw_48-48_7_1_model_file_headrot.tst + +// Multi-channel 7_1 at 512 kbps, 48kHz in, 48kHz out, 7_1 +../IVAS_cod -mc 7_1 512000 48 testv/ltv48_MC71.wav bit +../IVAS_dec 7_1 48 bit testv/ltv48_MC71.wav_MC71_512000_48-48_7_1_Config_renderer.tst + +// Multi-channel 5_1_4 bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 32kHz out, 5_1_4 out +../IVAS_cod -mc 5_1_4 ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/ltv48_MC514.wav bit +../IVAS_dec 5_1_4 32 bit testv/ltv48_MC514.wav_sw_48-32_5_1_4.tst + +// Multi-channel 5_1_4 at 512 kbps, 48kHz in, 48 kHz out, 7_1 out default configuration +../IVAS_cod -mc 5_1_4 512000 48 testv/ltv48_MC514.wav bit +../IVAS_dec 7_1 48 bit testv/ltv48_MC51.wav_7_1_512000_48-48.tst + +// Multi-channel 5_1_4 at 48 kbps, 48kHz in, 48kHz out, 7_1 out +../IVAS_cod -mc 5_1_4 48000 48 testv/ltv48_MC514.wav bit +../IVAS_dec 7_1 48 bit testv/ltv48_MC514.wav_MC514_48000_48-48_7_1.tst + +// Multi-channel 5_1_2 bitrate switching from 24.4 kbps to 256 kbps, 48kHz in, 48kHz out, 5_1_2 out +../IVAS_cod -mc 5_1_2 ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/ltv48_MC512.wav bit +../IVAS_dec 5_1_2 48 bit testv/ltv48_MC512.wav_sw_48-48_5_1_2.tst + +// Multi-channel 5_1_2 bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 16kHz out, 5_1_2 out +../IVAS_cod -mc 5_1_2 ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/ltv48_MC512.wav bit +../IVAS_dec 5_1_2 16 bit testv/ltv48_MC512.wav_sw_48-16_5_1_2.tst + +// Multi-channel 5_1_2 at 80 kbps, 48kHz in, 48kHz out, 5_1_2 out +../IVAS_cod -mc 5_1_2 80000 48 testv/ltv48_MC512.wav bit +../IVAS_dec 5_1_2 48 bit testv/ltv48_MC512.wav_MC512_80000_48-48_5_1_2.tst + +// Multi-channel 5_1_2 at 64 kbps, 48kHz in, 48kHz out, 5_1_2 +../IVAS_cod -mc 5_1_2 64000 48 testv/ltv48_MC512.wav bit +../IVAS_dec 5_1_2 48 bit testv/ltv48_MC512.wav_MC512_64000_48-48_5_1_2.tst + +// Multi-channel 5_1_2 at 32 kbps, 48kHz in, 48kHz out, 5_1_2 out +../IVAS_cod -mc 5_1_2 32000 48 testv/ltv48_MC512.wav bit +../IVAS_dec 5_1_2 48 bit testv/ltv48_MC512.wav_MC512_32000_48-48_5_1_2.tst + +// Multi-channel 5_1_2 at 160 kbps, 48kHz in, 48kHz out, 5_1_2 out +../IVAS_cod -mc 5_1_2 160000 48 testv/ltv48_MC512.wav bit +../IVAS_dec 5_1_2 48 bit testv/ltv48_MC512.wav_MC512_160000_48-48_5_1_2.tst + +// Multi-channel 5_1 bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, 5_1 out +../IVAS_cod -mc 5_1 ../scripts/switchPaths/sw_mctech_5fr.bin 48 testv/ltv48_MC51.wav bit +../IVAS_dec 5_1 48 bit testv/ltv48_MC51.wav_sw_48-48_5_1.tst + +// Multi-channel 5_1 bitrate switching from 13.2 kbps to 512 kbps, 32kHz in, 48kHz out, 5_1 out +../IVAS_cod -mc 5_1 ../scripts/switchPaths/sw_mctech_5fr.bin 32 testv/ltv32_MC51.wav bit +../IVAS_dec 5_1 48 bit testv/ltv32_MC51.wav_sw_32-48_5_1.tst + +// Multi-channel 5_1 at 96 kbps, 48kHz in, 48kHz out, bandwidth switching +../IVAS_cod -max_band testv/ivas_bws_20fr_start_FB.txt -mc 5_1 96000 48 testv/ltv48_MC51.wav bit +../IVAS_dec 5_1 48 bit testv/ltv48_MC51.wav_MC51_96000_48-48_5_1.tst + +// Multi-channel 5_1 at 80 kbps, 48kHz in, 32kHz out, 5_1 out +../IVAS_cod -mc 5_1 80000 48 testv/ltv48_MC51.wav bit +../IVAS_dec 5_1 32 bit testv/ltv48_MC51.wav_MC51_80000_48-32_MC_Config_renderer.tst + +// Multi-channel 5_1 at 64 kbps, 48kHz in, 48kHz out, 5_1 out +../IVAS_cod -mc 5_1 64000 48 testv/ltv48_MC51.wav bit +../IVAS_dec 5_1 48 bit testv/ltv48_MC51.wav_MC51_64000_48-48_5_1.tst + +// Multi-channel 5_1 at 512 kbps, 48kHz in, 48 kHz out, 5_1 +../IVAS_cod -mc 5_1 512000 48 testv/ltv48_MC51.wav bit +../IVAS_dec 5_1 48 bit testv/ltv48_MC51.wav_5_1_512000_48-48.tst + +// Multi-channel 5_1 at 48 kbps, 48kHz in, 48kHz out, 5_1 out +../IVAS_cod -mc 5_1 48000 48 testv/ltv48_MC51.wav bit +../IVAS_dec 5_1 48 bit testv/ltv48_MC51.wav_MC51_48000_48-48_5_1.tst + +// Multi-channel 5_1 at 384 kbps, 48kHz in, 48kHz out +../IVAS_cod -mc 5_1 384000 48 testv/ltv48_MC51.wav bit +../IVAS_dec 5_1 48 bit testv/ltv48_MC51.wav_MC51_384000_48-48_5_1.tst + +// Multi-channel 5_1 at 256 kbps, 48kHz in, 48kHz out, 5_1 out +../IVAS_cod -mc 5_1 256000 48 testv/ltv48_MC51.wav bit +../IVAS_dec 5_1 48 bit testv/ltv48_MC51.wav_MC51_256000_48-48_5_1.tst + +// Multi-channel 5_1 at 24.4 kbps, 48kHz in, 48kHz out, 5_1 out +../IVAS_cod -mc 5_1 24400 48 testv/ltv48_MC51.wav bit +../IVAS_dec 5_1 48 bit testv/ltv48_MC51.wav_MC51_24400_48-48_5_1.tst + +// Multi-channel 5_1 at 192 kbps, 48kHz in, 48kHz out, 5_1 out +../IVAS_cod -mc 5_1 192000 48 testv/ltv48_MC51.wav bit +../IVAS_dec 5_1 48 bit testv/ltv48_MC51.wav_MC51_192000_48-48_5_1.tst + +// Multi-channel 5_1 at 13.2 kbps, 48kHz in, 48kHz out +../IVAS_cod -mc 5_1 13200 48 testv/ltv48_MC51.wav bit +../IVAS_dec 5_1 48 bit testv/ltv48_MC51.wav_MC51_13200_48-48_5_1.tst + +// Multi-channel 5_1 at 128 kbps, 48kHz in, 48kHz out, 5_1 out +../IVAS_cod -mc 5_1 128000 48 testv/ltv48_MC51.wav bit +../IVAS_dec 5_1 48 bit testv/ltv48_MC51.wav_MC51_128000_48-48_5_1.tst + +// MASA 2dir 2TC bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/ltv48_MASA2TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_sw_48-48_EXT.tst + +// MASA 2dir 2TC at 96 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 96000 48 testv/ltv48_MASA2TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_96000_48-48_EXT.tst + +// MASA 2dir 2TC at 64 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 64000 48 testv/ltv48_MASA2TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_64000_48-48_EXT.tst + +// MASA 2dir 2TC at 512 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 512000 48 testv/ltv48_MASA2TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_512000_48-48_EXT.tst + +// MASA 2dir 2TC at 48 kbps, 48kHz in, 48kHz out, EXT out, bandwidth switching +../IVAS_cod -max_band testv/ivas_bws_20fr_start_FB.txt -masa 2 testv/ltv48_MASA2TC.met 48000 48 testv/ltv48_MASA2TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_48000_48-48_EXT.tst + +// MASA 2dir 2TC at 384 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 384000 48 testv/ltv48_MASA2TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_384000_48-48_EXTRoom.tst + +// MASA 2dir 2TC at 32 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 32000 48 testv/ltv48_MASA2TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_32000_48-48_EXT.tst + +// MASA 2dir 2TC at 256 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 256000 48 testv/ltv48_MASA2TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_256000_48-48_EXT.tst + +// MASA 2dir 2TC at 192 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 192000 48 testv/ltv48_MASA2TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_192000_48-48_EXT.tst + +// MASA 2dir 2TC at 160 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 160000 48 testv/ltv48_MASA2TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_160000_48-48_EXT.tst + +// MASA 2dir 2TC at 128 kbps, 48kHz in, 48kHz out, FOA out +../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 128000 48 testv/ltv48_MASA2TC.wav bit +../IVAS_dec FOA 48 bit testv/ltv48_MASA2TC.wav_128000_48-48_FOA.tst + +// MASA 2dir 1TC at 80 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 80000 48 testv/ltv48_MASA1TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA1TC.wav_80000_48-48_EXT.tst + +// MASA 2dir 1TC at 24.4 kbps, 48kHz in, 32kHz out, EXT out +../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 24400 48 testv/ltv48_MASA1TC.wav bit +../IVAS_dec EXT 32 bit testv/ltv48_MASA1TC.wav_24400_48-32_EXT.tst + +// MASA 2dir 1TC at 128 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 128000 48 testv/ltv48_MASA1TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA1TC.wav_128000_48-48_EXT.tst + +// MASA 1dir 2TC bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/ltv48_MASA2TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_sw_48-48_EXT.tst + +// MASA 1dir 2TC bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, DTX on, EXT out +../IVAS_cod -dtx -masa 2 testv/ltv48_MASA2TC.met ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/ltv48_MASA2TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_sw_48-48_DTX_EXT.tst + +// MASA 1dir 2TC at 96 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 96000 48 testv/ltv48_MASA2TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_96000_48-48_EXT.tst + +// MASA 1dir 2TC at 80 kbps, 32kHz in, 16kHz out, EXT out +../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 80000 32 testv/ltv32_MASA2TC.wav bit +../IVAS_dec EXT 16 bit testv/ltv32_MASA2TC.wav_80000_32-16_EXT.tst + +// MASA 1dir 2TC at 64 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 64000 48 testv/ltv48_MASA2TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_64000_48-48_EXT.tst + +// MASA 1dir 2TC at 48 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 48000 48 testv/ltv48_MASA2TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_48000_48-48_EXT.tst + +// MASA 1dir 2TC at 32.0 kbps, 48kHz in, 48kHz out, DTX on, EXT out +../IVAS_cod -dtx -masa 2 testv/ltv48_MASA2TC.met 32000 48 testv/ltv48_MASA2TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_32000_48-48_DTX_EXT.tst + +// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 32000 48 testv/ltv48_MASA2TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_32000_48-48_EXTRoom.tst + +// MASA 1dir 2TC at 256 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 256000 48 testv/ltv48_MASA2TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_256000_48-48_EXT.tst + +// MASA 1dir 2TC at 24.4 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 24400 48 testv/ltv48_MASA2TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_24400_48-48_EXT.tst + +// MASA 1dir 2TC at 160 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 160000 48 testv/ltv48_MASA2TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_160000_48-48_EXT.tst + +// MASA 1dir 2TC at 16.4 kbps, 48kHz in, 48kHz out, DTX on, EXT out +../IVAS_cod -dtx -masa 2 testv/ltv48_MASA2TC.met 16400 48 testv/ltv48_MASA2TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_16400_48-48_DTX_EXT.tst + +// MASA 1dir 2TC at 16.4 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 16400 48 testv/ltv48_MASA2TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_16400_48-48_EXT.tst + +// MASA 1dir 2TC at 16.4 kbps, 16kHz in, 48kHz out, EXT out +../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 16400 16 testv/ltv16_MASA2TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv16_MASA2TC.wav_16400_16-48_EXT.tst + +// MASA 1dir 2TC at 13.2 kbps, 48kHz in, 48kHz out, EXT out, bandwidth switching +../IVAS_cod -max_band testv/ivas_bws_20fr_start_WB.txt -masa 2 testv/ltv48_MASA2TC.met 13200 48 testv/ltv48_MASA2TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_13200_48-48_EXT.tst + +// MASA 1dir 2TC at 128 kbps, 48kHz in, 48kHz out, DTX on, EXT out +../IVAS_cod -dtx -masa 2 testv/ltv48_MASA2TC.met 128000 48 testv/ltv48_MASA2TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_128000_48-48_DTX_EXT.tst + +// MASA 1dir 1TC bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/ltv48_MASA1TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA1TC.wav_sw_48-48_EXT.tst + +// MASA 1dir 1TC at 64 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 64000 48 testv/ltv48_MASA1TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA1TC.wav_64000_48-48_EXT.tst + +// MASA 1dir 1TC at 48 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 48000 48 testv/ltv48_MASA1TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA1TC.wav_48000_48-48_EXT.tst + +// MASA 1dir 1TC at 48 kbps, 32kHz in, 48kHz out, EXT out +../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 48000 32 testv/ltv32_MASA1TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv32_MASA1TC.wav_48000_32-48_EXT.tst + +// MASA 1dir 1TC at 32 kbps, 48kHz in, 48kHz out, EXT +../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 32000 48 testv/ltv48_MASA1TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA1TC.wav_32000_48-48_EXT.tst + +// MASA 1dir 1TC at 256kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 256000 48 testv/ltv48_MASA1TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA1TC.wav_EXT_256000_48-48.tst + +// MASA 1dir 1TC at 24.4 kbps, 48kHz in, 48kHz out, DTX on, EXT out +../IVAS_cod -dtx -masa 1 testv/ltv48_MASA1TC.met 24400 48 testv/ltv48_MASA1TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA1TC.wav_24400_48-48_DTX_EXT.tst + +// MASA 1dir 1TC at 24.4 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 24400 48 testv/ltv48_MASA1TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA1TC.wav_24400_48-48_EXTRoom.tst + +// MASA 1dir 1TC at 16.4 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 16400 48 testv/ltv48_MASA1TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA1TC.wav_16400_48-48_EXT.tst + +// MASA 1dir 1TC at 13.2 kbps, 48kHz in, 48kHz out, DTX on, EXT out +../IVAS_cod -dtx -masa 1 testv/ltv48_MASA1TC.met 13200 48 testv/ltv48_MASA1TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA1TC.wav_13200_48-48_DTX_EXT.tst + +// MASA 1dir 1TC at 13.2 kbps, 48kHz in, 48kHz out, EXT out, bandwidth switching +../IVAS_cod -max_band testv/ivas_bws_20fr_start_SWB.txt -masa 1 testv/ltv48_MASA1TC.met 13200 48 testv/ltv48_MASA1TC.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MASA1TC.wav_13200_48-48_EXT.tst + +// EVS non-diegetic panning at 64 kbps, 48kHz in, 48kHz out, STEREO out +../IVAS_cod 64000 48 testv/ltv48_MONO.wav bit +../IVAS_dec -non_diegetic_pan -50 48 bit testv/ltv48c.pcm_EVS_64000_48-48_STEREO_NON-DIEGETIC-PAN_-50.tst + +// 4 ISm with metadata at 32 kbps, 48 kHz in, 48 kHz out, EXT out +../IVAS_cod -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 32000 48 testv/ltv48_4ISM.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_4ISM.wav_32000_48-48_EXT.tst + +// 4 ISm with metadata at 256 kbps, 48 kHz in, 48 kHz out, EXT out +../IVAS_cod -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 256000 48 testv/ltv48_4ISM.wav bit +../IVAS_dec EXT 48 bit testv/ltv4ISM48s.pcm_256000_48-48_EXT.tst + +// 4 ISM with metadata bitrate switching from 24.4 kbps to 256 kbps, 48 kHz in, 48 kHz out, EXT out +../IVAS_cod -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/ltv48_4ISM.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_4ISM.wav_brate_sw_48-48_EXT.tst + +// 4 ISM with metadata at 96 kbps, 48 kHz in, 48 kHz out +../IVAS_cod -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 96000 48 testv/ltv48_4ISM.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_4ISM.wav_96000_48-48_EXT.tst + +// 4 ISM with metadata at 80 kbps, 48 kHz in, 48 kHz out, EXT out +../IVAS_cod -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 80000 48 testv/ltv48_4ISM.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_4ISM.wav_80000_48-48_EXT.tst + +// 4 ISM with metadata at 64 kbps, 48 kHz in, 48 kHz out, EXT out +../IVAS_cod -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 64000 48 testv/ltv48_4ISM.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_4ISM.wav_64000_48-48_EXT_room.tst + +// 4 ISM with metadata at 512 kbps, 48 kHz in, 48 kHz out, EXT +../IVAS_cod -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 512000 48 testv/ltv48_4ISM.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_4ISM.wav_512000_48-48_EXT.tst + +// 4 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, DTX on, EXT out +../IVAS_cod -dtx -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 48000 48 testv/ltv48_4ISM.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_4ISM.wav_48000_48-48_DTX_TD_EXT.tst + +// 4 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, DTX on, EXT out +../IVAS_cod -dtx -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 32000 48 testv/ltv48_4ISM.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_4ISM.wav_32000_48-48_DTX_EXT.tst + +// 4 ISM with metadata at 160 kbps, 48 kHz in, 48 kHz out, EXT out +../IVAS_cod -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 160000 48 testv/ltv48_4ISM.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_4ISM.wav_160000_48-48_EXT.tst + +// 4 ISM with metadata at 128 kbps, 48 kHz in, 48 kHz out, EXT out, bandwidth switching +../IVAS_cod -max_band testv/ivas_bws_20fr_start_SWB.txt -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 128000 48 testv/ltv48_4ISM.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_4ISM.wav_128000_48-48_EXT.tst + +// 4 ISM with extended metadata at 256 kbps, 48 kHz in, 48 kHz out, EXT out +../IVAS_cod -ism +4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 256000 48 testv/ltv48_4ISM.wav bit +../IVAS_dec EXT 48 bit testv/ltv+4ISM48s.wav_256000_48-48_EXT.tst + +// 4 ISM with extended metadata and non diegetic pan object switching bitrate 256 kbps, 48 kHz in, 48 kHz out, DTX on, EXT out +../IVAS_cod -dtx -ism +4 testv/ltvISM1.csv NULL testv/stvISM_with_no_diegetic_switch.csv testv/ltvISM4.csv 256000 48 testv/ltv48_4ISM.wav bit +../IVAS_dec EXT 48 bit testv/ltv+4ISM48n+non_diegetic_pan.wav_brate_256000-48_DTX_EXT.tst + +// 4 ISM with and without metadata bitrate switching from 24.4 kbps to 256 kbps, 48 kHz in, 48 kHz out, DTX on, EXT out +../IVAS_cod -dtx -ism 4 testv/ltvISM1.csv NULL NULL testv/ltvISM4.csv ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/ltv48_4ISM.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_4ISM.wav_brate_sw_48-48_DTX_EXT.tst + +// 4 ISM with and without extended metadata bitrate switching from 24.4 kbps to 256 kbps, 48 kHz in, 48 kHz out, DTX on, EXT out +../IVAS_cod -dtx -ism +4 testv/ltvISM1.csv NULL testv/ltvISM3.csv testv/ltvISM4.csv ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/ltv48_4ISM.wav bit +../IVAS_dec EXT 48 bit testv/ltv+4ISM48n.wav_brate_sw_48-48_DTX_EXT.tst + +// 3 ISM with metadata at 96 kbps, 48 kHz in, 48 kHz out, EXT out +../IVAS_cod -ism 3 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv 96000 48 testv/ltv48_3ISM.wav bit +../IVAS_dec EXT 48 bit testv/ltv3ISM48s.96000_48-48_EXT.tst + +// 3 ISM with metadata at 64 kbps, 48 kHz in, 48 kHz out, EXT out +../IVAS_cod -ism 3 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv 64000 48 testv/ltv48_3ISM.wav bit +../IVAS_dec EXT 48 bit testv/ltv3ISM48s.64000_48-48_EXT.tst + +// 3 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, EXT out +../IVAS_cod -ism 3 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv 48000 48 testv/ltv48_3ISM.wav bit +../IVAS_dec EXT 48 bit testv/ltv3ISM48s.48000_48-48_EXT.tst + +// 3 ISM with metadata at 384 kbps, 48 kHz in, 32 kHz out, EXT out +../IVAS_cod -ism 3 testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 384000 48 testv/ltv48_3ISM.wav bit +../IVAS_dec EXT 32 bit testv/ltv48_3ISM.wav_384000_48-32_EXT.tst + +// 3 ISM with metadata at 24.4 kbps, 48 kHz in, 48 kHz out, EXT out +../IVAS_cod -ism 3 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv 24400 48 testv/ltv48_3ISM.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_3ISM.wav_24400_48-48_EXT.tst + +// 3 ISM with metadata at 192 kbps, 48 kHz in, 48 kHz out, EXT out +../IVAS_cod -ism 3 testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 192000 48 testv/ltv48_3ISM.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_3ISM.wav_192000_48-48_EXTfile.tst + +// 3 ISM with metadata at 128 kbps, 48 kHz in, 32 kHz out, EXT out +../IVAS_cod -ism 3 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv 128000 48 testv/ltv48_3ISM.wav bit +../IVAS_dec EXT 32 bit testv/ltv48_3ISM.wav_128000_48-32_EXT.tst + +// 2 ISM with metadata at 80 kbps, 48 kHz in, 48 kHz out, DTX on, EXT out +../IVAS_cod -dtx -ism 2 testv/ltvISM1.csv testv/ltvISM2.csv 80000 48 testv/ltv48_STEREO.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_STEREO.wav_2ISM_80000_48-48_DTX_EXT.tst + +// 2 ISM with metadata at 64 kbps, 48 kHz in, 48 kHz out, EXT out +../IVAS_cod -ism 2 testv/ltvISM3.csv testv/ltvISM4.csv 64000 48 testv/ltv48_2ISM.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_2ISM.wav_64000_48-48_EXT_room.tst + +// 2 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, EXT out +../IVAS_cod -ism 2 testv/ltvISM3.csv testv/ltvISM4.csv 48000 48 testv/ltv48_2ISM.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_2ISM.wav_48000_48-48_EXT.tst + +// 2 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, DTX on, EXT out +../IVAS_cod -dtx -ism 2 testv/ltvISM1.csv testv/ltvISM2.csv 32000 48 testv/ltv48_STEREO.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_STEREO.wav_2ISM_32000_48-48_DTX_EXT.tst + +// 2 ISM with metadata at 160 kbps, 48 kHz in, 32 kHz out, EXT out +../IVAS_cod -ism 2 testv/ltvISM1.csv testv/ltvISM2.csv 160000 48 testv/ltv48_2ISM.wav bit +../IVAS_dec EXT 32 bit testv/ltv48_2ISM.wav_160000_48-32_EXT.tst + +// 2 ISM with metadata at 16.4 kbps, 48 kHz in, 48 kHz out, EXT out +../IVAS_cod -ism 2 testv/ltvISM1.csv testv/ltvISM2.csv 16400 48 testv/ltv48_2ISM.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_2ISM.wav_16400_48-48_EXT.tst + +// 2 ISM with metadata at 128 kbps, 48 kHz in, 32 kHz out, EXT out +../IVAS_cod -ism 2 testv/ltvISM1.csv testv/ltvISM2.csv 128000 48 testv/ltv48_2ISM.wav bit +../IVAS_dec EXT 32 bit testv/ltv48_2ISM.wav_128000_48-32_EXT_file_TDHR.tst + +// 1 ISM with metadata bitrate switching from 13.2 kbps to 128 kbps, 32 kHz in, 32 kHz out, EXT out, DTX on +../IVAS_cod -dtx -ism 1 testv/ltvISM1.csv ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 32 testv/ltv32_MONO.wav bit +../IVAS_dec EXT 32 bit testv/ltv32_MONO.wav_1ISM_brate_sw_32-32_EXT_dtx.tst + +// 1 ISM with metadata at 96 kbps, 48 kHz in, 16 kHz out, EXT out, bandwidth switching +../IVAS_cod -max_band testv/ivas_bws_20fr_start_FB.txt -ism 1 testv/ltvISM1.csv 96000 48 testv/ltv48_1ISM.wav bit +../IVAS_dec EXT 16 bit testv/ltv48_1ISM.wav_96000_48-16_EXT.tst + +// 1 ISM with metadata at 80 kbps, 48 kHz in, 16 kHz out, EXT out +../IVAS_cod -ism 1 testv/ltvISM1.csv 80000 48 testv/ltv48_1ISM.wav bit +../IVAS_dec EXT 16 bit testv/ltv48_1ISM.wav_80000_48-16_EXT_file_TDHR.tst + +// 1 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, EXT out, HR +../IVAS_cod -ism 1 testv/ltvISM1.csv 48000 48 testv/ltv48_1ISM.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_1ISM.wav_64000_48-48_EXT_room_HR.tst + +// 1 ISM with metadata at 32 kbps, 32 kHz in, 32 kHz out, DTX on, EXT out +../IVAS_cod -dtx -ism 1 testv/ltvISM1.csv 32000 32 testv/ltv32_MONO.wav bit +../IVAS_dec EXT 32 bit testv/ltv32_MONO.wav_1ISM_32000_32-32_DTX_EXT.tst + +// 1 ISM with metadata at 16.4 kbps, 48 kHz in, 48 kHz out, EXT out, bandwidth switching +../IVAS_cod -max_band testv/ivas_bws_20fr_start_WB.txt -ism 1 testv/ltvISM1.csv 16400 48 testv/ltv48_1ISM.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_1ISM.wav_16400_48-48_EXT_room.tst + +// 1 ISM with metadata at 13.2 kbps, 48 kHz in, 48 kHz out, EXT out +../IVAS_cod -ism 1 testv/ltvISM1.csv 13200 48 testv/ltv48_1ISM.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_1ISM.wav_13200_48-48_EXT.tst + +// 1 ISM with metadata at 13.2 kbps, 48 kHz in, 48 kHz out, DTX on, EXT out +../IVAS_cod -dtx -ism 1 testv/ltvISM1.csv 13200 48 testv/ltv48_MONO.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_MONO.wav_1ISM_13200_48-48_DTX_EXT.tst + +// 1 ISM non-diegetic panning at 32 kbps, 48kHz in, 48kHz out, EXT out +//../IVAS_cod -ism 1 testv/ltvISM1.csv 32000 48 testv/ltv48_1ISM.wav bit +//../IVAS_dec -non_diegetic_pan 80 EXT 48 bit testv/ltv1ISM48s.pcm_ISM_32000_48-48_EXT_NON-DIEGETIC-PAN_80.tst -- GitLab From 2d9c900cca3d390fc70f64863772f00f6ee70075 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 12 Dec 2024 09:18:55 +0100 Subject: [PATCH 21/36] add ltv variant of basop encoder .prm file --- .../config/self_test_ltv_basop_encoder.prm | 224 ++++++++---------- 1 file changed, 98 insertions(+), 126 deletions(-) diff --git a/scripts/config/self_test_ltv_basop_encoder.prm b/scripts/config/self_test_ltv_basop_encoder.prm index d8ff498a4c..a5ec413fbc 100644 --- a/scripts/config/self_test_ltv_basop_encoder.prm +++ b/scripts/config/self_test_ltv_basop_encoder.prm @@ -432,132 +432,132 @@ ../IVAS_cod -ism_sba 1 2 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv 24400 48 testv/ltv48_OSBA_1ISM_HOA2.wav bit ../IVAS_dec HOA2 48 bit testv/ltv48_OSBA_1ISM_HOA2.wav_HOA2_24400_48-48.tst -// OMASA 2Dir2TC 4ISM at br sw techs 13.2 to 512 kbps start 384 kbps, 48kHz in, 48kHz out, BINAURAL out -../IVAS_cod -ism_masa 4 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_MASA2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_384k_omasatechs_4ism.bin 48 testv/ltv48_OMASA_4ISM_2TC.wav bit +// OMASA 2TC 4ISM at br sw techs 13.2 to 512 kbps start 384 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 4 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_OMASA_4ISM_2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_384k_omasatechs_4ism.bin 48 testv/ltv48_OMASA_4ISM_2TC.wav bit ../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_4ISM_2TC.wav_BINAURAL_sw_48-48.tst -// OMASA 2Dir2TC 4ISM at 64 kbps, 48kHz in, 48kHz out, BINAURAL out -../IVAS_cod -ism_masa 4 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv NULL NULL testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_MASA2TC.met 64000 48 testv/ltv48_OMASA_4ISM_2TC.wav bit +// OMASA 2TC 4ISM at 64 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 4 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv NULL NULL testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_OMASA_4ISM_2TC.met 64000 48 testv/ltv48_OMASA_4ISM_2TC.wav bit ../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_4ISM_2TC.wav_BINAURAL_64000_48-48.tst -// OMASA 2Dir2TC 4ISM at 384 kbps, 48kHz in, 48kHz out, BINAURAL out -../IVAS_cod -ism_masa 4 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_MASA2TC.met 384000 48 testv/ltv48_OMASA_4ISM_2TC.wav bit +// OMASA 2TC 4ISM at 384 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 4 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_OMASA_4ISM_2TC.met 384000 48 testv/ltv48_OMASA_4ISM_2TC.wav bit ../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_4ISM_2TC.wav_BINAURAL_384000_48-48.tst -// OMASA 2Dir2TC 4ISM at 256 kbps, 48kHz in, 48kHz out, BINAURAL out -../IVAS_cod -ism_masa 4 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv NULL testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_MASA2TC.met 256000 48 testv/ltv48_OMASA_4ISM_2TC.wav bit +// OMASA 2TC 4ISM at 256 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 4 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv NULL testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_OMASA_4ISM_2TC.met 256000 48 testv/ltv48_OMASA_4ISM_2TC.wav bit ../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_4ISM_2TC.wav_BINAURAL56000_48-48.tst -// OMASA 2Dir2TC 4ISM at 192 kbps, 48kHz in, 48kHz out, BINAURAL out -../IVAS_cod -ism_masa 4 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_MASA2TC.met 192000 48 testv/ltv48_OMASA_4ISM_2TC.wav bit +// OMASA 2TC 4ISM at 192 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 4 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_OMASA_4ISM_2TC.met 192000 48 testv/ltv48_OMASA_4ISM_2TC.wav bit ../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_4ISM_2TC.wav_BINAURAL_192000_48-48.tst -// OMASA 2Dir2TC 4ISM at 13.2 kbps, 48kHz in, 48kHz out, BINAURAL out -../IVAS_cod -ism_masa 4 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_MASA2TC.met 13200 48 testv/ltv48_OMASA_4ISM_2TC.wav bit +// OMASA 2TC 4ISM at 13.2 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 4 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_OMASA_4ISM_2TC.met 13200 48 testv/ltv48_OMASA_4ISM_2TC.wav bit ../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_4ISM_2TC.wav_BINAURAL_13200_48-48.tst -// OMASA 2Dir2TC 4ISM 48 kbps 48kHz in, 48kHz out, BINAURAL -../IVAS_cod -ism_masa 4 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_MASA2TC.met 48000 48 testv/ltv48_OMASA_4ISM_2TC.wav bit +// OMASA 2TC 4ISM 48 kbps 48kHz in, 48kHz out, BINAURAL +../IVAS_cod -ism_masa 4 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_OMASA_4ISM_2TC.met 48000 48 testv/ltv48_OMASA_4ISM_2TC.wav bit ../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_4ISM_2TC.wav_BINAURAL_48000_48-48_BINAURAL.tst -// OMASA 2Dir2TC 3ISM at br sw techs 13.2 to 512 kbps start 160 kbps, 48kHz in, 48kHz out, BINAURAL out -../IVAS_cod -ism_masa 3 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_MASA2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_160k_omasatechs_3ism.bin 48 testv/ltv48_OMASA_3ISM_2TC.wav bit +// OMASA 2TC 3ISM at br sw techs 13.2 to 512 kbps start 160 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 3 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_3ISM_2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_160k_omasatechs_3ism.bin 48 testv/ltv48_OMASA_3ISM_2TC.wav bit ../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_3ISM_2TC.wav_BINAURAL_sw_48-48.tst -// OMASA 2Dir2TC 3ISM at 80 kbps, 32kHz in, 16kHz out, BINAURAL.4 out -../IVAS_cod -ism_masa 3 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_MASA2TC.met 80000 32 testv/ltv32_OMASA_3ISM_2TC.wav bit +// OMASA 2TC 3ISM at 80 kbps, 32kHz in, 16kHz out, BINAURAL.4 out +../IVAS_cod -ism_masa 3 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_3ISM_2TC.met 80000 32 testv/ltv32_OMASA_3ISM_2TC.wav bit ../IVAS_dec BINAURAL 16 bit testv/ltv32_OMASA_3ISM_2TC.wav_BINAURAL_80000_32-16.tst -// OMASA 2Dir2TC 3ISM at 48 kbps, 48kHz in, 48kHz out, BINAURAL out -../IVAS_cod -ism_masa 3 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_MASA2TC.met 48000 48 testv/ltv48_OMASA_3ISM_2TC.wav bit +// OMASA 2TC 3ISM at 48 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 3 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_3ISM_2TC.met 48000 48 testv/ltv48_OMASA_3ISM_2TC.wav bit ../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_3ISM_2TC.wav_BINAURAL_48000_48-48.tst -// OMASA 2Dir2TC 3ISM at 32 kbps, 48kHz in, 48kHz out, BINAURAL out -../IVAS_cod -ism_masa 3 2 NULL NULL NULL testv/ltv48_MASA2TC.met 32000 48 testv/ltv48_OMASA_3ISM_2TC.wav bit +// OMASA 2TC 3ISM at 32 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 3 2 NULL NULL NULL testv/ltv48_OMASA_3ISM_2TC.met 32000 48 testv/ltv48_OMASA_3ISM_2TC.wav bit ../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_3ISM_2TC.wav_BINAURAL_32000_48-48.tst -// OMASA 2Dir2TC 2ISM at br sw techs 13.2 to 512 kbps start 48 kbps, 48kHz in, 48kHz out, BINAURAL out -../IVAS_cod -ism_masa 2 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv NULL testv/ltv48_MASA2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_48k_omasatechs_2ism.bin 48 testv/ltv48_OMASA_2ISM_2TC.wav bit +// OMASA 2TC 2ISM at br sw techs 13.2 to 512 kbps start 48 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 2 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv NULL testv/ltv48_OMASA_2ISM_2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_48k_omasatechs_2ism.bin 48 testv/ltv48_OMASA_2ISM_2TC.wav bit ../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_2ISM_2TC.wav_BINAURAL_sw_48-48.tst -// OMASA 2Dir2TC 2ISM at 32 kbps, 48kHz in, 48kHz out, BINAURAL out -../IVAS_cod -ism_masa 2 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_MASA2TC.met 32000 48 testv/ltv48_OMASA_2ISM_2TC.wav bit +// OMASA 2TC 2ISM at 32 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 2 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_2ISM_2TC.met 32000 48 testv/ltv48_OMASA_2ISM_2TC.wav bit ../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_2ISM_2TC.wav_BINAURAL_32000_48-48.tst -// OMASA 2Dir2TC 1ISM at br sw techs 13.2 to 512 kbps start 24.4 kbps, 48kHz in, 48kHz out, BINAURAL out -../IVAS_cod -ism_masa 1 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_MASA2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_24k4_omasatechs_1ism.bin 48 testv/ltv48_OMASA_1ISM_2TC.wav bit +// OMASA 2TC 1ISM at br sw techs 13.2 to 512 kbps start 24.4 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 1 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_1ISM_2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_24k4_omasatechs_1ism.bin 48 testv/ltv48_OMASA_1ISM_2TC.wav bit ../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_1ISM_2TC.wav_BINAURAL_sw_48-48.tst -// OMASA 2Dir2TC 1ISM at 13.2 kbps, 48kHz in, 48kHz out, BINAURAL out -../IVAS_cod -ism_masa 1 2 NULL testv/ltv48_MASA2TC.met 13200 48 testv/ltv48_OMASA_1ISM_2TC.wav bit +// OMASA 2TC 1ISM at 13.2 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 1 2 NULL testv/ltv48_OMASA_1ISM_2TC.met 13200 48 testv/ltv48_OMASA_1ISM_2TC.wav bit ../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_1ISM_2TC.wav_BINAURAL_13200_48-48.tst -// OMASA 1Dir2TC 4ISM at br sw techs 13.2 to 512 kbps start 80 kbps, 48kHz in, 48kHz out, BINAURAL out -../IVAS_cod -ism_masa 4 2 NULL testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_MASA2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_80k_omasatechs_4ism.bin 48 testv/ltv48_OMASA_4ISM_2TC.wav bit +// OMASA 2TC 4ISM at br sw techs 13.2 to 512 kbps start 80 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 4 2 NULL testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_OMASA_4ISM_2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_80k_omasatechs_4ism.bin 48 testv/ltv48_OMASA_4ISM_2TC.wav bit ../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_4ISM_2TC.wav_BINAURAL_sw_48-48.tst -// OMASA 1Dir2TC 4ISM at 80 kbps, 48kHz in, 48kHz out, BINAURAL out -../IVAS_cod -ism_masa 4 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_MASA2TC.met 80000 48 testv/ltv48_OMASA_4ISM_2TC.wav bit +// OMASA 2TC 4ISM at 80 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 4 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_OMASA_4ISM_2TC.met 80000 48 testv/ltv48_OMASA_4ISM_2TC.wav bit ../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_4ISM_2TC.wav_BINAURAL_80000_48-48.tst -// OMASA 1Dir2TC 4ISM at 32 kbps, 48kHz in, 48kHz out, BINAURAL out -../IVAS_cod -ism_masa 4 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_MASA2TC.met 32000 48 testv/ltv48_OMASA_4ISM_2TC.wav bit +// OMASA 2TC 4ISM at 32 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 4 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_OMASA_4ISM_2TC.met 32000 48 testv/ltv48_OMASA_4ISM_2TC.wav bit ../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_4ISM_2TC.wav_BINAURAL_32000_48-48.tst -// OMASA 1Dir2TC 3ISM at br sw techs 13.2 to 512 kbps start 24.4 kbps, 32kHz in, 48kHz out, BINAURAL out -../IVAS_cod -ism_masa 3 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_MASA2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_24k4_omasatechs_3ism.bin 32 testv/ltv32_OMASA_3ISM_2TC.wav bit +// OMASA 2TC 3ISM at br sw techs 13.2 to 512 kbps start 24.4 kbps, 32kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 3 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_3ISM_2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_24k4_omasatechs_3ism.bin 32 testv/ltv32_OMASA_3ISM_2TC.wav bit ../IVAS_dec BINAURAL 48 bit testv/ltv32_OMASA_3ISM_2TC.wav_BINAURAL_sw_32-48.tst -// OMASA 1Dir2TC 3ISM at 32 kbps, 48kHz in, 16kHz out, BINAURAL out -../IVAS_cod -ism_masa 3 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_MASA2TC.met 32000 48 testv/ltv48_OMASA_3ISM_2TC.wav bit +// OMASA 2TC 3ISM at 32 kbps, 48kHz in, 16kHz out, BINAURAL out +../IVAS_cod -ism_masa 3 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_3ISM_2TC.met 32000 48 testv/ltv48_OMASA_3ISM_2TC.wav bit ../IVAS_dec BINAURAL 16 bit testv/ltv48_OMASA_3ISM_2TC.wav_BINAURAL_32000_48-16.tst -// OMASA 1Dir2TC 3ISM at 160 kbps, 16kHz in, 32kHz out, BINAURAL out -../IVAS_cod -ism_masa 3 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_MASA2TC.met 160000 16 testv/ltv16_OMASA_3ISM_2TC.wav bit +// OMASA 2TC 3ISM at 160 kbps, 16kHz in, 32kHz out, BINAURAL out +../IVAS_cod -ism_masa 3 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_3ISM_2TC.met 160000 16 testv/ltv16_OMASA_3ISM_2TC.wav bit ../IVAS_dec BINAURAL 32 bit testv/ltv16_OMASA_3ISM_2TC.wav_BINAURAL_160000_16-32.tst -// OMASA 1Dir2TC 2ISM at 256 kbps, 48kHz in, 32kHz out, BINAURAL out -../IVAS_cod -ism_masa 2 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv NULL testv/ltv48_MASA2TC.met 256000 48 testv/ltv48_OMASA_2ISM_2TC.wav bit +// OMASA 2TC 2ISM at 256 kbps, 48kHz in, 32kHz out, BINAURAL out +../IVAS_cod -ism_masa 2 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv NULL testv/ltv48_OMASA_2ISM_2TC.met 256000 48 testv/ltv48_OMASA_2ISM_2TC.wav bit ../IVAS_dec BINAURAL 32 bit testv/ltv48_OMASA_2ISM_2TC.wav_BINAURAL56000_48-32.tst -// OMASA 1Dir2TC 1ISM at 128 kbps, 48kHz in, 48kHz out, BINAURAL out, bandwidth switching -../IVAS_cod -max_band testv/ivas_bws_20fr_start_SWB.txt -ism_masa 1 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_MASA2TC.met 128000 48 testv/ltv48_OMASA_1ISM_2TC.wav bit +// OMASA 2TC 1ISM at 128 kbps, 48kHz in, 48kHz out, BINAURAL out, bandwidth switching +../IVAS_cod -max_band testv/ivas_bws_20fr_start_SWB.txt -ism_masa 1 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_1ISM_2TC.met 128000 48 testv/ltv48_OMASA_1ISM_2TC.wav bit ../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_1ISM_2TC.wav_BINAURAL_128000_48-48.tst -// OMASA 2Dir1TC 4ISM at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL out -../IVAS_cod -ism_masa 4 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_MASA1TC.met 24400 48 testv/ltv48_OMASA_4ISM_1TC.wav bit +// OMASA 1TC 4ISM at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 4 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_OMASA_4ISM_1TC.met 24400 48 testv/ltv48_OMASA_4ISM_1TC.wav bit ../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_4ISM_1TC.wav_BINAURAL4400_48-48.tst -// OMASA 2Dir1TC 3ISM at br sw techs 13.2 to 512 kbps start 48 kbps, 48kHz in, 32kHz out, BINAURAL out -../IVAS_cod -ism_masa 3 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_MASA1TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_48k_omasatechs_3ism.bin 48 testv/ltv48_OMASA_3ISM_1TC.wav bit +// OMASA 1TC 3ISM at br sw techs 13.2 to 512 kbps start 48 kbps, 48kHz in, 32kHz out, BINAURAL out +../IVAS_cod -ism_masa 3 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_3ISM_1TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_48k_omasatechs_3ism.bin 48 testv/ltv48_OMASA_3ISM_1TC.wav bit ../IVAS_dec BINAURAL 32 bit testv/ltv48_OMASA_3ISM_1TC.wav_BINAURAL_sw_48-32.tst -// OMASA 2Dir1TC 3ISM at 96 kbps, 48kHz in, 48kHz out, BINAURAL out -../IVAS_cod -ism_masa 3 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_MASA1TC.met 96000 48 testv/ltv48_OMASA_3ISM_1TC.wav bit +// OMASA 1TC 3ISM at 96 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 3 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_3ISM_1TC.met 96000 48 testv/ltv48_OMASA_3ISM_1TC.wav bit ../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_3ISM_1TC.wav_BINAURAL_96000_48-48.tst -// OMASA 2Dir1TC 3ISM at 24.4 kbps, 48kHz in, 16kHz out, BINAURAL out -../IVAS_cod -ism_masa 3 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_MASA1TC.met 24400 48 testv/ltv48_OMASA_3ISM_1TC.wav bit +// OMASA 1TC 3ISM at 24.4 kbps, 48kHz in, 16kHz out, BINAURAL out +../IVAS_cod -ism_masa 3 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_3ISM_1TC.met 24400 48 testv/ltv48_OMASA_3ISM_1TC.wav bit ../IVAS_dec BINAURAL 16 bit testv/ltv48_OMASA_3ISM_1TC.wav_BINAURAL_24400_48-16.tst -// OMASA 2Dir1TC 1ISM at 512 kbps, 32kHz in, 48kHz out, BINAURAL out -../IVAS_cod -ism_masa 1 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_MASA1TC.met 512000 32 testv/ltv32_OMASA_1ISM_1TC.wav bit +// OMASA 1TC 1ISM at 512 kbps, 32kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 1 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_1ISM_1TC.met 512000 32 testv/ltv32_OMASA_1ISM_1TC.wav bit ../IVAS_dec BINAURAL 48 bit testv/ltv32_OMASA_1ISM_1TC.wav_BINAURAL_512000_32-48.tst -// OMASA 1Dir1TC 4ISM at br sw techs 13.2 to 512 kbps start 32 kbps, 48kHz in, 48kHz out, BINAURAL out -../IVAS_cod -ism_masa 4 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_MASA1TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_32k_omasatechs_4ism.bin 48 testv/ltv48_OMASA_4ISM_1TC.wav bit +// OMASA 1TC 4ISM at br sw techs 13.2 to 512 kbps start 32 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 4 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_OMASA_4ISM_1TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_32k_omasatechs_4ism.bin 48 testv/ltv48_OMASA_4ISM_1TC.wav bit ../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_4ISM_1TC.wav_BINAURAL_sw_48-48.tst -// OMASA 1Dir1TC 4ISM at 48 kbps, 48kHz in, 48kHz out, BINAURAL out -../IVAS_cod -ism_masa 4 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_MASA1TC.met 48000 48 testv/ltv48_OMASA_4ISM_1TC.wav bit +// OMASA 1TC 4ISM at 48 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 4 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_OMASA_4ISM_1TC.met 48000 48 testv/ltv48_OMASA_4ISM_1TC.wav bit ../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_4ISM_1TC.wav_BINAURAL_48000_48-48.tst -// OMASA 1Dir1TC 3ISM at 64 kbps, 32kHz in, 32kHz out, BINAURAL out -../IVAS_cod -ism_masa 3 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_MASA1TC.met 64000 32 testv/ltv32_OMASA_3ISM_1TC.wav bit +// OMASA 1TC 3ISM at 64 kbps, 32kHz in, 32kHz out, BINAURAL out +../IVAS_cod -ism_masa 3 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_3ISM_1TC.met 64000 32 testv/ltv32_OMASA_3ISM_1TC.wav bit ../IVAS_dec BINAURAL 32 bit testv/ltv32_OMASA_3ISM_1TC.wav_BINAURAL_64000_32-32.tst -// OMASA 1Dir1TC 2ISM at 16.4 kbps, 16kHz in, 48kHz out, BINAURAL out -../IVAS_cod -ism_masa 2 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_MASA1TC.met 16400 16 testv/ltv16_OMASA_2ISM_1TC.wav bit +// OMASA 1TC 2ISM at 16.4 kbps, 16kHz in, 48kHz out, BINAURAL out +../IVAS_cod -ism_masa 2 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_2ISM_1TC.met 16400 16 testv/ltv16_OMASA_2ISM_1TC.wav bit ../IVAS_dec BINAURAL 48 bit testv/ltv16_OMASA_2ISM_1TC.wav_BINAURAL_16400_16-48.tst // Multi-channel 7_1_4 bitrate switching from 24.4 kbps to 256 kbps, 48kHz in, 32kHz out, 7_1_4 out @@ -692,167 +692,139 @@ ../IVAS_cod -mc 5_1 128000 48 testv/ltv48_MC51.wav bit ../IVAS_dec 5_1 48 bit testv/ltv48_MC51.wav_MC51_128000_48-48_5_1.tst -// MASA 2dir 2TC bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, EXT out +// MASA 2TC bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/ltv48_MASA2TC.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_sw_48-48_EXT.tst -// MASA 2dir 2TC at 96 kbps, 48kHz in, 48kHz out, EXT out +// MASA 2TC at 96 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 96000 48 testv/ltv48_MASA2TC.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_96000_48-48_EXT.tst -// MASA 2dir 2TC at 64 kbps, 48kHz in, 48kHz out, EXT out -../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 64000 48 testv/ltv48_MASA2TC.wav bit -../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_64000_48-48_EXT.tst - -// MASA 2dir 2TC at 512 kbps, 48kHz in, 48kHz out, EXT out +// MASA 2TC at 512 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 512000 48 testv/ltv48_MASA2TC.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_512000_48-48_EXT.tst -// MASA 2dir 2TC at 48 kbps, 48kHz in, 48kHz out, EXT out, bandwidth switching +// MASA 2TC at 48 kbps, 48kHz in, 48kHz out, EXT out, bandwidth switching ../IVAS_cod -max_band testv/ivas_bws_20fr_start_FB.txt -masa 2 testv/ltv48_MASA2TC.met 48000 48 testv/ltv48_MASA2TC.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_48000_48-48_EXT.tst -// MASA 2dir 2TC at 384 kbps, 48kHz in, 48kHz out, EXT out +// MASA 2TC at 384 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 384000 48 testv/ltv48_MASA2TC.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_384000_48-48_EXTRoom.tst -// MASA 2dir 2TC at 32 kbps, 48kHz in, 48kHz out, EXT out +// MASA 2TC at 32 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 32000 48 testv/ltv48_MASA2TC.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_32000_48-48_EXT.tst -// MASA 2dir 2TC at 256 kbps, 48kHz in, 48kHz out, EXT out +// MASA 2TC at 256 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 256000 48 testv/ltv48_MASA2TC.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_256000_48-48_EXT.tst -// MASA 2dir 2TC at 192 kbps, 48kHz in, 48kHz out, EXT out +// MASA 2TC at 192 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 192000 48 testv/ltv48_MASA2TC.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_192000_48-48_EXT.tst -// MASA 2dir 2TC at 160 kbps, 48kHz in, 48kHz out, EXT out -../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 160000 48 testv/ltv48_MASA2TC.wav bit -../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_160000_48-48_EXT.tst - -// MASA 2dir 2TC at 128 kbps, 48kHz in, 48kHz out, FOA out +// MASA 2TC at 128 kbps, 48kHz in, 48kHz out, FOA out ../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 128000 48 testv/ltv48_MASA2TC.wav bit ../IVAS_dec FOA 48 bit testv/ltv48_MASA2TC.wav_128000_48-48_FOA.tst -// MASA 2dir 1TC at 80 kbps, 48kHz in, 48kHz out, EXT out +// MASA 1TC at 80 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 80000 48 testv/ltv48_MASA1TC.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_MASA1TC.wav_80000_48-48_EXT.tst -// MASA 2dir 1TC at 24.4 kbps, 48kHz in, 32kHz out, EXT out -../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 24400 48 testv/ltv48_MASA1TC.wav bit -../IVAS_dec EXT 32 bit testv/ltv48_MASA1TC.wav_24400_48-32_EXT.tst - -// MASA 2dir 1TC at 128 kbps, 48kHz in, 48kHz out, EXT out +// MASA 1TC at 128 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 128000 48 testv/ltv48_MASA1TC.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_MASA1TC.wav_128000_48-48_EXT.tst -// MASA 1dir 2TC bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, EXT out -../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/ltv48_MASA2TC.wav bit -../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_sw_48-48_EXT.tst - -// MASA 1dir 2TC bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, DTX on, EXT out +// MASA 2TC bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, DTX on, EXT out ../IVAS_cod -dtx -masa 2 testv/ltv48_MASA2TC.met ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/ltv48_MASA2TC.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_sw_48-48_DTX_EXT.tst -// MASA 1dir 2TC at 96 kbps, 48kHz in, 48kHz out, EXT out -../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 96000 48 testv/ltv48_MASA2TC.wav bit -../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_96000_48-48_EXT.tst - -// MASA 1dir 2TC at 80 kbps, 32kHz in, 16kHz out, EXT out +// MASA 2TC at 80 kbps, 32kHz in, 16kHz out, EXT out ../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 80000 32 testv/ltv32_MASA2TC.wav bit ../IVAS_dec EXT 16 bit testv/ltv32_MASA2TC.wav_80000_32-16_EXT.tst -// MASA 1dir 2TC at 64 kbps, 48kHz in, 48kHz out, EXT out +// MASA 2TC at 64 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 64000 48 testv/ltv48_MASA2TC.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_64000_48-48_EXT.tst -// MASA 1dir 2TC at 48 kbps, 48kHz in, 48kHz out, EXT out +// MASA 2TC at 48 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 48000 48 testv/ltv48_MASA2TC.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_48000_48-48_EXT.tst -// MASA 1dir 2TC at 32.0 kbps, 48kHz in, 48kHz out, DTX on, EXT out +// MASA 2TC at 32.0 kbps, 48kHz in, 48kHz out, DTX on, EXT out ../IVAS_cod -dtx -masa 2 testv/ltv48_MASA2TC.met 32000 48 testv/ltv48_MASA2TC.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_32000_48-48_DTX_EXT.tst -// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, EXT out -../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 32000 48 testv/ltv48_MASA2TC.wav bit -../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_32000_48-48_EXTRoom.tst - -// MASA 1dir 2TC at 256 kbps, 48kHz in, 48kHz out, EXT out -../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 256000 48 testv/ltv48_MASA2TC.wav bit -../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_256000_48-48_EXT.tst - -// MASA 1dir 2TC at 24.4 kbps, 48kHz in, 48kHz out, EXT out +// MASA 2TC at 24.4 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 24400 48 testv/ltv48_MASA2TC.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_24400_48-48_EXT.tst -// MASA 1dir 2TC at 160 kbps, 48kHz in, 48kHz out, EXT out +// MASA 2TC at 160 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 160000 48 testv/ltv48_MASA2TC.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_160000_48-48_EXT.tst -// MASA 1dir 2TC at 16.4 kbps, 48kHz in, 48kHz out, DTX on, EXT out +// MASA 2TC at 16.4 kbps, 48kHz in, 48kHz out, DTX on, EXT out ../IVAS_cod -dtx -masa 2 testv/ltv48_MASA2TC.met 16400 48 testv/ltv48_MASA2TC.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_16400_48-48_DTX_EXT.tst -// MASA 1dir 2TC at 16.4 kbps, 48kHz in, 48kHz out, EXT out +// MASA 2TC at 16.4 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 16400 48 testv/ltv48_MASA2TC.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_16400_48-48_EXT.tst -// MASA 1dir 2TC at 16.4 kbps, 16kHz in, 48kHz out, EXT out +// MASA 2TC at 16.4 kbps, 16kHz in, 48kHz out, EXT out ../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 16400 16 testv/ltv16_MASA2TC.wav bit ../IVAS_dec EXT 48 bit testv/ltv16_MASA2TC.wav_16400_16-48_EXT.tst -// MASA 1dir 2TC at 13.2 kbps, 48kHz in, 48kHz out, EXT out, bandwidth switching +// MASA 2TC at 13.2 kbps, 48kHz in, 48kHz out, EXT out, bandwidth switching ../IVAS_cod -max_band testv/ivas_bws_20fr_start_WB.txt -masa 2 testv/ltv48_MASA2TC.met 13200 48 testv/ltv48_MASA2TC.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_13200_48-48_EXT.tst -// MASA 1dir 2TC at 128 kbps, 48kHz in, 48kHz out, DTX on, EXT out +// MASA 2TC at 128 kbps, 48kHz in, 48kHz out, DTX on, EXT out ../IVAS_cod -dtx -masa 2 testv/ltv48_MASA2TC.met 128000 48 testv/ltv48_MASA2TC.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_MASA2TC.wav_128000_48-48_DTX_EXT.tst -// MASA 1dir 1TC bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, EXT out +// MASA 1TC bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/ltv48_MASA1TC.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_MASA1TC.wav_sw_48-48_EXT.tst -// MASA 1dir 1TC at 64 kbps, 48kHz in, 48kHz out, EXT out +// MASA 1TC at 64 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 64000 48 testv/ltv48_MASA1TC.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_MASA1TC.wav_64000_48-48_EXT.tst -// MASA 1dir 1TC at 48 kbps, 48kHz in, 48kHz out, EXT out +// MASA 1TC at 48 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 48000 48 testv/ltv48_MASA1TC.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_MASA1TC.wav_48000_48-48_EXT.tst -// MASA 1dir 1TC at 48 kbps, 32kHz in, 48kHz out, EXT out +// MASA 1TC at 48 kbps, 32kHz in, 48kHz out, EXT out ../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 48000 32 testv/ltv32_MASA1TC.wav bit ../IVAS_dec EXT 48 bit testv/ltv32_MASA1TC.wav_48000_32-48_EXT.tst -// MASA 1dir 1TC at 32 kbps, 48kHz in, 48kHz out, EXT +// MASA 1TC at 32 kbps, 48kHz in, 48kHz out, EXT ../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 32000 48 testv/ltv48_MASA1TC.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_MASA1TC.wav_32000_48-48_EXT.tst -// MASA 1dir 1TC at 256kbps, 48kHz in, 48kHz out, EXT out +// MASA 1TC at 256kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 256000 48 testv/ltv48_MASA1TC.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_MASA1TC.wav_EXT_256000_48-48.tst -// MASA 1dir 1TC at 24.4 kbps, 48kHz in, 48kHz out, DTX on, EXT out +// MASA 1TC at 24.4 kbps, 48kHz in, 48kHz out, DTX on, EXT out ../IVAS_cod -dtx -masa 1 testv/ltv48_MASA1TC.met 24400 48 testv/ltv48_MASA1TC.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_MASA1TC.wav_24400_48-48_DTX_EXT.tst -// MASA 1dir 1TC at 24.4 kbps, 48kHz in, 48kHz out, EXT out +// MASA 1TC at 24.4 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 24400 48 testv/ltv48_MASA1TC.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_MASA1TC.wav_24400_48-48_EXTRoom.tst -// MASA 1dir 1TC at 16.4 kbps, 48kHz in, 48kHz out, EXT out +// MASA 1TC at 16.4 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 16400 48 testv/ltv48_MASA1TC.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_MASA1TC.wav_16400_48-48_EXT.tst -// MASA 1dir 1TC at 13.2 kbps, 48kHz in, 48kHz out, DTX on, EXT out +// MASA 1TC at 13.2 kbps, 48kHz in, 48kHz out, DTX on, EXT out ../IVAS_cod -dtx -masa 1 testv/ltv48_MASA1TC.met 13200 48 testv/ltv48_MASA1TC.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_MASA1TC.wav_13200_48-48_DTX_EXT.tst -// MASA 1dir 1TC at 13.2 kbps, 48kHz in, 48kHz out, EXT out, bandwidth switching +// MASA 1TC at 13.2 kbps, 48kHz in, 48kHz out, EXT out, bandwidth switching ../IVAS_cod -max_band testv/ivas_bws_20fr_start_SWB.txt -masa 1 testv/ltv48_MASA1TC.met 13200 48 testv/ltv48_MASA1TC.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_MASA1TC.wav_13200_48-48_EXT.tst -- GitLab From 6cb48dc11cf3281a3241d16481ed2071a01631fa Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 12 Dec 2024 09:44:49 +0100 Subject: [PATCH 22/36] refactor MR pipeline to basop-ci-branch --- .gitlab-ci.yml | 66 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 24 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 10dd80f26b..f7fcdd8c12 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -432,8 +432,7 @@ branch-is-up-to-date-with-main-post: - echo $commits_behind_count - if [ $commits_behind_count -eq 0 ]; then exit 0; else echo "Your branch is behind main, possibly main changed during your pipeline run, run 'git merge origin/main' to update." exit 1; fi; -# for merges to basop-ci-branch, run the long test suite in reference generation mode to catch problems already here and not only in the BASOP repo -check-compatibility-with-basop-reference-branch: +.basop-ci-branch-compat-template: extends: - .test-job-linux rules: @@ -441,46 +440,65 @@ check-compatibility-with-basop-reference-branch: changes: - tests/**/* - scripts/**/* - - ci/**/* - if: ($CI_PIPELINE_SOURCE == 'web' || $CI_PIPELINE_SOURCE == 'trigger') && $MANUAL_PIPELINE_TYPE == 'check-float-reference' - if: $CI_PIPELINE_SOURCE == 'push' when: never tags: - ivas-linux-fast - script: + before_script: - git clone -b $BASOP_REFERENCE_BRANCH https://forge.3gpp.org/rep/sa4/audio/ivas-basop.git --single-branch - make -j -C ivas-basop - - cp ivas-basop/IVAS_cod ./IVAS_cod_ref - - cp ivas-basop/IVAS_dec ./IVAS_dec_ref - - cp ivas-basop/IVAS_cod ./IVAS_cod # Not used but needed to launch the pytest - - cp ivas-basop/IVAS_dec ./IVAS_dec # Not used but needed to launch the pytest - - python3 ci/remove_unsupported_testcases.py scripts/config/self_test.prm + - python3 ci/remove_unsupported_testcases.py scripts/config/self_test.prm scripts/config/self_test_ltv.prm - python3 tests/create_short_testvectors.py - - python3 -m pytest tests/codec_be_on_mr_nonselection --param_file scripts/config/self_test.prm -v --update_ref 1 --html=report-selftest-full.html --self-contained-html --junit-xml=report-junit-selftest-full.xml || true - - zero_errors=$(cat report-junit-selftest-full.xml | grep -c 'errors="0"') || true - - if [ $zero_errors != 1 ]; then echo "Run errors encountered with scripts/config/self_test.prm !"; exit $EXIT_CODE_FAIL; fi - - - python3 -m pytest tests/codec_be_on_mr_nonselection --param_file scripts/config/self_test_basop_encoder.prm -v --update_ref 1 --html=report-selftest-basop-encoder.html --self-contained-html --junit-xml=report-junit-selftest-basop-encoder.xml || true - - zero_errors=$(cat report-junit-selftest-basop-encoder.xml | grep -c 'errors="0"') || true - - if [ $zero_errors != 1 ]; then echo "Run errors encountered with scripts/config/self_test_basop_encoder.prm !"; exit $EXIT_CODE_FAIL; fi + - python3 -m pytest tests/codec_be_on_mr_nonselection --param_file $PARAM_FILE --update_ref 1 --ref_encoder_path ivas-basop/IVAS_cod --ref_decoder_path ivas-basop/IVAS_dec --html=report.html --self-contained-html --junit-xml=report-junit.xml || true + - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true + - if [ $zero_errors != 1 ]; then echo "Run errors encountered with $PARAM_FILE !"; exit $EXIT_CODE_FAIL; fi - - exit 0 artifacts: - name: "check-float-reference--sha-$CI_COMMIT_SHORT_SHA--results" + name: "$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA--results" when: always expire_in: 1 month paths: - - report-junit-selftest-full.xml - - report-junit-selftest-basop-encoder.xml - - report-selftest-full.html - - report-selftest-basop-encoder.html + - report-junit.xml + - report.html expose_as: "check-float-reference results" reports: junit: - - report-junit-selftest-full.xml - - report-junit-selftest-basop-encoder.xml + - report-junit.xml + +check-compatibility-with-basop-reference-branch-stv: + extends: + - .basop-ci-branch-compat-template + variables: + PARAM_FILE: scripts/config/self_test.prm + script: + - exit 0 + +check-compatibility-with-basop-reference-branch-ltv: + extends: + - .basop-ci-branch-compat-template + variables: + PARAM_FILE: scripts/config/self_test_ltv.prm + script: + - exit 0 + +check-compatibility-with-basop-reference-branch-encoder-stv: + extends: + - .basop-ci-branch-compat-template + variables: + PARAM_FILE: scripts/config/self_test_basop_encoder.prm + script: + - exit 0 + +check-compatibility-with-basop-reference-branch-encoder-ltv: + extends: + - .basop-ci-branch-compat-template + variables: + PARAM_FILE: scripts/config/self_test_ltv_basop_encoder.prm + script: + - exit 0 # --------------------------------------------------------------- # Build jobs -- GitLab From 079ffe4ca15fa5386d2dcbb13d7c9e80097604de Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 12 Dec 2024 10:13:40 +0100 Subject: [PATCH 23/36] add script to check for duplicates in .prm files --- scripts/find_duplicates_in_prm_files.py | 53 +++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 scripts/find_duplicates_in_prm_files.py diff --git a/scripts/find_duplicates_in_prm_files.py b/scripts/find_duplicates_in_prm_files.py new file mode 100644 index 0000000000..e8c5f20432 --- /dev/null +++ b/scripts/find_duplicates_in_prm_files.py @@ -0,0 +1,53 @@ +from collections import Counter +from pathlib import Path +import sys +import pprint + +HERE = Path(__file__).parent +CONFIGS_DIR = HERE.joinpath("config") + +PRM_FILES = [ + CONFIGS_DIR.joinpath("self_test.prm"), + CONFIGS_DIR.joinpath("self_test_ltv.prm"), + CONFIGS_DIR.joinpath("self_test_basop_encoder.prm"), + CONFIGS_DIR.joinpath("self_test_ltv_basop_encoder.prm"), +] + + +def main() -> bool: + duplicates_found = False + for prm_file in PRM_FILES: + with open(prm_file) as f: + contents = f.read() + + # first check if there are complete duplicates (i.e. comment line, encoder cmd and decoder cmd are the same) + blocks = contents.split("\n\n") + blocks = [b for b in blocks if len(b.strip()) > 0] + blocks_counter = Counter(blocks) + blocks_duplicates = [ + b.split("\n")[0] for b in blocks_counter if blocks_counter[b] > 1 + ] + + # also check if there are duplicates in the command names only + lines = contents.split("\n") + commands_lines = [l for l in lines if l.strip().startswith("//")] + commands_counter = Counter(commands_lines) + commands_duplicates = [l for l in commands_counter if commands_counter[l] > 1] + + if len(blocks_duplicates) > 0: + duplicates_found = True + print(f"Duplicate testcases in {prm_file.name} found:") + pprint.pp(blocks_duplicates) + + if len(commands_duplicates) > 0: + duplicates_found = True + print(f"Duplicate command names in {prm_file.name} found:") + pprint.pp(commands_duplicates) + + print() + + return duplicates_found + + +if __name__ == "__main__": + sys.exit(int(main())) -- GitLab From 97833a34ed7715c0306eff48765b2188e43b40f2 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 12 Dec 2024 10:18:37 +0100 Subject: [PATCH 24/36] add validation job to check for duplicates in all .prm files --- .gitlab-ci.yml | 10 ++++++++++ {scripts => ci}/find_duplicates_in_prm_files.py | 0 2 files changed, 10 insertions(+) rename {scripts => ci}/find_duplicates_in_prm_files.py (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f7fcdd8c12..1040a34a68 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -421,6 +421,16 @@ check-self-test-names-pre: script: - python3 ci/check_self_test_names.py scripts/config/self_test.prm 135 +check-no-duplicates-in-self-tests: + extends: + - .rules-merge-request + stage: prevalidate + needs: [] + tags: + - ivas-linux + script: + -python3 ci/find_duplicates_in_prm_files.py + branch-is-up-to-date-with-main-post: extends: - .rules-merge-request diff --git a/scripts/find_duplicates_in_prm_files.py b/ci/find_duplicates_in_prm_files.py similarity index 100% rename from scripts/find_duplicates_in_prm_files.py rename to ci/find_duplicates_in_prm_files.py -- GitLab From 6f6cb4516f876688c09023f0257092a624ca5336 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 12 Dec 2024 10:22:40 +0100 Subject: [PATCH 25/36] fix script and change check for basop_encoder prm files --- ci/find_duplicates_in_prm_files.py | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/ci/find_duplicates_in_prm_files.py b/ci/find_duplicates_in_prm_files.py index e8c5f20432..2249676600 100644 --- a/ci/find_duplicates_in_prm_files.py +++ b/ci/find_duplicates_in_prm_files.py @@ -4,7 +4,7 @@ import sys import pprint HERE = Path(__file__).parent -CONFIGS_DIR = HERE.joinpath("config") +CONFIGS_DIR = HERE.parent.joinpath("scripts/config") PRM_FILES = [ CONFIGS_DIR.joinpath("self_test.prm"), @@ -21,12 +21,19 @@ def main() -> bool: contents = f.read() # first check if there are complete duplicates (i.e. comment line, encoder cmd and decoder cmd are the same) - blocks = contents.split("\n\n") - blocks = [b for b in blocks if len(b.strip()) > 0] - blocks_counter = Counter(blocks) - blocks_duplicates = [ - b.split("\n")[0] for b in blocks_counter if blocks_counter[b] > 1 - ] + # for "basop_encoder" files, we only need to check for encoder command duplicates + if "basop_encoder" in prm_file.name: + lines = contents.split("\n") + encoder_lines = [l for l in lines if "IVAS_cod" in l] + encoder_counter = Counter(encoder_lines) + testcase_duplicates = [l for l in encoder_counter if encoder_counter[l] > 1] + else: + blocks = contents.split("\n\n") + blocks = [b for b in blocks if len(b.strip()) > 0] + blocks_counter = Counter(blocks) + testcase_duplicates = [ + b.split("\n")[0] for b in blocks_counter if blocks_counter[b] > 1 + ] # also check if there are duplicates in the command names only lines = contents.split("\n") @@ -34,10 +41,10 @@ def main() -> bool: commands_counter = Counter(commands_lines) commands_duplicates = [l for l in commands_counter if commands_counter[l] > 1] - if len(blocks_duplicates) > 0: + if len(testcase_duplicates) > 0: duplicates_found = True print(f"Duplicate testcases in {prm_file.name} found:") - pprint.pp(blocks_duplicates) + pprint.pp(testcase_duplicates) if len(commands_duplicates) > 0: duplicates_found = True -- GitLab From 779f5990dc72c7a7eeba2c439a35d23859bceeb4 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 12 Dec 2024 10:43:32 +0100 Subject: [PATCH 26/36] fix typo --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1040a34a68..23ffb28b63 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -429,7 +429,7 @@ check-no-duplicates-in-self-tests: tags: - ivas-linux script: - -python3 ci/find_duplicates_in_prm_files.py + - python3 ci/find_duplicates_in_prm_files.py branch-is-up-to-date-with-main-post: extends: -- GitLab From 0a423b807bf3bfbd8ac45005da1ce3116ae20914 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 12 Dec 2024 10:54:06 +0100 Subject: [PATCH 27/36] remove duplicates from .prm files --- scripts/config/self_test.prm | 20 ++++---------------- scripts/config/self_test_ltv.prm | 29 ++++------------------------- 2 files changed, 8 insertions(+), 41 deletions(-) diff --git a/scripts/config/self_test.prm b/scripts/config/self_test.prm index 26197f434d..ca4ee1880f 100644 --- a/scripts/config/self_test.prm +++ b/scripts/config/self_test.prm @@ -294,12 +294,12 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 ../IVAS_dec STEREO 32 bit testv/stvST32c.wav_stereo_sw_32-32.tst // stereo bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, DTX on, MONO out -//../IVAS_cod -dtx -stereo ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/stvST48n.wav bit -//../IVAS_dec MONO 48 bit testv/stvST48n.wav_stereo_sw_48-48_DTX_MONO.tst +../IVAS_cod -dtx -stereo ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/stvST48n.wav bit +../IVAS_dec MONO 48 bit testv/stvST48n.wav_stereo_sw_48-48_DTX_MONO.tst // stereo bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, DTX on, EXT out -//../IVAS_cod -dtx -stereo ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/stvST48c.wav bit -//../IVAS_dec EXT 48 bit testv/stvST48c.wav_stereo_sw_48-48_DTX_EXT.tst +../IVAS_cod -dtx -stereo ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/stvST48c.wav bit +../IVAS_dec EXT 48 bit testv/stvST48c.wav_stereo_sw_48-48_DTX_EXT.tst // 1 ISM with metadata at 13.2 kbps, 48 kHz in, 48 kHz out, EXT out @@ -664,10 +664,6 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 ../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit ../IVAS_dec BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.wav_SBA_48000_32-32_BinauralRoom.tst -// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out -../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit -../IVAS_dec BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.wav_SBA_48000_32-32_BinauralRoom_Subframe.tst - // SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, HR ../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit ../IVAS_dec -t testv/headrot.csv BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.wav_SBA_48000_32-32_BinauralRoom_Headrot.tst @@ -966,10 +962,6 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 ../IVAS_cod -masa 1 testv/stv1MASA1TC48c.met 24400 48 testv/stv1MASA1TC48c.wav bit ../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/stv1MASA1TC48c.wav_24400_48-48_BinauralRoom.tst -// MASA 1dir 1TC at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out -../IVAS_cod -masa 1 testv/stv1MASA1TC48c.met 24400 48 testv/stv1MASA1TC48c.wav bit -../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/stv1MASA1TC48c.wav_24400_48-48_BinauralRoom_Subframe.tst - // MASA 1dir 1TC at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, HR ../IVAS_cod -masa 1 testv/stv1MASA1TC48c.met 24400 48 testv/stv1MASA1TC48c.wav bit ../IVAS_dec -t testv/headrot.csv BINAURAL_ROOM_IR 48 bit testv/stv1MASA1TC48c.wav_24400_48-48_BinauralRoom_Headrot.tst @@ -1201,10 +1193,6 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 ../IVAS_cod -masa 2 testv/stv1MASA2TC48n.met ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stv1MASA2TC48n.wav bit ../IVAS_dec 7_1 48 bit testv/stv1MASA2TC48n.wav_sw_48-48_7_1.tst -// MASA 1dir 2TC bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, MONO out -../IVAS_cod -masa 2 testv/stv1MASA2TC48n.met ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stv1MASA2TC48n.wav bit -../IVAS_dec MONO 48 bit testv/stv1MASA2TC48n.wav_sw_48-48_MONO.tst - // MASA 2dir 2TC bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, 7_1 out ../IVAS_cod -masa 2 testv/stv2MASA2TC48c.met ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stv2MASA2TC48c.wav bit ../IVAS_dec 7_1 48 bit testv/stv2MASA2TC48c.wav_sw_48-48_7_1.tst diff --git a/scripts/config/self_test_ltv.prm b/scripts/config/self_test_ltv.prm index fce8ba29d4..9b4df02363 100644 --- a/scripts/config/self_test_ltv.prm +++ b/scripts/config/self_test_ltv.prm @@ -293,12 +293,12 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 ../IVAS_dec STEREO 32 bit testv/ltv32_STEREO.wav_stereo_sw_32-32.tst // stereo bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, DTX on, MONO out -//../IVAS_cod -dtx -stereo ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/ltv48_STEREO.wav bit -//../IVAS_dec MONO 48 bit testv/ltv48_STEREO.wav_stereo_sw_48-48_DTX_MONO.tst +../IVAS_cod -dtx -stereo ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/ltv48_STEREO.wav bit +../IVAS_dec MONO 48 bit testv/ltv48_STEREO.wav_stereo_sw_48-48_DTX_MONO.tst // stereo bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, DTX on, EXT out -//../IVAS_cod -dtx -stereo ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/ltv48_STEREO.wav bit -//../IVAS_dec EXT 48 bit testv/ltv48_STEREO.wav_stereo_sw_48-48_DTX_EXT.tst +../IVAS_cod -dtx -stereo ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/ltv48_STEREO.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_STEREO.wav_stereo_sw_48-48_DTX_EXT.tst // 1 ISM with metadata at 13.2 kbps, 48 kHz in, 48 kHz out, EXT out @@ -662,10 +662,6 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 ../IVAS_cod -sba 3 48000 32 testv/ltv32_HOA3.wav bit ../IVAS_dec BINAURAL_ROOM_IR 32 bit testv/ltv32_HOA3.wav_SBA_48000_32-32_BinauralRoom.tst -// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out -../IVAS_cod -sba 3 48000 32 testv/ltv32_HOA3.wav bit -../IVAS_dec BINAURAL_ROOM_IR 32 bit testv/ltv32_HOA3.wav_SBA_48000_32-32_BinauralRoom_Subframe.tst - // SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, HR ../IVAS_cod -sba 3 48000 32 testv/ltv32_HOA3.wav bit ../IVAS_dec -t testv/headrot.csv BINAURAL_ROOM_IR 32 bit testv/ltv32_HOA3.wav_SBA_48000_32-32_BinauralRoom_Headrot.tst @@ -963,10 +959,6 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 ../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 24400 48 testv/ltv48_MASA1TC.wav bit ../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/ltv48_MASA1TC.wav_24400_48-48_BinauralRoom.tst -// MASA 1TC at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out -../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 24400 48 testv/ltv48_MASA1TC.wav bit -../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/ltv48_MASA1TC.wav_24400_48-48_BinauralRoom_Subframe.tst - // MASA 1TC at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, HR ../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 24400 48 testv/ltv48_MASA1TC.wav bit ../IVAS_dec -t testv/headrot.csv BINAURAL_ROOM_IR 48 bit testv/ltv48_MASA1TC.wav_24400_48-48_BinauralRoom_Headrot.tst @@ -1206,14 +1198,6 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 ../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/ltv48_MASA2TC.wav bit ../IVAS_dec 7_1 48 bit testv/ltv48_MASA2TC.wav_sw_48-48_7_1.tst -// MASA 2TC bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, MONO out -../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/ltv48_MASA2TC.wav bit -../IVAS_dec MONO 48 bit testv/ltv48_MASA2TC.wav_sw_48-48_MONO.tst - -// MASA 2TC bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, 7_1 out -../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/ltv48_MASA2TC.wav bit -../IVAS_dec 7_1 48 bit testv/ltv48_MASA2TC.wav_sw_48-48_7_1.tst - // MASA 1TC at 256kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out default configuration ../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 256000 48 testv/ltv48_MASA1TC.wav bit ../IVAS_dec BINAURAL_ROOM_REVERB 48 bit testv/ltv48_MASA1TC.wav_BINAURAL_ROOM_REVERB_256000_48-48.tst @@ -1632,11 +1616,6 @@ networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit netsimoutput tracefile_sim 2 0 ../IVAS_dec -Tracefile tracefile_dec -VOIP MONO 32 netsimoutput testv/ltv48_MASA2TC.wav_sw_48-32_MONO_JBM5.tst -// MASA 2TC bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 16kHz out, BINAURAL out, JBM Prof 5 -../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/ltv48_MASA2TC.wav bit -networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit netsimoutput tracefile_sim 2 0 -../IVAS_dec -Tracefile tracefile_dec -VOIP BINAURAL 16 netsimoutput testv/ltv48_MASA2TC.wav_sw_48-16_BINAURAL_JBM5.tst - // MASA 2TC bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, EXT out, JBM Prof 5 ../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/ltv48_MASA2TC.wav bit networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit netsimoutput tracefile_sim 2 0 -- GitLab From 2fda226d5ae601b930dc369ee23b4e52941ff247 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 12 Dec 2024 10:55:15 +0100 Subject: [PATCH 28/36] avoid recognizing commented command lines as testcase names --- ci/find_duplicates_in_prm_files.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ci/find_duplicates_in_prm_files.py b/ci/find_duplicates_in_prm_files.py index 2249676600..c45541073d 100644 --- a/ci/find_duplicates_in_prm_files.py +++ b/ci/find_duplicates_in_prm_files.py @@ -37,7 +37,13 @@ def main() -> bool: # also check if there are duplicates in the command names only lines = contents.split("\n") - commands_lines = [l for l in lines if l.strip().startswith("//")] + commands_lines = [ + l + for l in lines + if l.strip().startswith("//") + and "IVAS_cod" not in l + and "IVAS_dec" not in l + ] commands_counter = Counter(commands_lines) commands_duplicates = [l for l in commands_counter if commands_counter[l] > 1] -- GitLab From 81cce97e6689765c77eb4a1a18aaa21b877a7e07 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 12 Dec 2024 12:44:39 +0100 Subject: [PATCH 29/36] fix 2TC -> 1TC in OMASA ISM MD files for 1TC cases --- scripts/config/self_test_ltv_basop_encoder.prm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/config/self_test_ltv_basop_encoder.prm b/scripts/config/self_test_ltv_basop_encoder.prm index a5ec413fbc..51ac395196 100644 --- a/scripts/config/self_test_ltv_basop_encoder.prm +++ b/scripts/config/self_test_ltv_basop_encoder.prm @@ -525,39 +525,39 @@ ../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_1ISM_2TC.wav_BINAURAL_128000_48-48.tst // OMASA 1TC 4ISM at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL out -../IVAS_cod -ism_masa 4 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_OMASA_4ISM_1TC.met 24400 48 testv/ltv48_OMASA_4ISM_1TC.wav bit +../IVAS_cod -ism_masa 4 1 testv/ltv48_OMASA_1ISM_1TC_ISM1.csv testv/ltv48_OMASA_2ISM_1TC_ISM2.csv testv/ltv48_OMASA_3ISM_1TC_ISM3.csv testv/ltv48_OMASA_4ISM_1TC_ISM4.csv testv/ltv48_OMASA_4ISM_1TC.met 24400 48 testv/ltv48_OMASA_4ISM_1TC.wav bit ../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_4ISM_1TC.wav_BINAURAL4400_48-48.tst // OMASA 1TC 3ISM at br sw techs 13.2 to 512 kbps start 48 kbps, 48kHz in, 32kHz out, BINAURAL out -../IVAS_cod -ism_masa 3 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_3ISM_1TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_48k_omasatechs_3ism.bin 48 testv/ltv48_OMASA_3ISM_1TC.wav bit +../IVAS_cod -ism_masa 3 1 testv/ltv48_OMASA_1ISM_1TC_ISM1.csv testv/ltv48_OMASA_2ISM_1TC_ISM2.csv testv/ltv48_OMASA_3ISM_1TC_ISM3.csv testv/ltv48_OMASA_3ISM_1TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_48k_omasatechs_3ism.bin 48 testv/ltv48_OMASA_3ISM_1TC.wav bit ../IVAS_dec BINAURAL 32 bit testv/ltv48_OMASA_3ISM_1TC.wav_BINAURAL_sw_48-32.tst // OMASA 1TC 3ISM at 96 kbps, 48kHz in, 48kHz out, BINAURAL out -../IVAS_cod -ism_masa 3 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_3ISM_1TC.met 96000 48 testv/ltv48_OMASA_3ISM_1TC.wav bit +../IVAS_cod -ism_masa 3 1 testv/ltv48_OMASA_1ISM_1TC_ISM1.csv testv/ltv48_OMASA_2ISM_1TC_ISM2.csv testv/ltv48_OMASA_3ISM_1TC_ISM3.csv testv/ltv48_OMASA_3ISM_1TC.met 96000 48 testv/ltv48_OMASA_3ISM_1TC.wav bit ../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_3ISM_1TC.wav_BINAURAL_96000_48-48.tst // OMASA 1TC 3ISM at 24.4 kbps, 48kHz in, 16kHz out, BINAURAL out -../IVAS_cod -ism_masa 3 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_3ISM_1TC.met 24400 48 testv/ltv48_OMASA_3ISM_1TC.wav bit +../IVAS_cod -ism_masa 3 1 testv/ltv48_OMASA_1ISM_1TC_ISM1.csv testv/ltv48_OMASA_2ISM_1TC_ISM2.csv testv/ltv48_OMASA_3ISM_1TC_ISM3.csv testv/ltv48_OMASA_3ISM_1TC.met 24400 48 testv/ltv48_OMASA_3ISM_1TC.wav bit ../IVAS_dec BINAURAL 16 bit testv/ltv48_OMASA_3ISM_1TC.wav_BINAURAL_24400_48-16.tst // OMASA 1TC 1ISM at 512 kbps, 32kHz in, 48kHz out, BINAURAL out -../IVAS_cod -ism_masa 1 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_1ISM_1TC.met 512000 32 testv/ltv32_OMASA_1ISM_1TC.wav bit +../IVAS_cod -ism_masa 1 1 testv/ltv48_OMASA_1ISM_1TC_ISM1.csv testv/ltv48_OMASA_1ISM_1TC.met 512000 32 testv/ltv32_OMASA_1ISM_1TC.wav bit ../IVAS_dec BINAURAL 48 bit testv/ltv32_OMASA_1ISM_1TC.wav_BINAURAL_512000_32-48.tst // OMASA 1TC 4ISM at br sw techs 13.2 to 512 kbps start 32 kbps, 48kHz in, 48kHz out, BINAURAL out -../IVAS_cod -ism_masa 4 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_OMASA_4ISM_1TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_32k_omasatechs_4ism.bin 48 testv/ltv48_OMASA_4ISM_1TC.wav bit +../IVAS_cod -ism_masa 4 1 testv/ltv48_OMASA_1ISM_1TC_ISM1.csv testv/ltv48_OMASA_2ISM_1TC_ISM2.csv testv/ltv48_OMASA_3ISM_1TC_ISM3.csv testv/ltv48_OMASA_4ISM_1TC_ISM4.csv testv/ltv48_OMASA_4ISM_1TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_32k_omasatechs_4ism.bin 48 testv/ltv48_OMASA_4ISM_1TC.wav bit ../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_4ISM_1TC.wav_BINAURAL_sw_48-48.tst // OMASA 1TC 4ISM at 48 kbps, 48kHz in, 48kHz out, BINAURAL out -../IVAS_cod -ism_masa 4 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_OMASA_4ISM_1TC.met 48000 48 testv/ltv48_OMASA_4ISM_1TC.wav bit +../IVAS_cod -ism_masa 4 1 testv/ltv48_OMASA_1ISM_1TC_ISM1.csv testv/ltv48_OMASA_2ISM_1TC_ISM2.csv testv/ltv48_OMASA_3ISM_1TC_ISM3.csv testv/ltv48_OMASA_4ISM_1TC_ISM4.csv testv/ltv48_OMASA_4ISM_1TC.met 48000 48 testv/ltv48_OMASA_4ISM_1TC.wav bit ../IVAS_dec BINAURAL 48 bit testv/ltv48_OMASA_4ISM_1TC.wav_BINAURAL_48000_48-48.tst // OMASA 1TC 3ISM at 64 kbps, 32kHz in, 32kHz out, BINAURAL out -../IVAS_cod -ism_masa 3 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_3ISM_1TC.met 64000 32 testv/ltv32_OMASA_3ISM_1TC.wav bit +../IVAS_cod -ism_masa 3 1 testv/ltv48_OMASA_1ISM_1TC_ISM1.csv testv/ltv48_OMASA_2ISM_1TC_ISM2.csv testv/ltv48_OMASA_3ISM_1TC_ISM3.csv testv/ltv48_OMASA_3ISM_1TC.met 64000 32 testv/ltv32_OMASA_3ISM_1TC.wav bit ../IVAS_dec BINAURAL 32 bit testv/ltv32_OMASA_3ISM_1TC.wav_BINAURAL_64000_32-32.tst // OMASA 1TC 2ISM at 16.4 kbps, 16kHz in, 48kHz out, BINAURAL out -../IVAS_cod -ism_masa 2 1 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_2ISM_1TC.met 16400 16 testv/ltv16_OMASA_2ISM_1TC.wav bit +../IVAS_cod -ism_masa 2 1 testv/ltv48_OMASA_1ISM_1TC_ISM1.csv testv/ltv48_OMASA_2ISM_1TC_ISM2.csv testv/ltv48_OMASA_2ISM_1TC.met 16400 16 testv/ltv16_OMASA_2ISM_1TC.wav bit ../IVAS_dec BINAURAL 48 bit testv/ltv16_OMASA_2ISM_1TC.wav_BINAURAL_16400_16-48.tst // Multi-channel 7_1_4 bitrate switching from 24.4 kbps to 256 kbps, 48kHz in, 32kHz out, 7_1_4 out -- GitLab From 2caf4ec69e84ef7f7d30b111e673a67ed901a7a5 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 12 Dec 2024 15:42:46 +0100 Subject: [PATCH 30/36] run removal of unsupported cases on the respective parameter file only --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 23ffb28b63..cf56a5baa0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -458,7 +458,7 @@ branch-is-up-to-date-with-main-post: before_script: - git clone -b $BASOP_REFERENCE_BRANCH https://forge.3gpp.org/rep/sa4/audio/ivas-basop.git --single-branch - make -j -C ivas-basop - - python3 ci/remove_unsupported_testcases.py scripts/config/self_test.prm scripts/config/self_test_ltv.prm + - python3 ci/remove_unsupported_testcases.py $PARAM_FILE - python3 tests/create_short_testvectors.py - python3 -m pytest tests/codec_be_on_mr_nonselection --param_file $PARAM_FILE --update_ref 1 --ref_encoder_path ivas-basop/IVAS_cod --ref_decoder_path ivas-basop/IVAS_dec --html=report.html --self-contained-html --junit-xml=report-junit.xml || true -- GitLab From 9f4f151f5684d49669e262650d5d08d92ca79184 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 13 Dec 2024 09:23:47 +0100 Subject: [PATCH 31/36] fix some filenames and output formats --- scripts/config/self_test_basop_encoder.prm | 26 ++++++++--------- .../config/self_test_ltv_basop_encoder.prm | 28 +++++++++---------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/scripts/config/self_test_basop_encoder.prm b/scripts/config/self_test_basop_encoder.prm index 0bf6f800ab..7169e41fdc 100644 --- a/scripts/config/self_test_basop_encoder.prm +++ b/scripts/config/self_test_basop_encoder.prm @@ -390,11 +390,11 @@ // OSBA 3OA 2ISM at 256 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -ism_sba 2 3 testv/stvISM1.csv testv/stvISM2.csv 256000 48 testv/stvOSBA_2ISM_3OA48c.wav bit -../IVAS_dec EXT 48 bit testv/stvOSBA_2ISM_3OA48c.wav_EXT56000_48-48.tst +../IVAS_dec EXT 48 bit testv/stvOSBA_2ISM_3OA48c.wav_EXT_256000_48-48.tst -// OSBA 3OA 2ISM at 256 kbps, 32kHz in, 32kHz out, HOA2 out +// OSBA 3OA 2ISM at 256 kbps, 32kHz in, 32kHz out, EXT out ../IVAS_cod -ism_sba 2 3 testv/stvISM1.csv testv/stvISM2.csv 256000 32 testv/stvOSBA_2ISM_3OA32c.wav bit -../IVAS_dec HOA2 32 bit testv/stvOSBA_2ISM_3OA32c.wav_HOA2_256000_32-32.tst +../IVAS_dec EXT 32 bit testv/stvOSBA_2ISM_3OA32c.wav_EXT_256000_32-32.tst // OSBA 3OA 1ISM at 512 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -ism_sba 1 3 testv/stvISM1.csv 512000 48 testv/stvOSBA_1ISM_3OA48c.wav bit @@ -428,9 +428,9 @@ ../IVAS_cod -ism_sba 2 2 testv/stvISM1.csv testv/stvISM2.csv 48000 48 testv/stvOSBA_2ISM_2OA48c.wav bit ../IVAS_dec EXT 48 bit testv/stvOSBA_2ISM_2OA48c.wav_EXT_48000_48-48.tst -// OSBA 2OA 1ISM at 24.4 kbps, 48kHz in, 48kHz out, HOA2 out +// OSBA 2OA 1ISM at 24.4 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -ism_sba 1 2 testv/stvISM1.csv 24400 48 testv/stvOSBA_1ISM_2OA48c.wav bit -../IVAS_dec HOA2 48 bit testv/stvOSBA_1ISM_2OA48c.wav_HOA2_24400_48-48.tst +../IVAS_dec EXT 48 bit testv/stvOSBA_1ISM_2OA48c.wav_EXT_24400_48-48.tst // OMASA 2Dir2TC 4ISM at br sw techs 13.2 to 512 kbps start 384 kbps, 48kHz in, 48kHz out, BINAURAL out ../IVAS_cod -ism_masa 4 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv2MASA2TC48c.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_384k_omasatechs_4ism.bin 48 testv/stvOMASA_4ISM_2MASA2TC48c.wav bit @@ -882,9 +882,9 @@ // 4 ISM with metadata at 64 kbps, 48 kHz in, 48 kHz out, EXT out ../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 64000 48 testv/stv4ISM48s.wav bit -../IVAS_dec EXT 48 bit testv/stv4ISM48s.wav_64000_48-48_EXT_room.tst +../IVAS_dec EXT 48 bit testv/stv4ISM48s.wav_64000_48-48_EXT.tst -// 4 ISM with metadata at 512 kbps, 48 kHz in, 48 kHz out, EXT +// 4 ISM with metadata at 512 kbps, 48 kHz in, 48 kHz out, EXT out ../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 512000 48 testv/stv4ISM48s.wav bit ../IVAS_dec EXT 48 bit testv/stv4ISM48s.wav_512000_48-48_EXT.tst @@ -942,7 +942,7 @@ // 3 ISM with metadata at 192 kbps, 48 kHz in, 48 kHz out, EXT out ../IVAS_cod -ism 3 testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 192000 48 testv/stv3ISM48s.wav bit -../IVAS_dec EXT 48 bit testv/stv3ISM48s.wav_192000_48-48_EXTfile.tst +../IVAS_dec EXT 48 bit testv/stv3ISM48s.wav_192000_48-48_EXT.tst // 3 ISM with metadata at 128 kbps, 48 kHz in, 32 kHz out, EXT out ../IVAS_cod -ism 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 128000 48 testv/stv3ISM48s.wav bit @@ -954,7 +954,7 @@ // 2 ISM with metadata at 64 kbps, 48 kHz in, 48 kHz out, EXT out ../IVAS_cod -ism 2 testv/stvISM3.csv testv/stvISM4.csv 64000 48 testv/stv2ISM48s.wav bit -../IVAS_dec EXT 48 bit testv/stv2ISM48s.wav_64000_48-48_EXT_room.tst +../IVAS_dec EXT 48 bit testv/stv2ISM48s.wav_64000_48-48_EXT.tst // 2 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, EXT out ../IVAS_cod -ism 2 testv/stvISM3.csv testv/stvISM4.csv 48000 48 testv/stv2ISM48s.wav bit @@ -974,7 +974,7 @@ // 2 ISM with metadata at 128 kbps, 48 kHz in, 32 kHz out, EXT out ../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 128000 48 testv/stv2ISM48s.wav bit -../IVAS_dec EXT 32 bit testv/stv2ISM48s.wav_128000_48-32_EXT_file_TDHR.tst +../IVAS_dec EXT 32 bit testv/stv2ISM48s.wav_128000_48-32_EXT.tst // 1 ISM with metadata bitrate switching from 13.2 kbps to 128 kbps, 32 kHz in, 32 kHz out, EXT out, DTX on ../IVAS_cod -dtx -ism 1 testv/stvISM1.csv ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 32 testv/stv32c.wav bit @@ -986,11 +986,11 @@ // 1 ISM with metadata at 80 kbps, 48 kHz in, 16 kHz out, EXT out ../IVAS_cod -ism 1 testv/stvISM1.csv 80000 48 testv/stv1ISM48s.wav bit -../IVAS_dec EXT 16 bit testv/stv1ISM48s.wav_80000_48-16_EXT_file_TDHR.tst +../IVAS_dec EXT 16 bit testv/stv1ISM48s.wav_80000_48-16_EXT.tst // 1 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, EXT out, HR ../IVAS_cod -ism 1 testv/stvISM1.csv 48000 48 testv/stv1ISM48s.wav bit -../IVAS_dec EXT 48 bit testv/stv1ISM48s.wav_64000_48-48_EXT_room_HR.tst +../IVAS_dec EXT 48 bit testv/stv1ISM48s.wav_64000_48-48_EXT.tst // 1 ISM with metadata at 32 kbps, 32 kHz in, 32 kHz out, DTX on, EXT out ../IVAS_cod -dtx -ism 1 testv/stvISM1.csv 32000 32 testv/stv32n.wav bit @@ -998,7 +998,7 @@ // 1 ISM with metadata at 16.4 kbps, 48 kHz in, 48 kHz out, EXT out, bandwidth switching ../IVAS_cod -max_band testv/ivas_bws_20fr_start_WB.txt -ism 1 testv/stvISM1.csv 16400 48 testv/stv1ISM48s.wav bit -../IVAS_dec EXT 48 bit testv/stv1ISM48s.wav_16400_48-48_EXT_room.tst +../IVAS_dec EXT 48 bit testv/stv1ISM48s.wav_16400_48-48_EXT.tst // 1 ISM with metadata at 13.2 kbps, 48 kHz in, 48 kHz out, EXT out ../IVAS_cod -ism 1 testv/stvISM1.csv 13200 48 testv/stv1ISM48s.wav bit diff --git a/scripts/config/self_test_ltv_basop_encoder.prm b/scripts/config/self_test_ltv_basop_encoder.prm index 51ac395196..66f96903d2 100644 --- a/scripts/config/self_test_ltv_basop_encoder.prm +++ b/scripts/config/self_test_ltv_basop_encoder.prm @@ -337,7 +337,7 @@ // OSBA FOA 4ISM at 256 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -ism_sba 4 1 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv testv/ltv48_OSBA_4ISM_HOA3_ISM4.csv 256000 48 testv/ltv48_OSBA_4ISM_FOA.wav bit -../IVAS_dec EXT 48 bit testv/ltv48_OSBA_4ISM_FOA.wav_EXT56000_48-48.tst +../IVAS_dec EXT 48 bit testv/ltv48_OSBA_4ISM_FOA.wav_EXT_256000_48-48.tst // OSBA FOA 3ISM at 128 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -ism_sba 3 1 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv 128000 48 testv/ltv48_OSBA_3ISM_FOA.wav bit @@ -392,9 +392,9 @@ ../IVAS_cod -ism_sba 2 3 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv 256000 48 testv/ltv48_OSBA_2ISM_HOA3.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_OSBA_2ISM_HOA3.wav_EXT56000_48-48.tst -// OSBA 3OA 2ISM at 256 kbps, 32kHz in, 32kHz out, HOA2 out +// OSBA 3OA 2ISM at 256 kbps, 32kHz in, 32kHz out, EXT out ../IVAS_cod -ism_sba 2 3 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv 256000 32 testv/ltv32_OSBA_2ISM_HOA3.wav bit -../IVAS_dec HOA2 32 bit testv/ltv32_OSBA_2ISM_HOA3.wav_HOA2_256000_32-32.tst +../IVAS_dec EXT 32 bit testv/ltv32_OSBA_2ISM_HOA3.wav_EXT_256000_32-32.tst // OSBA 3OA 1ISM at 512 kbps, 48kHz in, 48kHz out, EXT out ../IVAS_cod -ism_sba 1 3 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv 512000 48 testv/ltv48_OSBA_1ISM_HOA3.wav bit @@ -428,9 +428,9 @@ ../IVAS_cod -ism_sba 2 2 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv 48000 48 testv/ltv48_OSBA_2ISM_HOA2.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_OSBA_2ISM_HOA2.wav_EXT_48000_48-48.tst -// OSBA 2OA 1ISM at 24.4 kbps, 48kHz in, 48kHz out, HOA2 out -../IVAS_cod -ism_sba 1 2 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv 24400 48 testv/ltv48_OSBA_1ISM_HOA2.wav bit -../IVAS_dec HOA2 48 bit testv/ltv48_OSBA_1ISM_HOA2.wav_HOA2_24400_48-48.tst +// OSBA 2OA 1ISM at 24.4 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 1 2 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv 24400 48 testv/ltv48_OSBA_1ISM_EXT.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_OSBA_1ISM_EXT.wav_EXT_24400_48-48.tst // OMASA 2TC 4ISM at br sw techs 13.2 to 512 kbps start 384 kbps, 48kHz in, 48kHz out, BINAURAL out ../IVAS_cod -ism_masa 4 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_OMASA_4ISM_2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_384k_omasatechs_4ism.bin 48 testv/ltv48_OMASA_4ISM_2TC.wav bit @@ -844,7 +844,7 @@ ../IVAS_cod -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/ltv48_4ISM.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_4ISM.wav_brate_sw_48-48_EXT.tst -// 4 ISM with metadata at 96 kbps, 48 kHz in, 48 kHz out +// 4 ISM with metadata at 96 kbps, 48 kHz in, 48 kHz out, EXT out ../IVAS_cod -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 96000 48 testv/ltv48_4ISM.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_4ISM.wav_96000_48-48_EXT.tst @@ -854,9 +854,9 @@ // 4 ISM with metadata at 64 kbps, 48 kHz in, 48 kHz out, EXT out ../IVAS_cod -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 64000 48 testv/ltv48_4ISM.wav bit -../IVAS_dec EXT 48 bit testv/ltv48_4ISM.wav_64000_48-48_EXT_room.tst +../IVAS_dec EXT 48 bit testv/ltv48_4ISM.wav_64000_48-48_EXT.tst -// 4 ISM with metadata at 512 kbps, 48 kHz in, 48 kHz out, EXT +// 4 ISM with metadata at 512 kbps, 48 kHz in, 48 kHz out, EXT out ../IVAS_cod -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 512000 48 testv/ltv48_4ISM.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_4ISM.wav_512000_48-48_EXT.tst @@ -914,7 +914,7 @@ // 3 ISM with metadata at 192 kbps, 48 kHz in, 48 kHz out, EXT out ../IVAS_cod -ism 3 testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 192000 48 testv/ltv48_3ISM.wav bit -../IVAS_dec EXT 48 bit testv/ltv48_3ISM.wav_192000_48-48_EXTfile.tst +../IVAS_dec EXT 48 bit testv/ltv48_3ISM.wav_192000_48-48_EXT.tst // 3 ISM with metadata at 128 kbps, 48 kHz in, 32 kHz out, EXT out ../IVAS_cod -ism 3 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv 128000 48 testv/ltv48_3ISM.wav bit @@ -946,7 +946,7 @@ // 2 ISM with metadata at 128 kbps, 48 kHz in, 32 kHz out, EXT out ../IVAS_cod -ism 2 testv/ltvISM1.csv testv/ltvISM2.csv 128000 48 testv/ltv48_2ISM.wav bit -../IVAS_dec EXT 32 bit testv/ltv48_2ISM.wav_128000_48-32_EXT_file_TDHR.tst +../IVAS_dec EXT 32 bit testv/ltv48_2ISM.wav_128000_48-32_EXT.tst // 1 ISM with metadata bitrate switching from 13.2 kbps to 128 kbps, 32 kHz in, 32 kHz out, EXT out, DTX on ../IVAS_cod -dtx -ism 1 testv/ltvISM1.csv ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 32 testv/ltv32_MONO.wav bit @@ -958,11 +958,11 @@ // 1 ISM with metadata at 80 kbps, 48 kHz in, 16 kHz out, EXT out ../IVAS_cod -ism 1 testv/ltvISM1.csv 80000 48 testv/ltv48_1ISM.wav bit -../IVAS_dec EXT 16 bit testv/ltv48_1ISM.wav_80000_48-16_EXT_file_TDHR.tst +../IVAS_dec EXT 16 bit testv/ltv48_1ISM.wav_80000_48-16_EXT.tst // 1 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, EXT out, HR ../IVAS_cod -ism 1 testv/ltvISM1.csv 48000 48 testv/ltv48_1ISM.wav bit -../IVAS_dec EXT 48 bit testv/ltv48_1ISM.wav_64000_48-48_EXT_room_HR.tst +../IVAS_dec EXT 48 bit testv/ltv48_1ISM.wav_64000_48-48_EXT.tst // 1 ISM with metadata at 32 kbps, 32 kHz in, 32 kHz out, DTX on, EXT out ../IVAS_cod -dtx -ism 1 testv/ltvISM1.csv 32000 32 testv/ltv32_MONO.wav bit @@ -970,7 +970,7 @@ // 1 ISM with metadata at 16.4 kbps, 48 kHz in, 48 kHz out, EXT out, bandwidth switching ../IVAS_cod -max_band testv/ivas_bws_20fr_start_WB.txt -ism 1 testv/ltvISM1.csv 16400 48 testv/ltv48_1ISM.wav bit -../IVAS_dec EXT 48 bit testv/ltv48_1ISM.wav_16400_48-48_EXT_room.tst +../IVAS_dec EXT 48 bit testv/ltv48_1ISM.wav_16400_48-48_EXT.tst // 1 ISM with metadata at 13.2 kbps, 48 kHz in, 48 kHz out, EXT out ../IVAS_cod -ism 1 testv/ltvISM1.csv 13200 48 testv/ltv48_1ISM.wav bit -- GitLab From 6afdb7579742fa37bf6b43fb81135edc95cebd27 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 13 Dec 2024 09:26:54 +0100 Subject: [PATCH 32/36] remove manual job --- .gitlab-ci.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 454d5b65e4..01e063945a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,7 +23,6 @@ variables: - 'test-long-self-test' - 'ivas-conformance' - 'ivas-conformance-linux' - - 'check-float-reference' - 'check-clipping' - 'test-branch-vs-input-passthrough' @@ -70,9 +69,6 @@ workflow: variables: IVAS_PIPELINE_NAME: 'Draft IVAS Conformance test -- Linux: $CI_COMMIT_BRANCH' - if: $CI_PIPELINE_SOURCE == 'trigger' - - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'check-float-reference' - variables: - IVAS_PIPELINE_NAME: 'check-float-reference: $CI_COMMIT_BRANCH' - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'check-clipping' variables: IVAS_PIPELINE_NAME: 'Check core input clipping: $CI_COMMIT_BRANCH' @@ -277,8 +273,6 @@ stages: when: never - if: $MANUAL_PIPELINE_TYPE == 'ivas-conformance-linux' when: never - - if: $MANUAL_PIPELINE_TYPE == 'check-float-reference' - when: never - if: $MANUAL_PIPELINE_TYPE == 'check-clipping' - if: $MANUAL_PIPELINE_TYPE == 'test-branch-vs-input-passthrough' when: never @@ -450,7 +444,6 @@ branch-is-up-to-date-with-main-post: changes: - tests/**/* - scripts/**/* - - if: ($CI_PIPELINE_SOURCE == 'web' || $CI_PIPELINE_SOURCE == 'trigger') && $MANUAL_PIPELINE_TYPE == 'check-float-reference' - if: $CI_PIPELINE_SOURCE == 'push' when: never tags: -- GitLab From fd1cab575498efe0fc9a63bb499169c78b3cbc86 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 13 Dec 2024 10:53:18 +0100 Subject: [PATCH 33/36] revert changes to jbm BE test coming in from main --- tests/test_be_for_jbm_neutral_dly_profile.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/test_be_for_jbm_neutral_dly_profile.py b/tests/test_be_for_jbm_neutral_dly_profile.py index 61bb168a2f..743a4e0cfb 100644 --- a/tests/test_be_for_jbm_neutral_dly_profile.py +++ b/tests/test_be_for_jbm_neutral_dly_profile.py @@ -17,7 +17,7 @@ DTX_OFF = "DTX_OFF" # TODO: Clarify if this should also be tested with DTX, see #1122 TESTCASES = [ # stereo - ["stereo", 32000, "EXT", "DTX_OFF"], + ["stereo", 32000, "STEREO", "DTX_OFF"], ["stereo", 48000, "MONO", "DTX_OFF"], ["stereo", 16400, "5_1", "DTX_OFF"], ["stereo", 256000, "7_1_4", "DTX_OFF"], @@ -42,21 +42,21 @@ TESTCASES = [ # McMasa ["MC_5_1", 16400, "BINAURAL_ROOM_IR", "DTX_OFF"], ["MC_7_1_4", 80000, "mono", "DTX_OFF"], - ["MC_5_1_2", 24400, "EXT", "DTX_OFF"], + ["MC_5_1_2", 24400, "5_1_2", "DTX_OFF"], # paramMC ["MC_5_1_2", 48000, "BINAURAL", "DTX_OFF"], - ["MC_7_1", 80000, "EXT", "DTX_OFF"], + ["MC_7_1", 80000, "7_1", "DTX_OFF"], ["MC_7_1_4", 128000, "FOA", "DTX_OFF"], # paramUpmix ["MC_7_1_4", 160000, "stereo", "DTX_OFF"], # discrete MC ["MC_5_1_2", 512000, "BINAURAL_ROOM_REVERB", "DTX_OFF"], - ["MC_7_1", 128000, "EXT", "DTX_OFF"], + ["MC_7_1", 128000, "7_1", "DTX_OFF"], ["MC_7_1_4", 256000, "5_1", "DTX_OFF"], # SBA ["HOA3", 64000, "BINAURAL", "DTX_OFF"], ["FOA", 256000, "BINAURAL_ROOM_REVERB", "DTX_OFF"], - ["HOA2", 80000, "EXT", "DTX_OFF"], + ["HOA2", 80000, "HOA2", "DTX_OFF"], ["HOA3", 512000, "5_1_4", "DTX_OFF"], ["FOA", 80000, "stereo", "DTX_OFF"], # OMASA @@ -64,11 +64,11 @@ TESTCASES = [ ["OMASA_ISM2", 24400, "MONO", "DTX_OFF"], ["OMASA_ISM3", 80000, "7_1_4", "DTX_OFF"], ["OMASA_ISM4", 64000, "HOA3", "DTX_OFF"], - ["OMASA_ISM2", 32000, "EXT", "DTX_OFF"], + # ["OMASA_ISM2", 32000, "EXT", "DTX_OFF"], # OSBA ["OSBA_ISM2_HOA2", 64000, "BINAURAL_ROOM_IR", "DTX_OFF"], - ["OSBA_ISM4_FOA", 512000, "BINAURAL_ROOM_REVERB", "DTX_OFF"], - ["OSBA_ISM3_HOA3", 128000, "EXT", "DTX_OFF"], + # ["OSBA_ISM4_FOA", 512000, "BINAURAL_ROOM_REVERB", "DTX_OFF"], + # ["OSBA_ISM3_HOA3", 128000, "EXT", "DTX_OFF"], ["OSBA_ISM2_HOA3", 96000, "5_1", "DTX_OFF"], ["OSBA_ISM1_HOA2", 32000, "mono", "DTX_OFF"], ] -- GitLab From b0ec1ef3089580bcdc89cf572e68d2c270b16523 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 13 Dec 2024 11:16:49 +0100 Subject: [PATCH 34/36] add ltv copy step --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 01e063945a..ba1e69ae7d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -453,6 +453,8 @@ branch-is-up-to-date-with-main-post: - make -j -C ivas-basop - python3 ci/remove_unsupported_testcases.py $PARAM_FILE - python3 tests/create_short_testvectors.py + - *update-ltv-repo + - *copy-ltv-files-to-testv-dir - python3 -m pytest tests/codec_be_on_mr_nonselection --param_file $PARAM_FILE --update_ref 1 --ref_encoder_path ivas-basop/IVAS_cod --ref_decoder_path ivas-basop/IVAS_dec --html=report.html --self-contained-html --junit-xml=report-junit.xml || true - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true -- GitLab From 0e2f17954e99be323c05d86b1b7de2ad025651a6 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 13 Dec 2024 12:26:47 +0100 Subject: [PATCH 35/36] fix ltv basop encoder .prm file --- .../config/self_test_ltv_basop_encoder.prm | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/scripts/config/self_test_ltv_basop_encoder.prm b/scripts/config/self_test_ltv_basop_encoder.prm index 66f96903d2..22cec5b67e 100644 --- a/scripts/config/self_test_ltv_basop_encoder.prm +++ b/scripts/config/self_test_ltv_basop_encoder.prm @@ -320,35 +320,35 @@ ../IVAS_dec EXT 48 bit testv/ltvOSBA_4ISM_p3OA48c.wav_EXT_512000_48-48.tst // OSBA planar 2OA 4ISM at 512 kbps, 48 kHz in, 48 kHz out, EXT out -../IVAS_cod -ism_sba 4 -2 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv testv/ltv48_OSBA_4ISM_HOA3_ISM4.csv 512000 48 testv/ltv48_OSBA_4ISM_HOA2.wav bit +../IVAS_cod -ism_sba 4 -2 testv/ltv48_OSBA_1ISM_HOA2_ISM1.csv testv/ltv48_OSBA_2ISM_HOA2_ISM2.csv testv/ltv48_OSBA_3ISM_HOA2_ISM3.csv testv/ltv48_OSBA_4ISM_HOA2_ISM4.csv 512000 48 testv/ltv48_OSBA_4ISM_HOA2.wav bit ../IVAS_dec EXT 48 bit testv/ltvOSBA_4ISM_p3OA48c.wav_EXT_512000_48-48.tst // OSBA FOA 4ISM at 512 kbps, 48kHz in, 48kHz out, EXT out -../IVAS_cod -ism_sba 4 1 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv testv/ltv48_OSBA_4ISM_HOA3_ISM4.csv 512000 48 testv/ltv48_OSBA_4ISM_FOA.wav bit +../IVAS_cod -ism_sba 4 1 testv/ltv48_OSBA_1ISM_FOA_ISM1.csv testv/ltv48_OSBA_2ISM_FOA_ISM2.csv testv/ltv48_OSBA_3ISM_FOA_ISM3.csv testv/ltv48_OSBA_4ISM_FOA_ISM4.csv 512000 48 testv/ltv48_OSBA_4ISM_FOA.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_OSBA_4ISM_FOA.wav_EXT_512000_48-48.tst // OSBA FOA 4ISM at 512 kbps, 32kHz in, 48kHz out, EXT out -../IVAS_cod -ism_sba 4 1 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv testv/ltv48_OSBA_4ISM_HOA3_ISM4.csv 512000 32 testv/ltv32_OSBA_4ISM_FOA.wav bit +../IVAS_cod -ism_sba 4 1 testv/ltv48_OSBA_1ISM_FOA_ISM1.csv testv/ltv48_OSBA_2ISM_FOA_ISM2.csv testv/ltv48_OSBA_3ISM_FOA_ISM3.csv testv/ltv48_OSBA_4ISM_FOA_ISM4.csv 512000 32 testv/ltv32_OSBA_4ISM_FOA.wav bit ../IVAS_dec EXT 48 bit testv/ltv32_OSBA_4ISM_FOA.wav_EXT_512000_32-48.tst // OSBA FOA 4ISM at 384 kbps, 32kHz in, 32kHz out, EXT out -../IVAS_cod -ism_sba 4 1 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv testv/ltv48_OSBA_4ISM_HOA3_ISM4.csv 384000 32 testv/ltv32_OSBA_4ISM_FOA.wav bit +../IVAS_cod -ism_sba 4 1 testv/ltv48_OSBA_1ISM_FOA_ISM1.csv testv/ltv48_OSBA_2ISM_FOA_ISM2.csv testv/ltv48_OSBA_3ISM_FOA_ISM3.csv testv/ltv48_OSBA_4ISM_FOA_ISM4.csv 384000 32 testv/ltv32_OSBA_4ISM_FOA.wav bit ../IVAS_dec EXT 32 bit testv/ltv32_OSBA_4ISM_FOA.wav_EXT_384000_32-32.tst // OSBA FOA 4ISM at 256 kbps, 48kHz in, 48kHz out, EXT out -../IVAS_cod -ism_sba 4 1 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv testv/ltv48_OSBA_4ISM_HOA3_ISM4.csv 256000 48 testv/ltv48_OSBA_4ISM_FOA.wav bit +../IVAS_cod -ism_sba 4 1 testv/ltv48_OSBA_1ISM_FOA_ISM1.csv testv/ltv48_OSBA_2ISM_FOA_ISM2.csv testv/ltv48_OSBA_3ISM_FOA_ISM3.csv testv/ltv48_OSBA_4ISM_FOA_ISM4.csv 256000 48 testv/ltv48_OSBA_4ISM_FOA.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_OSBA_4ISM_FOA.wav_EXT_256000_48-48.tst // OSBA FOA 3ISM at 128 kbps, 48kHz in, 48kHz out, EXT out -../IVAS_cod -ism_sba 3 1 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv 128000 48 testv/ltv48_OSBA_3ISM_FOA.wav bit +../IVAS_cod -ism_sba 3 1 testv/ltv48_OSBA_1ISM_FOA_ISM1.csv testv/ltv48_OSBA_2ISM_FOA_ISM2.csv testv/ltv48_OSBA_3ISM_FOA_ISM3.csv 128000 48 testv/ltv48_OSBA_3ISM_FOA.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_OSBA_3ISM_FOA.wav_EXT_128000_48-48.tst // OSBA FOA 1ISM at 48 kbps, 16kHz in, 16kHz out, EXT out -../IVAS_cod -ism_sba 1 1 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv 32000 16 testv/ltv16_OSBA_1ISM_FOA.wav bit +../IVAS_cod -ism_sba 1 1 testv/ltv48_OSBA_1ISM_FOA_ISM1.csv 32000 16 testv/ltv16_OSBA_1ISM_FOA.wav bit ../IVAS_dec EXT 16 bit testv/ltv16_OSBA_1ISM_FOA.wav_EXT_32000_16-16.tst // OSBA FOA 1ISM at 32 kbps, 48kHz in, 48kHz out, EXT out -../IVAS_cod -ism_sba 1 1 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv 32000 48 testv/ltv48_OSBA_1ISM_FOA.wav bit +../IVAS_cod -ism_sba 1 1 testv/ltv48_OSBA_1ISM_FOA_ISM1.csv 32000 48 testv/ltv48_OSBA_1ISM_FOA.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_OSBA_1ISM_FOA.wav_EXT_32000_48-48.tst // OSBA 3OA 4ISM bitrate switching 16.4 to 512, 48kHz in, 48kHz out, EXT out @@ -405,32 +405,32 @@ ../IVAS_dec EXT 32 bit testv/ltv48_OSBA_3ISM_HOA3.wav_EXT_sw_48-32.tst // OSBA 3ISM 2OA at bitrate switching 13.2 to 512 kbps, 48kHz in, 32kHz out, EXT out -../IVAS_cod -ism_sba 3 2 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/ltv48_OSBA_3ISM_HOA2.wav bit +../IVAS_cod -ism_sba 3 2 testv/ltv48_OSBA_1ISM_HOA2_ISM1.csv testv/ltv48_OSBA_2ISM_HOA2_ISM2.csv testv/ltv48_OSBA_3ISM_HOA2_ISM3.csv ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/ltv48_OSBA_3ISM_HOA2.wav bit ../IVAS_dec EXT 32 bit testv/ltv48_OSBA_3ISM_HOA2.wav_EXT_sw_48-32.tst // OSBA 2OA 4ISM at 384 kbps, 48kHz in, 48kHz out, EXT out -../IVAS_cod -ism_sba 4 2 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv testv/ltv48_OSBA_4ISM_HOA3_ISM4.csv 384000 48 testv/ltv48_OSBA_4ISM_HOA2.wav bit +../IVAS_cod -ism_sba 4 2 testv/ltv48_OSBA_1ISM_HOA2_ISM1.csv testv/ltv48_OSBA_2ISM_HOA2_ISM2.csv testv/ltv48_OSBA_3ISM_HOA2_ISM3.csv testv/ltv48_OSBA_4ISM_HOA2_ISM4.csv 384000 48 testv/ltv48_OSBA_4ISM_HOA2.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_OSBA_4ISM_HOA2.wav_EXT_384000_48-48.tst // OSBA 2OA 3ISM at 96 kbps, 48kHz in, 48kHz out, EXT out -../IVAS_cod -ism_sba 3 2 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv 96000 48 testv/ltv48_OSBA_3ISM_HOA2.wav bit +../IVAS_cod -ism_sba 3 2 testv/ltv48_OSBA_1ISM_HOA2_ISM1.csv testv/ltv48_OSBA_2ISM_HOA2_ISM2.csv testv/ltv48_OSBA_3ISM_HOA2_ISM3.csv 96000 48 testv/ltv48_OSBA_3ISM_HOA2.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_OSBA_3ISM_HOA2.wav_EXT_96000_48-48.tst // OSBA 2OA 3ISM at 384 kbps, 16kHz in, 16kHz out, EXT out -../IVAS_cod -ism_sba 3 2 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv 384000 16 testv/ltv16_OSBA_3ISM_HOA2.wav bit +../IVAS_cod -ism_sba 3 2 testv/ltv48_OSBA_1ISM_HOA2_ISM1.csv testv/ltv48_OSBA_2ISM_HOA2_ISM2.csv testv/ltv48_OSBA_3ISM_HOA2_ISM3.csv 384000 16 testv/ltv16_OSBA_3ISM_HOA2.wav bit ../IVAS_dec EXT 16 bit testv/ltv16_OSBA_3ISM_HOA2.wav_EXT56000_16-16.tst // OSBA 2OA 2ISM at 64 kbps, 32kHz in, 16kHz out, EXT out -../IVAS_cod -ism_sba 2 2 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv 48000 32 testv/ltv32_OSBA_2ISM_HOA2.wav bit +../IVAS_cod -ism_sba 2 2 testv/ltv48_OSBA_1ISM_HOA2_ISM1.csv testv/ltv48_OSBA_2ISM_HOA2_ISM2.csv 48000 32 testv/ltv32_OSBA_2ISM_HOA2.wav bit ../IVAS_dec EXT 16 bit testv/ltv32_OSBA_2ISM_HOA2.wav_EXT_64000_32-16.tst // OSBA 2OA 2ISM at 48 kbps, 48kHz in, 48kHz out, EXT out -../IVAS_cod -ism_sba 2 2 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv 48000 48 testv/ltv48_OSBA_2ISM_HOA2.wav bit +../IVAS_cod -ism_sba 2 2 testv/ltv48_OSBA_1ISM_HOA2_ISM1.csv testv/ltv48_OSBA_2ISM_HOA2_ISM2.csv 48000 48 testv/ltv48_OSBA_2ISM_HOA2.wav bit ../IVAS_dec EXT 48 bit testv/ltv48_OSBA_2ISM_HOA2.wav_EXT_48000_48-48.tst // OSBA 2OA 1ISM at 24.4 kbps, 48kHz in, 48kHz out, EXT out -../IVAS_cod -ism_sba 1 2 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv 24400 48 testv/ltv48_OSBA_1ISM_EXT.wav bit -../IVAS_dec EXT 48 bit testv/ltv48_OSBA_1ISM_EXT.wav_EXT_24400_48-48.tst +../IVAS_cod -ism_sba 1 2 testv/ltv48_OSBA_1ISM_HOA2_ISM1.csv 24400 48 testv/ltv48_OSBA_1ISM_HOA2.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_OSBA_1ISM_HOA2.wav_EXT_24400_48-48.tst // OMASA 2TC 4ISM at br sw techs 13.2 to 512 kbps start 384 kbps, 48kHz in, 48kHz out, BINAURAL out ../IVAS_cod -ism_masa 4 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_OMASA_4ISM_2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_384k_omasatechs_4ism.bin 48 testv/ltv48_OMASA_4ISM_2TC.wav bit -- GitLab From 6e3204d94a77e84b0632b5cfac90d49622997ff2 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 13 Dec 2024 14:23:34 +0100 Subject: [PATCH 36/36] comment out problematic testcase there is an issue with ivas-float-update that needs to be fixed first --- scripts/config/self_test_ltv_basop_encoder.prm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/config/self_test_ltv_basop_encoder.prm b/scripts/config/self_test_ltv_basop_encoder.prm index 22cec5b67e..ca20519cb2 100644 --- a/scripts/config/self_test_ltv_basop_encoder.prm +++ b/scripts/config/self_test_ltv_basop_encoder.prm @@ -276,8 +276,8 @@ ../IVAS_dec HOA3 48 bit testv/ltv48_HOA3.wav_sw_48-48_HOA3.tst // SBA 3OA bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, DTX on, HOA3 out -../IVAS_cod -dtx -sba 3 ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/ltv48_HOA3.wav bit -../IVAS_dec HOA3 48 bit testv/ltv48_HOA3.wav_sw_48-48_DTX_HOA3.tst +//../IVAS_cod -dtx -sba 3 ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/ltv48_HOA3.wav bit +//../IVAS_dec HOA3 48 bit testv/ltv48_HOA3.wav_sw_48-48_DTX_HOA3.tst // SBA 3OA bitrate switching from 13.2 kbps to 128 kbps, 32kHz in, 32kHz out, DTX on, HOA3 out ../IVAS_cod -dtx -sba 3 ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 32 testv/ltv32_HOA3.wav bit -- GitLab