Commit 11a2a151 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into ci/add-5-and-10-ms-rendering-to-sanitizer-tests

parents efc94d9c 544ee16d

ci/complexity_measurements/mergeNewsletterRam.py

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
# 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.

import csv

import re

import sys



newsletterFilename = ""

ci/complexity_measurements/mergeNewsletterRom.py

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
# 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.

import csv

import re

import sys



newsletterFilename = ""

lib_com/ivas_prot.h

+7 −0
Original line number Diff line number Diff line
@@ -1095,11 +1095,13 @@ void ivas_param_ism_dec_close( 
    const AUDIO_CONFIG output_config                            /* i  : output audio configuration                  */

);



#ifndef FIX_1022_REMOVE_PARAMISM_DEC

void ivas_param_ism_dec(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                      */

    float *output_f[]                                           /* i/o: synthesized core-coder transport channels/DirAC output  */

);



#endif

void ivas_ism_dec_digest_tc(

    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                      */

);
@@ -3867,11 +3869,13 @@ void ivas_param_mc_dec_render( 
    float *output_f[]                                           /* o  : rendered time signal                                */

);



#ifndef FIX_1023_REMOVE_PARAMMC_DEC

void ivas_param_mc_dec(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                                     */

    float *output_f[]                                           /* i/o: synthesized core-coder transport channels/DirAC output  */

);



#endif

/*! r: number of cldfb synthesis instances */

int16_t param_mc_get_num_cldfb_syntheses( 

    Decoder_Struct *st_ivas                                     /* i  : IVAS decoder structure                              */
@@ -5214,6 +5218,9 @@ void ivas_ism_renderer_close( 


void ivas_ism_render_sf(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                          */

#ifdef NONBE_FIX_1021_ISM_BRIR_RS_FLUSH

    const RENDERER_TYPE renderer_type,                          /* i  : active renderer type                            */

#endif

    float *output_f[],                                          /* i/o: core-coder transport channels/object output     */

    const int16_t n_samples_to_render                           /* i  : output frame length per channel                 */

);

lib_com/options.h

+4 −0
Original line number Diff line number Diff line
@@ -157,6 +157,9 @@ 
/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_1027_GSC_INT_OVERFLOW                       /* VA: issue 2207: overflow in GSC */

#define FIX_1024_REMOVE_PARAMMC_MIXING_MAT              /* VA: issue 1024: remove unused function ivas_param_mc_get_mono_stereo_mixing_matrices() */

#define FIX_1023_REMOVE_PARAMMC_DEC                     /* VA: issue 1023: remove unused function ivas_param_mc_dec() */

#define FIX_1022_REMOVE_PARAMISM_DEC                    /* VA: issue 1022: remove unused function ivas_param_ism_dec() */



/* #################### End BE switches ################################## */
@@ -164,6 +167,7 @@ 
/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_1021_ISM_BRIR_RS_FLUSH                      /* FhG: issue #1021: fix ISM with JBM and RS renderer flushing*/



/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_ism_param_dec.c

+9 −5
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ static void ivas_param_ism_render_slot( 
    return;

}





#ifndef FIX_1022_REMOVE_PARAMISM_DEC

static void ivas_param_ism_rendering(

    PARAM_ISM_DEC_HANDLE hParamIsmDec,

    SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom,
@@ -361,7 +361,7 @@ static void ivas_param_ism_rendering( 


    return;

}



#endif



static ivas_error ivas_param_ism_rendering_init(

    PARAM_ISM_RENDERING_HANDLE hParamIsmRendering,
@@ -729,7 +729,7 @@ void ivas_param_ism_dec_close( 
    return;

}





#ifndef FIX_1022_REMOVE_PARAMISM_DEC

/*-------------------------------------------------------------------------*

 * ivas_param_ism_dec()

 *
@@ -973,7 +973,7 @@ void ivas_param_ism_dec( 


    return;

}



#endif



/*-------------------------------------------------------------------------*

 * ivas_ism_dec_digest_tc()
@@ -1121,7 +1121,7 @@ void ivas_param_ism_dec_digest_tc( 
        nchan_out_woLFE = st_ivas->hIntSetup.nchan_out_woLFE;

    }



    push_wmops( "ivas_param_ism_dec" );

    push_wmops( "ivas_param_ism_dec_digest_tc" );



    /* general setup */

    ivas_jbm_dec_get_adapted_linear_interpolator( DEFAULT_JBM_CLDFB_TIMESLOTS, nCldfbSlots, hParamIsmDec->hParamIsmRendering->interpolator );
@@ -1533,8 +1533,10 @@ void ivas_param_ism_params_to_masa_param_mapping( 
        st_ivas->hISMDTX.dtx_flag = 1;

    }



#ifndef FIX_1022_REMOVE_PARAMISM_DEC

    if ( st_ivas->nchan_ism > 1 )

    {

#endif

        if ( st_ivas->hISMDTX.dtx_flag )

        {

            float energy_ratio;
@@ -1598,6 +1600,7 @@ void ivas_param_ism_params_to_masa_param_mapping( 
                }

            }

        }

#ifndef FIX_1022_REMOVE_PARAMISM_DEC

    }

    else

    {
@@ -1617,6 +1620,7 @@ void ivas_param_ism_params_to_masa_param_mapping( 
            }

        }

    }

#endif



    return;

}