Commit b3a9f5f9 authored by kinuthia's avatar kinuthia
Browse files

Merge branch 'main' into 1353-6-dof-headtracking-not-described-in-readme-txt

parents cd6816b6 3445eea4

.gitlab-ci.yml

+3 −0
Original line number Diff line number Diff line
@@ -1251,6 +1251,7 @@ ivas-conformance: 
    - cp -force IVAS_cod.exe IVAS_cod_ref.exe

    - cp -force IVAS_dec.exe IVAS_dec_ref.exe

    - cp -force IVAS_rend.exe IVAS_rend_ref.exe 

    - cp -force ISAR_post_rend.exe ISAR_post_rend_ref.exe

    

    # Reference creation

    - python scripts/prepare_combined_format_inputs.py
@@ -1316,6 +1317,7 @@ ivas-conformance: 
    expire_in: 1 week

    when: always

    paths:

      - report_cmd.html

      - report-junit.xml

      - report.html

      - Readme_IVAS_dec.txt
@@ -1344,6 +1346,7 @@ ivas-conformance-linux: 
    - cp IVAS_cod IVAS_cod_ref

    - cp IVAS_dec IVAS_dec_ref

    - cp IVAS_rend IVAS_rend_ref

    - cp ISAR_post_rend ISAR_post_rend_ref

    

    # Reference creation

    - python3 scripts/prepare_combined_format_inputs.py

apps/decoder.c

+2 −3
Original line number Diff line number Diff line
@@ -1858,13 +1858,13 @@ static ivas_error initOnFirstGoodFrame( 
        return error;

    }



    int16_t *zeroBuf = malloc( pcmFrameSize * sizeof( int16_t ) );

    /* Write zeros to the output audio buffer */

    int16_t *zeroBuf = calloc( pcmFrameSize, sizeof( int16_t ) );

    if ( zeroBuf == NULL )

    {

        fprintf( stdout, "Error: Unable to allocate memory for output buffer.\n" );

        return IVAS_ERR_FAILED_ALLOC;

    }

    memset( zeroBuf, 0, pcmFrameSize * sizeof( int16_t ) );



    for ( int16_t i = 0; i < numInitialBadFrames; ++i )

    {
@@ -1888,7 +1888,6 @@ static ivas_error initOnFirstGoodFrame( 
        }

        else

        {



            if ( *pRemainingDelayNumSamples < *numOutSamples )

            {

                if ( ( error = AudioFileWriter_write( *ppAfWriter, zeroBuf, *numOutSamples * *pNumOutChannels - ( *pRemainingDelayNumSamples * *pNumOutChannels ) ) ) != IVAS_ERR_OK )

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ 


/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define TMP_FIX_1119_SPLIT_RENDERING_VOIP               /* FhG: Add error check for unsupported config: split rendering with VoIP mode */

/*#define CODE_IMPROVEMENTS*/                               /* FhG: Small code improvements that do not change the functionality */



/* #################### End BE switches ################################## */

lib_com/tools.c

+6 −0
Original line number Diff line number Diff line
@@ -1742,6 +1742,11 @@ double anint( 
int16_t is_numeric_float(

    float x )

{

#ifdef CODE_IMPROVEMENTS

#define WMC_TOOL_SKIP

    return (int16_t) ( !isnan( x ) && !isinf( x ) );

#undef WMC_TOOL_SKIP

#else

#ifndef BASOP_NOGLOB

    union float_int

#else  /* BASOP_NOGLOB */
@@ -1755,6 +1760,7 @@ int16_t is_numeric_float( 
    float_int.float_val = x;



    return ( ( float_int.int_val & 0x7f800000 ) != 0x7f800000 );

#endif

}



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

lib_debug/debug.c

+1 −1
Original line number Diff line number Diff line
@@ -820,7 +820,7 @@ int16_t make_dirs( const char *const pathname ) 


    if ( sep != 0 )

    {

        temp = calloc( 1, strlen( pathname ) + 1 );

        temp = calloc( strlen( pathname ) + 1, sizeof( char ) );

        p = pathname;

        while ( ( p = strchr( p, sep ) ) != NULL )

        {