Commit 0b4b6d4a authored by Nicolas Roussin's avatar Nicolas Roussin
Browse files

Add switch.

parent 66f90576

lib_com/options.h

+6 −0
Original line number Diff line number Diff line
@@ -126,4 +126,10 @@ 


/* #################### End BASOP porting switches ############################ */



/* #################### Start BASOP optimization switches ############################ */



#define NONBE_2157_IVAS_DIRAC_DEC_BINAURAL_FORMULATE_INPUT_COVARIANCE_MATRICES     /* Dolby: task 2157: optimize ivas_dirac_dec_binaural_formulate_input_covariance_matrices */



/* #################### End BASOP optimization switches ############################ */



#endif

lib_rend/ivas_dirac_dec_binaural_functions_fx.c

+104 −235

File changed.

Preview size limit exceeded, changes collapsed.

lib_rend/ivas_stat_rend.h

+2 −0
Original line number Diff line number Diff line
@@ -612,12 +612,14 @@ typedef struct ivas_dirac_dec_binaural_data_structure 
    Word16 q_processMtxDec;

    Word16 q_processMtxDecPrev;



#ifdef NONBE_2157_IVAS_DIRAC_DEC_BINAURAL_FORMULATE_INPUT_COVARIANCE_MATRICES

    Word64 ChEne[BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX];

    Word64 ChEnePrev[BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX];

    Word64 ChCrossRe[CLDFB_NO_CHANNELS_MAX];

    Word64 ChCrossRePrev[CLDFB_NO_CHANNELS_MAX];

    Word64 ChCrossIm[CLDFB_NO_CHANNELS_MAX];

    Word64 ChCrossImPrev[CLDFB_NO_CHANNELS_MAX];

#endif



    Word32 ChEnePrev_fx[BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX];

    Word32 ChCrossRePrev_fx[CLDFB_NO_CHANNELS_MAX];

lib_rend/lib_rend_fx.c

+9 −3
Original line number Diff line number Diff line
@@ -9924,20 +9924,26 @@ static ivas_error ivas_masa_ext_rend_parambin_init( 
            move16();

            move16();

            move16();

#ifdef NONBE_2157_IVAS_DIRAC_DEC_BINAURAL_FORMULATE_INPUT_COVARIANCE_MATRICES

            set64_fx( hDiracDecBin->ChEnePrev[j], 0, nBins );

#else

            set_zero_fx( hDiracDecBin->ChEnePrev_fx[j], nBins );

            set_zero_fx( hDiracDecBin->ChEneOutPrev_fx[j], nBins );

            set16_fx( hDiracDecBin->ChEnePrev_e[j], 0, nBins );

#endif

            set_zero_fx( hDiracDecBin->ChEneOutPrev_fx[j], nBins );

            set16_fx( hDiracDecBin->ChEneOutPrev_e[j], 0, nBins );

        }

#ifdef NONBE_2157_IVAS_DIRAC_DEC_BINAURAL_FORMULATE_INPUT_COVARIANCE_MATRICES

        set64_fx( hDiracDecBin->ChCrossRePrev, 0, nBins );

        set64_fx( hDiracDecBin->ChCrossImPrev, 0, nBins );

#else

        set_zero_fx( hDiracDecBin->ChCrossRePrev_fx, nBins );

        set_zero_fx( hDiracDecBin->ChCrossImPrev_fx, nBins );

        set_zero_fx( hDiracDecBin->ChCrossReOutPrev_fx, nBins );

        set_zero_fx( hDiracDecBin->ChCrossImOutPrev_fx, nBins );

        set16_fx( hDiracDecBin->ChCrossRePrev_e, 0, nBins );

        set16_fx( hDiracDecBin->ChCrossImPrev_e, 0, nBins );

#endif

        set_zero_fx( hDiracDecBin->ChCrossReOutPrev_fx, nBins );

        set_zero_fx( hDiracDecBin->ChCrossImOutPrev_fx, nBins );

        set16_fx( hDiracDecBin->ChCrossReOutPrev_e, 0, nBins );

        set16_fx( hDiracDecBin->ChCrossImOutPrev_e, 0, nBins );

        hDiracDecBin->renderStereoOutputInsteadOfBinaural = 0;