.gitlab-ci.yml

@@ -352,6 +352,7 @@ build-codec-include-split-linux-make:
     - .rules-basis
   script:
     - *print-common-info
+    - *enable-split-rendering
     - make -j INCLUDE_SPLIT=1 2>&1 | tee $BUILD_OUTPUT
     # need to use the "|| exit $?" suffix to get the allowed_failure return code, otherwise the job fails with code 1...<
     - ci/check_for_warnings.py $BUILD_OUTPUT || exit $?
@@ -362,6 +363,7 @@ build-codec-include-split-linux-cmake:
     - .rules-basis
   script:
     - *print-common-info
+    - *enable-split-rendering
     - mkdir build
     - cd build
     - cmake .. -DINCLUDE_SPLIT=1
@@ -390,6 +392,9 @@ build-codec-windows-include-split-cmake:
   script:
     - *print-common-info-windows
     - $winoutdata = $null
+    - get-content .\lib_com\options.h | %{$_ -replace "/\*#define[\s]*SPLIT_REND_WITH_HEAD_ROT[\s]*\*/", "#define SPLIT_REND_WITH_HEAD_ROT"} | set-content -Path ./options_patched.h
+    - rm ./lib_com/options.h
+    - mv ./options_patched.h ./lib_com/options.h
     - cmake -DINCLUDE_SPLIT=1 -G "Visual Studio 15 2017" . -Bbuild
     - cmake --build build -j | tee -variable winoutdata
     - $winoutdata | Out-File $BUILD_OUTPUT -Encoding Utf8

lib_com/options.h

@@ -155,6 +155,7 @@
 #define FIX_881_REMOVE_LFE_ADDITION_IN_ISM              /* VA: issue 881: remove LFE addition in ISM format */
 #define FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO              /* VA: Fix the definition of buffers/arrays in DFT and MDCT stereo to satisfy gcc v 11.4.0 */
 #define FIX_891_PARAMUPMIX_CLEANUP                      /* Dlb: issue 891: remove unneeded code from ParamUpmix */
+#define FIX_917_LCLD_WARNINGS                           /* Dlb: issue 917 and 918: fix LCLD codec warnings*/
 #define FIX_920_IGF_INIT_ERROR                          /* FhG: issue 920: fix bitrate mismatch in initial IGF config to avoid error message in same cases */
 
 /* #################### End BE switches ################################## */
@@ -176,6 +177,8 @@
 #define NONBE_FIX_898_ISM_BRATE_CRASH                         /* VA: issue 898: fix decoder crash in ISM bitrate switching with DTX and binaural output */
 #define NONBE_FIX_862_UBSAN_SPAR_DEC_BR_SW_PLC                /* DLB: issue 862 : UBSAN: out-of-bound error in SPAR for OSBA bitrate switching with PLC*/
 #define NONBE_FIX_DISCRETE_ISM_NOISE_SEED_HANDLING            /* FhG: fix handling of common and differing noise seeds in SCEs for ISM DTX */
+#define NONBE_FIX_913_OMASA_BITBUDGET_VIOLATION               /* VA/Nok: issue 913: Resolve "Crash in OMASA encoder - DFT-Stereo bit-budget violated" */
+
 
 /* ##################### End NON-BE switches ########################### */
 

lib_debug/wmc_auto.c

@@ -42,6 +42,8 @@
 #define MAX_NUM_RECORDS_REALLOC_STEP 50  /* When re-allocating the list of records, increase the number of records by this number */
 #define MAX_CALL_TREE_DEPTH          100 /* maximum depth of the function call tree */
 #define DOUBLE_MAX                   0x80000000
+#define FAC                          ( FRAMES_PER_SECOND / 1e6 )
+
 
 typedef struct 
 {
@@ -1903,8 +1905,8 @@ void print_mem( ROM_Size_Lookup_Table Const_Data_PROM_Table[] )
             }
             else
             {
-                /* bytes */
-                fprintf( stdout, "Program ROM size (%s): %d bytes\n", Const_Data_PROM_Table[i].file_spec, Const_Data_PROM_Table[i].PROM_size << Stat_Cnt_Size );
+                /* bytes (here, we assume that each instruction takes PROM_INST_SIZE bits of the PROM memory) */
+                fprintf( stdout, "Program ROM size (%s): %d bytes\n", Const_Data_PROM_Table[i].file_spec, Const_Data_PROM_Table[i].PROM_size * ( PROM_INST_SIZE / 8 ) );
             }
         }
 
@@ -1994,10 +1996,15 @@ void print_mem( ROM_Size_Lookup_Table Const_Data_PROM_Table[] )
     mem_count_summary();
 #endif
 
-    if ( Stat_Cnt_Size == 0 )
+    if ( Stat_Cnt_Size > 0 )
+    {
+        /* words */
+        fprintf( stdout, "\nNote: The Program ROM size is calculated under the assumption that 1 instruction word is stored with %d bits\n", 8 << Stat_Cnt_Size );
+    }
+    else
     {
         /* bytes */
-        fprintf( stdout, "\nNote: The Program ROM size is calculated under the assumption that 1 instruction word is stored with %d bytes (%d bits)\n", 1 << Stat_Cnt_Size, 8 << Stat_Cnt_Size );
+        fprintf( stdout, "\nNote: The Program ROM size is calculated under the assumption that 1 instruction word is stored with %d bits\n", PROM_INST_SIZE );
     }
     fprintf( stdout, "Note: The Data ROM size is calculated using the sizeof(type) built-in function\n" );
 

lib_debug/wmc_auto.h

@@ -33,10 +33,8 @@
 #define INT_MAX 32767
 #endif
 
-/* Real-time relationships */
 #define FRAMES_PER_SECOND 50.0    
-#define WMOPS_BOOST_FAC   ( 1.0f ) /* scaling factor for equalizing the difference between automatic and manual instrumentation */
-#define FAC               ( FRAMES_PER_SECOND / 1e6 * WMOPS_BOOST_FAC )
+#define PROM_INST_SIZE    32     /* number of bits of each program instruction when stored in the PROM memory (applied only when the user selects reporting in bytes) */
 
 #ifdef WMOPS
 enum instructions
@@ -670,24 +668,24 @@ static int wmc_flag_ = 0;
 #endif
 
 /* Define all Macros without '{' & '}' (None of these should be called externally!) */
-#define ABS_( x )      OP_COUNT_( _ABS, ( x ) / WMOPS_BOOST_FAC )
-#define ADD_( x )      OP_COUNT_( _ADD, ( x ) / WMOPS_BOOST_FAC )
-#define MULT_( x )     OP_COUNT_( _MULT, ( x ) / WMOPS_BOOST_FAC )
-#define MAC_( x )      OP_COUNT_( _MAC, ( x ) / WMOPS_BOOST_FAC )
-#define MOVE_( x )     OP_COUNT_( _MOVE, ( x ) / WMOPS_BOOST_FAC )
-#define STORE_( x )    OP_COUNT_( _STORE, ( x ) / WMOPS_BOOST_FAC )
-#define LOGIC_( x )    OP_COUNT_( _LOGIC, ( x ) / WMOPS_BOOST_FAC )
-#define SHIFT_( x )    OP_COUNT_( _SHIFT, ( x ) / WMOPS_BOOST_FAC )
-#define BRANCH_( x )   OP_COUNT_( _BRANCH, ( x ) / WMOPS_BOOST_FAC )
-#define DIV_( x )      OP_COUNT_( _DIV, ( x ) / WMOPS_BOOST_FAC )
-#define SQRT_( x )     OP_COUNT_( _SQRT, ( x ) / WMOPS_BOOST_FAC )
-#define TRANS_( x )    OP_COUNT_( _TRANS, ( x ) / WMOPS_BOOST_FAC )
+#define ABS_( x )      OP_COUNT_( _ABS, ( x ) )
+#define ADD_( x )      OP_COUNT_( _ADD, ( x ) )
+#define MULT_( x )     OP_COUNT_( _MULT, ( x ) )
+#define MAC_( x )      OP_COUNT_( _MAC, ( x ) )
+#define MOVE_( x )     OP_COUNT_( _MOVE, ( x ) )
+#define STORE_( x )    OP_COUNT_( _STORE, ( x ) )
+#define LOGIC_( x )    OP_COUNT_( _LOGIC, ( x ) )
+#define SHIFT_( x )    OP_COUNT_( _SHIFT, ( x ) )
+#define BRANCH_( x )   OP_COUNT_( _BRANCH, ( x ) )
+#define DIV_( x )      OP_COUNT_( _DIV, ( x ) )
+#define SQRT_( x )     OP_COUNT_( _SQRT, ( x ) )
+#define TRANS_( x )    OP_COUNT_( _TRANS, ( x ) )
 #define POWER_( x )    TRANS_( x )
 #define LOG_( x )      TRANS_( x )
-#define LOOP_( x )     OP_COUNT_( _LOOP, ( x ) / WMOPS_BOOST_FAC )
-#define INDIRECT_( x ) OP_COUNT_( _INDIRECT, ( x ) / WMOPS_BOOST_FAC )
-#define PTR_INIT_( x ) OP_COUNT_( _PTR_INIT, ( x ) / WMOPS_BOOST_FAC )
-#define FUNC_( x )     ( OP_COUNT_( _MOVE, ( x ) / WMOPS_BOOST_FAC ), OP_COUNT_( _FUNC, 1 ) )
+#define LOOP_( x )     OP_COUNT_( _LOOP, ( x ) )
+#define INDIRECT_( x ) OP_COUNT_( _INDIRECT, ( x ) )
+#define PTR_INIT_( x ) OP_COUNT_( _PTR_INIT, ( x ) )
+#define FUNC_( x )     ( OP_COUNT_( _MOVE, ( x ) ), OP_COUNT_( _FUNC, 1 ) )
 #define MISC_( x )     ABS_( x )
 
 /* Math Operations */

lib_dec/ivas_cpe_dec.c

@@ -260,6 +260,17 @@ ivas_error ivas_cpe_dec(
             }
             else
             {
+#ifdef NONBE_FIX_913_OMASA_BITBUDGET_VIOLATION
+                if ( st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == MASA_ISM_FORMAT )
+                {
+                    nb_bits -= nb_bits_metadata;
+                    if ( hCPE->brate_surplus < 0 )
+                    {
+                        nb_bits += (int16_t) ( hCPE->brate_surplus / FRAMES_PER_SEC );
+                    }
+                }
+
+#endif
                 stereo_dft_dec_read_BS( ivas_total_brate, hCPE->element_brate, &sts[0]->total_brate, sts[1], hCPE->hStereoDft, sts[0]->bwidth, output_frame, res_buf, &nb_bits, hCPE->hStereoCng->coh, st_ivas->ivas_format );
             }
 

lib_enc/ivas_cpe_enc.c

@@ -656,19 +656,41 @@ ivas_error ivas_cpe_enc(
             if ( ivas_format == MASA_FORMAT || ivas_format == MASA_ISM_FORMAT )
             {
                 max_bits -= nb_bits_metadata;
+#ifdef NONBE_FIX_913_OMASA_BITBUDGET_VIOLATION
+                if ( hCPE->brate_surplus < 0 )
+                {
+#endif
                     max_bits += (int16_t) ( hCPE->brate_surplus / FRAMES_PER_SEC );
+#ifdef NONBE_FIX_913_OMASA_BITBUDGET_VIOLATION
+                }
+#endif
             }
 
             stereo_dft_enc_res( hCPE->hStereoDft, old_inp_12k8[1] + L_INP_MEM - STEREO_DFT_OVL_8k, hCPE->hMetaData, &nb_bits, max_bits );
         }
+
         if ( sts[0]->core_brate == FRAME_NO_DATA || sts[0]->core_brate == SID_2k40 )
         {
             assert( ( nb_bits <= ( ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS ) ) && "Stereo DFT CNG: bit budget is violated" );
         }
         else
         {
+#ifdef NONBE_FIX_913_OMASA_BITBUDGET_VIOLATION
+#ifdef DEBUGGING
+            if ( ivas_format == MASA_FORMAT || ivas_format == MASA_ISM_FORMAT )
+            {
+                assert( ( ( hCPE->element_brate / FRAMES_PER_SEC - nb_bits - nb_bits_metadata + (int16_t) ( hCPE->brate_surplus / FRAMES_PER_SEC ) ) >= ( 0.8f * sts[0]->bits_frame_nominal ) ) && "Stereo DFT: bit budget is violated" );
+            }
+            else
+            {
+                assert( ( ( hCPE->element_brate / FRAMES_PER_SEC - nb_bits ) >= ( 0.8f * sts[0]->bits_frame_nominal ) ) && "Stereo DFT: bit budget is violated" );
+            }
+
+#endif
+#else
             assert( ( ( hCPE->element_brate / FRAMES_PER_SEC - nb_bits ) >= ( 0.8f * sts[0]->bits_frame_nominal ) ) && "Stereo DFT: bit budget is violated" );
 
+#endif
             /* Flexible total bitrate in M channel */
             sts[0]->total_brate = hCPE->element_brate - ( nb_bits * FRAMES_PER_SEC );
         }

lib_rend/ivas_NoiseGen.c

@@ -39,7 +39,7 @@
 #include "ivas_prot_rend.h"
 #include "wmc_auto.h"
 
-
+#ifndef FIX_917_LCLD_WARNINGS
 /*------------------------------------------------------------------------------------------*
  * Function CreateNoiseGen()
  *
@@ -80,7 +80,7 @@ NoiseGen *CreateNoiseGen( void )
 
     return psNoiseGen;
 }
-
+#endif
 
 /*------------------------------------------------------------------------------------------*
  * Function DeleteNoiseGen()

lib_rend/ivas_RMSEnvGrouping.c

@@ -275,7 +275,7 @@ static void ComputeBandEnergy(
     return;
 }
 
-
+#ifndef FIX_917_LCLD_WARNINGS
 /*-------------------------------------------------------------------*
  * Function TryMerge()
  *
@@ -375,7 +375,7 @@ static float TryMerge(
 
     return fMeanCost;
 }
-
+#endif
 
 /*-------------------------------------------------------------------*
  * Function ComputeMergeRMS()
@@ -588,7 +588,7 @@ static float TryMerge2(
     return fMergedCost;
 }
 
-
+#ifndef FIX_917_LCLD_WARNINGS
 /*-------------------------------------------------------------------*
  * Function ComputeGreedyGroups()
  *
@@ -650,8 +650,9 @@ static void ComputeGreedyGroups(
 
     return;
 }
+#endif
 
-
+#ifndef FIX_917_LCLD_WARNINGS
 /*-------------------------------------------------------------------*
  * Function ComputeGreedyGroups2()
  *
@@ -702,7 +703,7 @@ static void ComputeGreedyGroups2(
 
     return;
 }
-
+#endif
 
 /*-------------------------------------------------------------------*
  * Function ComputeGreedyGroups3()
@@ -917,9 +918,9 @@ void ComputeEnvelopeGrouping(
     }
 
     /* Perform grouping via Greedy Merge */
-
+#ifndef FIX_917_LCLD_WARNINGS
     /* ComputeGreedyGroups2( psRMSEnvelopeGrouping, iChannels, iNumBands, piBandwidths );*/
-
+#endif
     /* Allows control over max groups can call using 16 if want same as previous call */
     ComputeGreedyGroups3( psRMSEnvelopeGrouping, iChannels, iNumBands, piBandwidths, LCLD_BLOCKS_PER_FRAME );
 

lib_rend/ivas_lcld_encoder.c

@@ -483,7 +483,9 @@ static int32_t CountLCLDBits( const int32_t iNumGroups, const int32_t *piGroupLe
 
 static int32_t WriteHeaderInformation( const int32_t iNumBands, IVAS_SPLIT_REND_BITS_HANDLE pBits );
 
+#ifdef ENABLE_PMOD_ADJUST
 static int32_t WritePmodInformation( const int32_t **ppiHiSMRFlags, IVAS_SPLIT_REND_BITS_HANDLE pBits, int32_t iChannels, int32_t iNumBands );
+#endif
 
 static int32_t WriteMSInformation( const int32_t iNumBands, const int32_t iMSMode, const int32_t *piMSFlags, const int32_t *piLRPhaseDiffs, const int32_t *piMSPredCoefs, int32_t iNumMSPredBands, IVAS_SPLIT_REND_BITS_HANDLE pBits );
 
@@ -1198,7 +1200,7 @@ static void QuantizeSpectrumDPCM_Opt(
     return;
 }
 
-
+#ifndef FIX_917_LCLD_WARNINGS
 static void QuantizeSpectrumDPCM(
     const int32_t iNumGroups,
     const int32_t *piGroupLengths,
@@ -1334,7 +1336,7 @@ static void QuantizeSpectrumDPCM(
 
     return;
 }
-
+#endif
 
 static int32_t CountLCLDBits(
     const int32_t iNumGroups,

lib_rend/ivas_lcld_prot.h

@@ -195,9 +195,11 @@ typedef struct NOISE_GEN
     float *pfNoiseBuffer;
 } NoiseGen;
 
+#ifndef FIX_917_LCLD_WARNINGS
 NoiseGen *CreateNoiseGen( 
     void 
 );
+#endif
 
 void DeleteNoiseGen( 
     NoiseGen *psNoiseGen 

lib_rend/ivas_splitRendererPost.c

@@ -163,7 +163,7 @@ void ivas_splitBinPostRendClose(
     return;
 }
 
-
+#ifndef FIX_917_LCLD_WARNINGS
 /*-----------------------------------------------------------------------------------------*
  * Function ivas_huffman_code_bits_present()
  *
@@ -195,7 +195,7 @@ static int32_t ivas_split_rend_huffman_code_bits_present(
 
     return index;
 }
-
+#endif
 
 /*-----------------------------------------------------------------------------------------*
  * Function ivas_split_rend_huffman_decode_opt()
@@ -1161,7 +1161,7 @@ static void get_interpolation_vars(
     return;
 }
 
-
+#ifndef FIX_917_LCLD_WARNINGS
 /*-----------------------------------------------------------------------------------------*
  * Function interpolate_gain_matrix()
  *
@@ -1212,7 +1212,7 @@ static void interpolate_gain_matrix(
 
     return;
 }
-
+#endif
 
 /*-----------------------------------------------------------------------------------------*
  * Function interpolate_pred_matrix()

scripts/config/self_test.prm

@@ -1416,7 +1416,7 @@ networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit
 
 // OMASA 1Dir2TC 4ISM at 32 kbps, 48kHz in, 48kHz out, FOA out, FEC at 5%
 ../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 -fec 5 FOA 48 bit testv/stvOMASA_4ISM_1MASA2TC48c.wav_FOA_32000_48-48.tst
+../IVAS_dec -fec 5 FOA 48 bit testv/stvOMASA_4ISM_1MASA2TC48c.wav_FOA_32000_48-48_FEC5.tst
 
 // OMASA 1Dir1TC 4ISM at 48 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB 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
@@ -1446,7 +1446,7 @@ networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit
 
 // OMASA 2Dir1TC 3ISM at bitrate switching techs 13.2 to 512 kbps start 48 kbps, 48kHz in, 32kHz out, STEREO out, FEC at 10%
 ../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 -fec 10 STEREO 32 bit testv/stvOMASA_3ISM_2MASA1TC48c.wav_STEREO_sw_48-32.tst
+../IVAS_dec -fec 10 STEREO 32 bit testv/stvOMASA_3ISM_2MASA1TC48c.wav_STEREO_sw_48-32_FEC10.tst
 
 // OMASA 1Dir2TC 3ISM at bitrate switching techs 13.2 to 512 kbps start 24.4 kbps, 32kHz in, 48kHz out, 5.1.4 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
@@ -1454,7 +1454,7 @@ networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit
 
 // OMASA 1Dir1TC 4ISM at bitrate switching techs 13.2 to 512 kbps start 32 kbps, 48kHz in, 48kHz out, BINAURAL out, FEC at 5%
 ../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 -fec 5 BINAURAL 48 bit testv/stvOMASA_4ISM_1MASA1TC48c.wav_BINAURAL_sw_48-48.tst
+../IVAS_dec -fec 5 BINAURAL 48 bit testv/stvOMASA_4ISM_1MASA1TC48c.wav_BINAURAL_sw_48-48_FEC5.tst
 
 // OMASA 1Dir2TC 4ISM at bitrate switching techs 13.2 to 512 kbps start 80 kbps, 48kHz in, 48kHz out, HOA3 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
@@ -1533,6 +1533,14 @@ networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit
 ../IVAS_cod -ism_sba 4 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 512000 32 testv/stvOSBA_4ISM_FOA32c.wav bit
 ../IVAS_dec STEREO 48 bit testv/stvOSBA_4ISM_FOA32c.wav_STEREO_512000_32-48.tst
 
-// OSBA 3OA 4ISM bitrate switching 13.2 to 512, 32kHz in, 32kHz out, EXT out
+// 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-32.tst
\ No newline at end of file
+../IVAS_dec EXT 48 bit testv/stvOSBA_4ISM_3OA32c.wav_EXT_sw_13k2_512k_32-48.tst
+
+// OSBA FOA 4ISM at bitrate switching 13.2 to 512 kbps, 48kHz in, 48kHz out, BINAURAL out, FEC at 5%
+../IVAS_cod -ism_sba 4 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stvOSBA_4ISM_FOA48c.wav bit
+../IVAS_dec -fec 5 BINAURAL 48 bit testv/stvOSBA_4ISM_FOA48c.wav_BINAURAL_sw_48-48_FEC5.tst
+
+// OSBA 3ISM 2OA at bitrate switching 13.2 to 512 kbps, 48kHz in, 32kHz out, STEREO out, FEC at 10%
+../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 -fec 10 STEREO 32 bit testv/stvOSBA_3ISM_2OA48c.wav_STEREO_sw_48-32_FEC10.tst

scripts/config/self_test_ltv.prm

@@ -1412,7 +1412,7 @@ networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit
 
 // OMASA 1Dir2TC 4ISM at 32 kbps, 48kHz in, 48kHz out, FOA out, FEC at 5%
 ../IVAS_cod -ism_masa 4 2 testv/ltv48_OMASA_4ISM_2TC_ISM1.csv testv/ltv48_OMASA_4ISM_2TC_ISM2.csv testv/ltv48_OMASA_4ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/stv1MASA2TC48c.met 32000 48 testv/stvOMASA_4ISM_1MASA2TC48c.wav bit
-../IVAS_dec -fec 5 FOA 48 bit testv/stvOMASA_4ISM_1MASA2TC48c.wav_FOA_32000_48-48.tst
+../IVAS_dec -fec 5 FOA 48 bit testv/stvOMASA_4ISM_1MASA2TC48c.wav_FOA_32000_48-48_FEC5.tst
 
 // OMASA 1Dir1TC 4ISM at 48 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out
 ../IVAS_cod -ism_masa 4 1 testv/ltv48_OMASA_4ISM_1TC_ISM1.csv testv/ltv48_OMASA_4ISM_1TC_ISM2.csv testv/ltv48_OMASA_4ISM_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
@@ -1442,7 +1442,7 @@ networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit
 
 // OMASA 2Dir1TC 3ISM at bitrate switching techs 13.2 to 512 kbps start 48 kbps, 48kHz in, 32kHz out, STEREO out, FEC at 10%
 ../IVAS_cod -ism_masa 3 1 testv/ltv48_OMASA_3ISM_1TC_ISM1.csv testv/ltv48_OMASA_3ISM_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 -fec 10 STEREO 32 bit testv/ltv48_OMASA_3ISM_1TC.wav_STEREO_sw_48-32.tst
+../IVAS_dec -fec 10 STEREO 32 bit testv/ltv48_OMASA_3ISM_1TC.wav_STEREO_sw_48-32_FEC10.tst
 
 // OMASA 1Dir2TC 3ISM at bitrate switching techs 13.2 to 512 kbps start 24.4 kbps, 32kHz in, 48kHz out, 5.1.4 out
 ../IVAS_cod -ism_masa 3 2 testv/ltv48_OMASA_3ISM_2TC_ISM1.csv testv/ltv48_OMASA_3ISM_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
@@ -1450,7 +1450,7 @@ networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit
 
 // OMASA 1Dir1TC 4ISM at bitrate switching techs 13.2 to 512 kbps start 32 kbps, 48kHz in, 48kHz out, BINAURAL out, FEC at 5%
 ../IVAS_cod -ism_masa 4 1 testv/ltv48_OMASA_4ISM_1TC_ISM1.csv testv/ltv48_OMASA_4ISM_1TC_ISM2.csv testv/ltv48_OMASA_4ISM_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 -fec 5 BINAURAL 48 bit testv/ltv48_OMASA_4ISM_1TC.wav_BINAURAL_sw_48-48.tst
+../IVAS_dec -fec 5 BINAURAL 48 bit testv/ltv48_OMASA_4ISM_1TC.wav_BINAURAL_sw_48-48_FEC5.tst
 
 // OMASA 1Dir2TC 4ISM at bitrate switching techs 13.2 to 512 kbps start 80 kbps, 48kHz in, 48kHz out, HOA3 out
 ../IVAS_cod -ism_masa 4 2 NULL testv/ltv48_OMASA_4ISM_2TC_ISM2.csv testv/ltv48_OMASA_4ISM_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
@@ -1529,6 +1529,14 @@ networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit
 ../IVAS_cod -ism_sba 4 1 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 512000 32 testv/ltv32_OSBA_4ISM_FOA.wav bit
 ../IVAS_dec STEREO 48 bit testv/ltv32_OSBA_4ISM_FOA.wav_STEREO_512000_32-48.tst
 
-// OSBA 3OA 4ISM bitrate switching 13.2 to 512, 32kHz in, 32kHz out, EXT out
+// OSBA 3OA 4ISM bitrate switching 13.2 to 512, 32kHz in, 48 out, EXT out
 ../IVAS_cod -ism_sba 4 3 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.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-32.tst
+
+// OSBA FOA 4ISM at bitrate switching 13.2 to 512 kbps, 48kHz in, 48kHz out, BINAURAL out, FEC at 5%
+// ../IVAS_cod -ism_sba 4 1 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/ltv48_OSBA_4ISM_FOA.wav bit
+// ../IVAS_dec -fec 5 BINAURAL 48 bit testv/ltv48_OSBA_4ISM_FOA.wav_BINAURAL_sw_48-48_FEC5.tst
+
+// OSBA 3ISM 2OA at bitrate switching 13.2 to 512 kbps, 48kHz in, 32kHz out, STEREO out, FEC at 10%
+// ../IVAS_cod -ism_sba 3 2 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/ltv48_OSBA_3ISM_2OA.wav bit
+// ../IVAS_dec -fec 10 STEREO 32 bit testv/ltv48_OSBA_3ISM_2OA.wav_STEREO_sw_48-32_FEC10.tst