Commit 3a4c8ea2 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into kiene/tag-renderer-sanitizer-tests-for-fast-runners

parents 06e267f9 885d16e8

.gitignore

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ IVAS_cod 
IVAS_dec

IVAS_rend

ISAR_post_rend

ambi_converter

obj/

*.a

*.o
@@ -18,6 +19,7 @@ IVAS_cod.exe 
IVAS_dec.exe

IVAS_rend.exe

ISAR_post_rend.exe

ambi_converter.exe

*.user

.vs/

Debug_*/

apps/ambi_converter.c

+19 −13
Original line number Diff line number Diff line
@@ -52,33 +52,34 @@ int main( int argc, char *argv[] ) 


    uint32_t samplingRate;

    uint32_t samplesInFile;

    uint32_t numSamples = L_FRAME48k;

    uint32_t numSamples = AMBI_MAX_FRAME_LENGTH;

    uint32_t numSamplesRead32 = 0;

    uint32_t numSamplesClipped = 0;



    int16_t bps;

    int16_t samples[L_FRAME48k * AMBI_MAX_CHANNELS];

    int16_t samples[AMBI_MAX_FRAME_LENGTH * AMBI_MAX_CHANNELS];

    int16_t order = 0;

    int16_t numChannels;

    const char *name_conventions[6] = { "ACN-SN3D", "ACN-N3D", "FuMa-MaxN", "FuMa-FuMa", "SID-SN3D", "SID-N3D" };



    AMBI_FMT in_format, out_format;



    float samples_f_in[L_FRAME48k * AMBI_MAX_CHANNELS];

    float samples_f_out[L_FRAME48k * AMBI_MAX_CHANNELS];

    float samples_f_in[AMBI_MAX_FRAME_LENGTH * AMBI_MAX_CHANNELS];

    float samples_f_out[AMBI_MAX_FRAME_LENGTH * AMBI_MAX_CHANNELS];

    float *in[AMBI_MAX_CHANNELS], *out[AMBI_MAX_CHANNELS];



    for ( int16_t j = 0; j < AMBI_MAX_CHANNELS; j++ )

    {

        in[j] = &samples_f_in[j * L_FRAME48k];

        out[j] = &samples_f_out[j * L_FRAME48k];

        in[j] = &samples_f_in[j * AMBI_MAX_FRAME_LENGTH];

        out[j] = &samples_f_out[j * AMBI_MAX_FRAME_LENGTH];

    }



    printf( "Ambisonics converter program\n" );

    if ( argc != 5 )

    {

        printf( "Ambisonics converter program\n" );

        printf( "----------------------------------------------------------------------------------\n" );

        printf( "Usage:\n" );

        printf( "./ambi_conveter input_file output_file input_convention output_convention\n" );

        printf( "./ambi_converter input_file output_file input_convention output_convention\n" );

        printf( "\n" );

        printf( "input_convention and output convention must be an integer number in [0,5]\n" );

        printf( "the following conventions are supported:\n" );
@@ -97,8 +98,12 @@ int main( int argc, char *argv[] ) 
    fileName_out = argv[2];

    in_format = atoi( argv[3] );

    out_format = atoi( argv[4] );



    printf( "In %d, Out: %d\n", in_format, out_format );

    if ( in_format < 0 || out_format < 0 || in_format > 5 || out_format > 5 )

    {

        printf( "input_convention and output convention must be an integer number in [0,5]\n" );

        return -1;

    }

    printf( "In: [%s], Out: [%s]\n", name_conventions[in_format], name_conventions[out_format] );



    wavFile_in = OpenWav( fileName_in, &samplingRate, &numChannels, &samplesInFile, &bps );

    if ( !wavFile_in )
@@ -117,6 +122,7 @@ int main( int argc, char *argv[] ) 
    order = (int16_t) sqrtf( numChannels ) - 1;

    assert( order > 0 && order <= 3 );



    numSamples = ( samplingRate * 20 * numChannels ) / 1000; /* 20ms worth of samples */

    while ( ReadWavShort( wavFile_in, samples, numSamples, &numSamplesRead32 ) == __TWI_SUCCESS )

    {

        int32_t err = 0;
@@ -126,7 +132,7 @@ int main( int argc, char *argv[] ) 
            break;

        }



        for ( uint16_t i = 0; i < numSamplesRead32; i++ )

        for ( uint16_t i = 0; i < (uint16_t) numSamplesRead32 / numChannels; i++ )

        {

            for ( int16_t j = 0; j < numChannels; j++ )

            {
@@ -134,14 +140,14 @@ int main( int argc, char *argv[] ) 
            }

        }



        if ( ( err = convert_ambi_format( in, out, order, in_format, out_format ) ) != 0 )

        if ( ( err = convert_ambi_format( in, out, order, in_format, out_format, ( const uint16_t )( numSamples / numChannels ) ) ) != 0 )

        {

            printf( "Error converting the input signal!\n" );

            return err;

        }





        for ( uint16_t i = 0; i < numSamplesRead32; i++ )

        for ( uint16_t i = 0; i < (uint16_t) numSamplesRead32 / numChannels; i++ )

        {

            for ( int16_t j = 0; j < numChannels; j++ )

            {

apps/decoder.c

+0 −61
Original line number Diff line number Diff line
@@ -127,7 +127,6 @@ typedef struct 
    bool tsmEnabled;

    IVAS_RENDER_FRAMESIZE renderFramesize;

#ifdef DEBUGGING

    IVAS_DEC_FORCED_REND_MODE forcedRendMode;

#ifdef DEBUG_FOA_AGC

    FILE *agcBitstream; /* temporary */

#endif
@@ -180,7 +179,6 @@ static ivas_error load_hrtf_from_file( IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary 
#ifdef DEBUGGING

static ivas_error printBitstreamInfoVoip( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HANDLE hIvasDec );

static int16_t app_own_random( int16_t *seed );

static IVAS_DEC_FORCED_REND_MODE parseForcedRendModeDec( char *forcedRendModeChar );

#endif

static void do_object_editing( IVAS_EDITABLE_PARAMETERS *editableParameters, ObjectEditFileReader *objectEditFileReader );
@@ -537,28 +535,6 @@ int main( 
#endif

    }



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

     * Binaural rendering mode: set and print info

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



    if ( arg.forcedRendMode != IVAS_DEC_FORCE_REND_UNFORCED )

    {

        if ( ( error = IVAS_DEC_SetForcedRendMode( hIvasDec, arg.forcedRendMode ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError: Forcing binaural rendering mode failed (only TDREND and CLDFBREND are expected).\n\n" );

            goto cleanup;

        }



        if ( arg.forcedRendMode == IVAS_DEC_FORCE_REND_TD_RENDERER )

        {

            fprintf( stdout, "Forcing rendering to:   TD renderer\n" );

        }

        else if ( arg.forcedRendMode == IVAS_DEC_FORCE_REND_CLDFB_RENDERER )

        {

            fprintf( stdout, "Forcing rendering to:   CLDFB renderer\n" );

        }

    }



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

     * Open Error pattern file for simulation

     *-----------------------------------------------------------------*/
@@ -965,7 +941,6 @@ static bool parseCmdlIVAS_dec( 
#ifdef DEBUGGING

    float ftmp;



    arg->forcedRendMode = IVAS_DEC_FORCE_REND_UNFORCED;

#ifdef DEBUG_FOA_AGC

    arg->agcBitstream = NULL;

#endif
@@ -1135,17 +1110,6 @@ static bool parseCmdlIVAS_dec( 
            }

            i += 2;

        }

        else if ( strcmp( argv_to_upper, "-FORCE" ) == 0 )

        {

            i++;

            if ( i < argc - 3 )

            {

                strncpy( argv_to_upper, argv[i], sizeof( argv_to_upper ) - 1 );

                argv_to_upper[sizeof( argv_to_upper ) - 1] = '\0';

                arg->forcedRendMode = parseForcedRendModeDec( argv_to_upper );

                i++;

            }

        }

#ifdef DEBUG_MODE_INFO

#ifdef DEBUG_MODE_INFO_TWEAK

        /* Define additional subfolder for debug info output in ./res */
@@ -3900,31 +3864,6 @@ static void do_object_editing( 
}





#ifdef DEBUGGING



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

 * parseForcedRendModeDec()

 *

 *

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



static IVAS_DEC_FORCED_REND_MODE parseForcedRendModeDec(

    char *forcedRendModeChar )

{

    if ( ( strcmp( to_upper( forcedRendModeChar ), "TDREND" ) == 0 ) )

    {

        return IVAS_DEC_FORCE_REND_TD_RENDERER;

    }

    if ( ( strcmp( to_upper( forcedRendModeChar ), "CLDFBREND" ) == 0 ) )

    {

        return IVAS_DEC_FORCE_REND_CLDFB_RENDERER;

    }



    return IVAS_DEC_FORCE_REND_UNDEFINED;

}

#endif





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

 * load_hrtf_from_file()

 *

lib_com/ivas_prot.h

+0 −14
Original line number Diff line number Diff line
@@ -5161,20 +5161,6 @@ ivas_error ivas_allocate_binaural_hrtf( 
    const int16_t allocate_init_flag                            /* i  : Memory allocation flag                          */

);



#ifdef DEBUGGING

void ivas_binaural_cldfb(

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

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

);



void ivas_binaural_cldfb_sf(

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

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

    const int16_t slot_size,                                    /* i  : JBM slot size                                           */

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

);

#endif



void ivas_binRenderer(

    BINAURAL_RENDERER_HANDLE hBinRenderer,                      /* i/o: binaural renderer handle                                */

    const MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData,          /* i/o: pose correction data handle                             */

lib_com/options.h

+5 −0
Original line number Diff line number Diff line
@@ -169,6 +169,10 @@ 
#define FIX_1384_MSAN_ivas_spar_dec_open                /* VA: issue 1386: fix use-of-uninitialized value in ivas_spar_dec_open() */

#define FIX_1384_MSAN_stereo_tcx_core_enc               /* VA: issue 1384: fix use-of-uninitialized value in stereo_tcx_core_enc() */

#define FIX_1388_MSAN_ivas_init_decoder                 /* VA: issue 1388: fix use-of-uninitialized value in ivas_init_decoder() */

#define FIX_1383_HEAD_TRACK_SANITIZER                   /* Nok: issue 1383: Fix head tracking struc values reading in renderer */

#define FIX_1385_INIT_IGF_STOP_FREQ                     /* FhG: Initialize infoIGFStopFreq in init_igf_dec() */

#define FIX_1387_INIT_PRM_SQQ                           /* FhG: initialize pointer prm_sqQ, which might be uninitialized in case of bfi == 1 */





/* #################### End BE switches ################################## */
@@ -180,6 +184,7 @@ 
#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */ 

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define NONBE_1328_FIX_NON_LINEARITY                    /* VA: Fix possible issue when computing bwe_exc_extended and previous frame were almost 0  */

#define NONBE_1344_REND_MASA_LOW_FS                     /* Nokia: Issue 1344: Fix sanitizer errors when using IVAS_rend to render MASA with lower sampling rates */





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