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

[cleanup] accept FIX_647_SILENT_W_PARAMBIN

parent eb7694e6

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ 






#define FIX_647_SILENT_W_PARAMBIN                       /* Nokia: Issue #647: Fix silent W SH inputs in parametric binauralizer */



#define FIX_672_NOKIA_TODO                              /* Nokia: Issue #672: Resolve Nokia TODOs */

#define MASA_AND_OBJECTS                                /* Nokia: Combination of MASA and objects */

lib_rend/ivas_dirac_dec_binaural_functions.c

+0 −13
Original line number Diff line number Diff line
@@ -55,9 +55,7 @@ 
#define CLDFB_HALF_BIN_FREQUENCY_OFFSET         0.5f

#define IVAS_TDET_DUCK_MULT_FAC_PARA_BIN        ( 2.0f )

#define IVAS_TDET_DUCK_MULT_FAC_PARA_BIN_LOW_BR ( 3.0f )

#ifdef FIX_647_SILENT_W_PARAMBIN

#define SBA_CARDI_TARGET_ENERGY_GAIN 0.5f

#endif



#ifdef MASA_AND_OBJECTS

#define STEREO_PREPROCESS_IIR_FACTOR ( 0.9f )
@@ -1298,36 +1296,25 @@ static void ivas_dirac_dec_binaural_formulate_input_covariance_matrices( 
#endif

    {

        float tempRe, tempIm;

#ifdef FIX_647_SILENT_W_PARAMBIN

        float subFrameSumEne[CLDFB_NO_CHANNELS_MAX];



        v_multc( subFrameTotalEne, SBA_CARDI_TARGET_ENERGY_GAIN, subFrameTotalEne, nBins );



        set_zero( subFrameSumEne, CLDFB_NO_CHANNELS_MAX );

#else

        set_zero( subFrameTotalEne, CLDFB_NO_CHANNELS_MAX );



#endif

        for ( slot = 0; slot < hSpatParamRendCom->subframe_nbslots[subframe]; slot++ )

        {

            for ( bin = 0; bin < nBins; bin++ )

            {

                tempRe = inRe[0][slot][bin] + inRe[1][slot][bin];

                tempIm = inIm[0][slot][bin] + inIm[1][slot][bin];

#ifdef FIX_647_SILENT_W_PARAMBIN

                subFrameSumEne[bin] += tempRe * tempRe + tempIm * tempIm;

#else

                subFrameTotalEne[bin] += tempRe * tempRe + tempIm * tempIm;

#endif

            }

        }



#ifdef FIX_647_SILENT_W_PARAMBIN

        for ( bin = 0; bin < nBins; bin++ )

        {

            subFrameTotalEne[bin] = max( subFrameTotalEne[bin], subFrameSumEne[bin] );

        }

#endif

    }



    /* Temporal IIR-type smoothing of covariance matrices. Also apply encoding quality based smoothing factor. */