Commit c4361f07 authored by vaclav's avatar vaclav
Browse files

accept NONBE_FIX_819_DOUBLE_PREC_COMB_FORMATS

parent ce372499

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ 
/* any switch which is non-be wrt selection floating point code */

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



#define NONBE_FIX_819_DOUBLE_PREC_COMB_FORMATS                /* VA: issue 820: Double precision arithmetic in combined formats */

#define NONBE_FIX_849_OMASA_BFI_CRASH                         /* VA: issue 849: fix OMASA 2TC and FEC crashes */

#define NONBE_FIX_856_TCX_LTP_SYNTH_FILTER                    /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/

lib_enc/ivas_omasa_enc.c

+0 −4
Original line number Diff line number Diff line
@@ -127,11 +127,7 @@ ivas_error ivas_omasa_enc_open( 


    for ( i = 0; i < MAX_NUM_OBJECTS; i++ )

    {

#ifdef NONBE_FIX_819_DOUBLE_PREC_COMB_FORMATS

        set_f( hOMasa->prev_object_dm_gains[i], INV_SQRT_2, MASA_MAX_TRANSPORT_CHANNELS );

#else

        set_f( hOMasa->prev_object_dm_gains[i], (float) sqrt( 0.5 ), MASA_MAX_TRANSPORT_CHANNELS );

#endif

    }

    set_zero( hOMasa->broadband_energy_sm, MAX_NUM_OBJECTS + MASA_MAX_TRANSPORT_CHANNELS );

    set_zero( hOMasa->broadband_energy_prev, MAX_NUM_OBJECTS + MASA_MAX_TRANSPORT_CHANNELS );

lib_enc/ivas_osba_enc.c

+0 −5
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ ivas_error ivas_osba_enc_open( 
    int16_t len;

    error = IVAS_ERR_OK;





    if ( ( hOSba = (OSBA_ENC_HANDLE) malloc( sizeof( OSBA_ENC_DATA ) ) ) == NULL )

    {

        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for OMASA encoder\n" ) );
@@ -104,11 +103,7 @@ ivas_error ivas_osba_enc_open( 


    for ( i = 0; i < MAX_NUM_OBJECTS; i++ )

    {

#ifdef NONBE_FIX_819_DOUBLE_PREC_COMB_FORMATS

        set_f( hOSba->prev_object_dm_gains[i], INV_SQRT_2, MAX_INPUT_CHANNELS );

#else

        set_f( hOSba->prev_object_dm_gains[i], (float) sqrt( 0.5 ), MAX_INPUT_CHANNELS );

#endif

    }



    len = NS2SA( st_ivas->hEncoderConfig->input_Fs, IVAS_FB_ENC_DELAY_NS );

lib_rend/ivas_omasa_ana.c

+0 −4
Original line number Diff line number Diff line
@@ -150,11 +150,7 @@ ivas_error ivas_omasa_ana_open( 


    for ( i = 0; i < MAX_NUM_OBJECTS; i++ )

    {

#ifdef NONBE_FIX_819_DOUBLE_PREC_COMB_FORMATS

        set_f( hOMasa->prev_object_dm_gains[i], INV_SQRT_2, MASA_MAX_TRANSPORT_CHANNELS );

#else

        set_f( hOMasa->prev_object_dm_gains[i], (float) sqrt( 0.5 ), MASA_MAX_TRANSPORT_CHANNELS );

#endif

    }



    input_frame = (int16_t) ( input_Fs / FRAMES_PER_SEC );