Commit 61af024d authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch '2106_ref_several_small_code_improvements' into 'ivas-float-update' 

2106 Port several small code improvements from float to ivas-float-update

See merge request !2384
parents f586c72d f4f6c9b1

apps/decoder.c

+2 −4
Original line number Diff line number Diff line
@@ -1922,7 +1922,6 @@ static ivas_error initOnFirstGoodFrame( 
        }

    }





    int16_t pcmFrameSize;

    if ( ( error = IVAS_DEC_GetOutputBufferSize( hIvasDec, &pcmFrameSize ) ) != IVAS_ERR_OK )

    {
@@ -1930,13 +1929,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 )

    {
@@ -1960,7 +1959,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
@@ -185,6 +185,7 @@ 
#define FIX_RENDERER_STACK                              /* VA: issue 1322: reduction of renderers' buffers size */

#define FIX_1370_EXTERNAL_ORIENTATION_CHECK             /* Nokia: add sanity check for Euler angles for external orientations */

#define FIX_1413_IGF_INIT_PRINTOUT                      /* FhG: use correct variable for IGF initiliazation */

#define CODE_IMPROVEMENTS



// object-editing feature porting

#define FIX_HRTF_LOAD_API                               // solves API conflicts between HRTF and object-editing features

lib_com/tools.c

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

    float x )

{

#ifdef CODE_IMPROVEMENTS

    int16_t retval;

#define WMC_TOOL_SKIP

    retval = (int16_t) ( !isnan( x ) && !isinf( x ) );

#undef WMC_TOOL_SKIP

    return retval;

#else

    union float_int

    {

        float float_val;
@@ -1751,6 +1758,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
@@ -838,7 +838,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 )

        {

lib_rend/ivas_rom_rend.c

+6 −0
Original line number Diff line number Diff line
@@ -163,9 +163,15 @@ const float ap_lattice_coeffs_3[DIRAC_DECORR_FILTER_LEN_3*DIRAC_MAX_NUM_DECORR_F 


const float * const ap_lattice_coeffs[DIRAC_DECORR_NUM_SPLIT_BANDS] =

{

#ifdef CODE_IMPROVEMENTS

    ap_lattice_coeffs_1,

    ap_lattice_coeffs_2,

    ap_lattice_coeffs_3,

#else

    &ap_lattice_coeffs_1[0],

    &ap_lattice_coeffs_2[0],

    &ap_lattice_coeffs_3[0],

#endif

};



const float ap_split_frequencies[DIRAC_DECORR_NUM_SPLIT_BANDS + 1] =