Commit 91cb634e authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

rename FIX_1518 to FIX_FLOAT_1518

parent 7d67d94b

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ 
#define FIX_FLOAT_1493_MASA_ENCODE_STABILITY_IMPROVE    /* Nokia: float issue 1493: Improves float decision stability in MASA encoding by adjusting reduction code */



#define FIX_2432_ISM_SPIKES_16KHZ                       /* VA: basop issue 2432: fix spikes in ISM decoding at 16kHz output sampling rate */

#define FIX_1518

#define FIX_FLOAT_1518                                  /* FhG: fix issue 1518: loudness differences in OSBA decoding to mono or stereo output */



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

lib_dec/ivas_cpe_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -500,12 +500,12 @@ ivas_error ivas_cpe_dec( 


    if ( hCPE->element_mode == IVAS_CPE_MDCT && hCPE->nchan_out == 1 && ( is_DTXrate( ivas_total_brate ) == 0 || ( is_DTXrate( ivas_total_brate ) == 1 && is_DTXrate( st_ivas->hDecoderConfig->last_ivas_total_brate ) == 0 ) ) )

    {

#ifdef FIX_1518

#ifdef FIX_FLOAT_1518

        if ( !( st_ivas->ivas_format == SBA_ISM_FORMAT && st_ivas->ism_mode == ISM_MODE_NONE ) )

        {

#endif

            applyDmxMdctStereo( hCPE, output, output_frame );

#ifdef FIX_1518

#ifdef FIX_FLOAT_1518

        }

#endif

    }

lib_dec/ivas_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ ivas_error ivas_dec( 
    {

        int16_t nchan_ism, sba_ch_idx;



#ifdef FIX_1518

#ifdef FIX_FLOAT_1518

        int16_t sba_mono_flag = ( st_ivas->hDecoderConfig->nchan_out == 1 ) ? 1 : 0;

#endif
@@ -447,7 +447,7 @@ ivas_error ivas_dec( 


            ivas_sba_dirac_stereo_dec( st_ivas, &p_output[sba_ch_idx], output_frame );

        }

#ifdef FIX_1518

#ifdef FIX_FLOAT_1518

        else if ( sba_mono_flag && st_ivas->ism_mode == ISM_MODE_NONE )

        {

            v_multc( p_output[0], 2.0f, p_output[0], output_frame );

lib_dec/ivas_sba_dirac_stereo_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -910,7 +910,7 @@ void ivas_sba_dirac_stereo_dec( 
    synchro_synthesis( st_ivas->hDecoderConfig->ivas_total_brate, hCPE, output, output_frame, 1 /*st_ivas->sba_dirac_stereo_flag*/ );



    /* output scaling */

#ifdef FIX_1518

#ifdef FIX_FLOAT_1518

    if ( !( st_ivas->ivas_format == SBA_ISM_FORMAT && st_ivas->ism_mode == ISM_MODE_NONE ) )

    {

#endif
@@ -919,7 +919,7 @@ void ivas_sba_dirac_stereo_dec( 
            v_multc( output[0], 0.5f, output[0], output_frame );

            v_multc( output[1], 0.5f, output[1], output_frame );

        }

#ifdef FIX_1518

#ifdef FIX_FLOAT_1518

    }

#endif