Commit 006a23c4 authored by emerit's avatar emerit
Browse files

rename switch

parent f519dd42

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ 


#define FIX_1576_LCLD_CRASH_DIFFERENT_CODEC_ISAR_FRAME_SIZE  /* Dolby: float issue 1576: fix for crash in LCLD mode when codec frame size is less than isar frame size */

#define FIX_2585_BIT_ALLOCATION_DIFF                    /* VA : issue 2585, bit allocation different behaviors between float and fixed-point for corner cases */

//#define FIX_1134_BRIR_LEVEL_DIFFERENCE                /* FhG: fix for issue 1134, level difference between BRIR and HRIR filters in DFT stereo */ 

//#define FIX_1134_HRIR_BRIR_LEVEL_DIFFERENCE                /* FhG: fix for issue 1134, level difference between BRIR and HRIR filters in DFT stereo */ 

#define FIX_BASOP_2442_MASA2TC_TO_MONO_AND_AMBI         /* Nokia: BASOP issue 2442: Aligns float with identical diffuse gain limitation to minimize diff */



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

lib_rend/ivas_dirac_dec_binaural_functions.c

+6 −6
Original line number Diff line number Diff line
@@ -665,13 +665,13 @@ static void ivas_dirac_dec_binaural_internal( 
                    /* LB: Copy first channel + LB-CNG to first and second channels with same scaling (dual-mono)*/

                    for ( b = 0; b < numCoreBands; b++ )

                    {

#ifdef FIX_1134_BRIR_LEVEL_DIFFERENCE

#ifdef FIX_1134_HRIR_BRIR_LEVEL_DIFFERENCE

                        Cldfb_RealBuffer_in[0][slot][b] = ( Cldfb_RealBuffer_in[0][slot][b] + Cldfb_RealBuffer_in[2][slot][b] );

#else

                        Cldfb_RealBuffer_in[0][slot][b] = INV_SQRT2 * ( Cldfb_RealBuffer_in[0][slot][b] + Cldfb_RealBuffer_in[2][slot][b] );

#endif

                        Cldfb_RealBuffer_in[1][slot][b] = Cldfb_RealBuffer_in[0][slot][b];

#ifdef FIX_1134_BRIR_LEVEL_DIFFERENCE

#ifdef FIX_1134_HRIR_BRIR_LEVEL_DIFFERENCE

                        Cldfb_ImagBuffer_in[0][slot][b] = ( Cldfb_ImagBuffer_in[0][slot][b] + Cldfb_ImagBuffer_in[2][slot][b] );

#else

                        Cldfb_ImagBuffer_in[0][slot][b] = INV_SQRT2 * ( Cldfb_ImagBuffer_in[0][slot][b] + Cldfb_ImagBuffer_in[2][slot][b] );
@@ -682,12 +682,12 @@ static void ivas_dirac_dec_binaural_internal( 
                    /* HB: Copy first channel to second channel and add HB-CNGs with different scalings*/

                    for ( ; b < nBins; b++ )

                    {

#ifndef FIX_1134_BRIR_LEVEL_DIFFERENCE

#ifndef FIX_1134_HRIR_BRIR_LEVEL_DIFFERENCE

                        Cldfb_RealBuffer_in[0][slot][b] *= INV_SQRT2;

#endif

                        Cldfb_RealBuffer_in[1][slot][b] = Cldfb_RealBuffer_in[0][slot][b] + 0.5f * Cldfb_RealBuffer_in[1][slot][b] + Cldfb_RealBuffer_in[0][slot][b];

                        Cldfb_RealBuffer_in[0][slot][b] += 0.5f * Cldfb_RealBuffer_in[2][slot][b];

#ifndef FIX_1134_BRIR_LEVEL_DIFFERENCE

#ifndef FIX_1134_HRIR_BRIR_LEVEL_DIFFERENCE

                        Cldfb_ImagBuffer_in[0][slot][b] *= INV_SQRT2;

#endif

                        Cldfb_ImagBuffer_in[1][slot][b] = Cldfb_ImagBuffer_in[0][slot][b] + 0.5f * Cldfb_ImagBuffer_in[1][slot][b];
@@ -698,7 +698,7 @@ static void ivas_dirac_dec_binaural_internal( 
                {

                    /* At mono input duplicate the channel to dual-mono, and apply gain

                    correction to ensure same overall level as in stereo mode  */

#ifndef FIX_1134_BRIR_LEVEL_DIFFERENCE

#ifndef FIX_1134_HRIR_BRIR_LEVEL_DIFFERENCE

                    v_multc( Cldfb_RealBuffer_in[0][slot], INV_SQRT_2, Cldfb_RealBuffer_in[0][slot], nBins );

                    v_multc( Cldfb_ImagBuffer_in[0][slot], INV_SQRT_2, Cldfb_ImagBuffer_in[0][slot], nBins );

#endif
@@ -717,7 +717,7 @@ static void ivas_dirac_dec_binaural_internal( 
                    Cldfb_RealBuffer_in[ch][slot],

                    Cldfb_ImagBuffer_in[ch][slot],

                    nBins, st_ivas->cldfbAnaDec[ch] );

#ifndef FIX_1134_BRIR_LEVEL_DIFFERENCE

#ifndef FIX_1134_HRIR_BRIR_LEVEL_DIFFERENCE

                if ( config_data.nchan_transport == 1 &&

                     ( config_data.ivas_format == SBA_FORMAT || config_data.ivas_format == SBA_ISM_FORMAT ) )

                {

lib_rend/ivas_sba_rendering.c

+2 −2
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ void ivas_sba_prototype_renderer( 
                v_add( inRe[0][ts], inRe[1][ts], temp_signal, CLDFB_NO_CHANNELS_MAX );

                v_sub( inRe[0][ts], inRe[1][ts], inRe[1][ts], CLDFB_NO_CHANNELS_MAX );

                mvr2r( temp_signal, inRe[0][ts], CLDFB_NO_CHANNELS_MAX );

#ifdef FIX_1134_BRIR_LEVEL_DIFFERENCE

#ifdef FIX_1134_HRIR_BRIR_LEVEL_DIFFERENCE

                v_multc( inRe[0][ts], INV_SQRT2, inRe[0][ts], CLDFB_NO_CHANNELS_MAX );

                v_multc( inRe[1][ts], INV_SQRT2, inRe[1][ts], CLDFB_NO_CHANNELS_MAX );

#else
@@ -200,7 +200,7 @@ void ivas_sba_prototype_renderer( 
                v_add( inIm[0][ts], inIm[1][ts], temp_signal, CLDFB_NO_CHANNELS_MAX );

                v_sub( inIm[0][ts], inIm[1][ts], inIm[1][ts], CLDFB_NO_CHANNELS_MAX );

                mvr2r( temp_signal, inIm[0][ts], CLDFB_NO_CHANNELS_MAX );

#ifdef FIX_1134_BRIR_LEVEL_DIFFERENCE

#ifdef FIX_1134_HRIR_BRIR_LEVEL_DIFFERENCE

                v_multc( inIm[0][ts], INV_SQRT2, inIm[0][ts], CLDFB_NO_CHANNELS_MAX );

                v_multc( inIm[1][ts], INV_SQRT2, inIm[1][ts], CLDFB_NO_CHANNELS_MAX );

#else