Commit 000b4267 authored by Jan Kiene's avatar Jan Kiene
Browse files

port changes from MR 2132 (except for missing obj ed file stuff)

parent 9a4b86ac

apps/decoder.c

+4 −1
Original line number Diff line number Diff line
@@ -2036,8 +2036,12 @@ static ivas_error initOnFirstGoodFrame( 
        }

    }



#ifdef CODE_IMPROVEMENTS

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

#else

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

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

#endif



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

    {
@@ -2061,7 +2065,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
@@ -211,6 +211,7 @@ 
#define NONBE_1200_ISM_JBM_BRATE_SW_FLUSH               /* VA: issue 1200: fix bug in renderer flush in ISM JBM bitrate switching */

#define NONBE_1293_CRASH_FIRST_FRAME_LOST               /* VA: issue 1293: fix G.192 decoder crash when first frame is lost */

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

#define CODE_IMPROVEMENTS



// object-editing feature porting

#define OBJ_EDITING_API                                 /* object editing changes related to the API */

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

    union float_int

    {

        float float_val;
@@ -1751,6 +1756,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] =