Commit 0fa5054a authored by multrus's avatar multrus
Browse files

[cleanup] accept NOKIA_PARAMBIN_REQULARIZATION

parent 3212029b

lib_com/options.h

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






#define NOKIA_PARAMBIN_REQULARIZATION                   /* Nokia: Contribution - Configured reqularization factor for parametric binauralizer. */

#define NOKIA_ADAPTIVE_BINAURAL_PROTOS                  /* Nokia: Contribution 28: Adaptive binaural prototypes */

#define NOKIA_ADAPTIVE_BINAURAL_PROTOS_OPT              /* Nokia: enable adaptive binaural prototype complexity optimizations */

lib_rend/ivas_dirac_dec_binaural_functions.c

+0 −14
Original line number Diff line number Diff line
@@ -102,9 +102,7 @@ static void matrixMul( float Are[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float Ai 


static void matrixTransp2Mul( float Are[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float Aim[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float Bre[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float Bim[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float outRe[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float outIm[BINAURAL_CHANNELS][BINAURAL_CHANNELS] );



#ifdef NOKIA_PARAMBIN_REQULARIZATION

static float configure_reqularization_factor( const IVAS_FORMAT ivas_format, const int32_t ivas_brate );

#endif



/*-------------------------------------------------------------------------

 * ivas_dirac_dec_init_binaural_data()
@@ -293,9 +291,7 @@ ivas_error ivas_dirac_dec_init_binaural_data( 
        ivas_td_decorr_dec_close( &( hBinaural->hTdDecorr ) );

    }



#ifdef NOKIA_PARAMBIN_REQULARIZATION

    hBinaural->reqularizationFactor = configure_reqularization_factor( st_ivas->ivas_format, st_ivas->hDecoderConfig->ivas_total_brate );

#endif



    st_ivas->hDiracDecBin = hBinaural;
@@ -1097,19 +1093,11 @@ static void ivas_dirac_dec_binaural_determine_processing_matrices( 
        CrEneR = 0.0f;



        /* Formulate main processing matrix M */

#ifdef NOKIA_PARAMBIN_REQULARIZATION

        formulate2x2MixingMatrix( h->ChEne[0][bin], h->ChEne[1][bin],

                                  h->ChCrossRe[bin], h->ChCrossIm[bin],

                                  h->ChEneOut[0][bin], h->ChEneOut[1][bin],

                                  h->ChCrossReOut[bin], h->ChCrossImOut[bin],

                                  prototypeMtx, Mre, Mim, h->reqularizationFactor );

#else

        formulate2x2MixingMatrix( h->ChEne[0][bin], h->ChEne[1][bin],

                                  h->ChCrossRe[bin], h->ChCrossIm[bin],

                                  h->ChEneOut[0][bin], h->ChEneOut[1][bin],

                                  h->ChCrossReOut[bin], h->ChCrossImOut[bin],

                                  prototypeMtx, Mre, Mim, 1.0f );

#endif



        /* Load estimated covariance matrix to the [2][2] matrix form */

        CxRe[0][0] = h->ChEne[0][bin];
@@ -2089,7 +2077,6 @@ static void hrtfShGetHrtf( 
}





#ifdef NOKIA_PARAMBIN_REQULARIZATION

/*-------------------------------------------------------------------------

 * configure_reqularization_factor()

 *
@@ -2165,4 +2152,3 @@ static float configure_reqularization_factor( 


    return reqularizationFactor;

}
 
#endif

lib_rend/ivas_stat_rend.h

+0 −2
Original line number Diff line number Diff line
@@ -140,9 +140,7 @@ typedef struct ivas_dirac_dec_binaural_data_structure 
    uint16_t useSubframeMode; /* 0 = process in 20 ms frames, 1 = process in 5 ms subframes */

    uint16_t useTdDecorr;

    ivas_td_decorr_state_t *hTdDecorr;

#ifdef NOKIA_PARAMBIN_REQULARIZATION

    float reqularizationFactor;

#endif



} DIRAC_DEC_BIN_DATA, *DIRAC_DEC_BIN_HANDLE;