Commit 3e395de1 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_977_OSBA_GAIN_MISMATCH

parent 1c41671d

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ 
/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES             /* Philips: Use pre-computed HRTF average L/R energies and IAC in all renderers */

#define NONBE_FIX_977_OSBA_GAIN_MISMATCH                      /* Dlb : issue 977 : Output gain mismatch for different bit rates in OSBA */

#define NONBE_FIX_973_HODIRAC_BAND_GROUPING                   /* FhG: issue 973: empty parameter band in DirAC */

#define NONBE_FIX_951_MCMASA_5MS_RENDERING                    /* Nokia: issue #951: Differences for 5ms and 20ms rendering for McMASA at 13.2 kbps to BINAURAL */

#define NONBE_FIX_979_OSBA_STEREO_5MS                           /* FhG : issue #979 : 5ms and 20ms output different for OSBA and stereo */

lib_enc/ivas_osba_enc.c

+0 −17
Original line number Diff line number Diff line
@@ -72,11 +72,7 @@ static void ivas_merge_sba_transports( 
    {

        for ( j = 0; j < input_frame; j++ )

        {

#ifdef NONBE_FIX_977_OSBA_GAIN_MISMATCH

            data_out_f[i][j] = 0.5f * ( data_in_f1[i][j] + data_in_f2[i][j] );

#else

            data_out_f[i][j] = ( data_in_f1[i][j] + data_in_f2[i][j] );

#endif

        }

    }
@@ -447,9 +443,6 @@ static void ivas_osba_render_ism_to_sba( 
    int16_t azimuth, elevation;

    float gains[MAX_INPUT_CHANNELS];

    float g1, g2;

#ifndef NONBE_FIX_977_OSBA_GAIN_MISMATCH

    float output_gain;

#endif



    int16_t nchan_sba;
@@ -484,16 +477,6 @@ static void ivas_osba_render_ism_to_sba( 
    }



    /* Gain with loudness-matching gains */

#ifndef NONBE_FIX_977_OSBA_GAIN_MISMATCH

    output_gain = 0.7499f;

    for ( j = 0; j < nchan_sba; j++ )

    {

        for ( k = 0; k < input_frame; k++ )

        {

            data_out_f[j][k] *= output_gain;

        }

    }

#endif



    return;

}