Commit c18288a4 authored by Jan Kiene's avatar Jan Kiene
Browse files

activate deactivated part of optimization switch again 

+ fix some problems with it, not completely fine yet
parent 78d346ce

lib_dec/ivas_binRenderer_internal_fx.c

+8 −8
Original line number Diff line number Diff line
@@ -74,9 +74,9 @@ static void ivas_binRenderer_filterModule_fx( 
    move16();



    // Todo main-pc update: This needs work

#ifdef OPT_BIN_REND_V2_NBE_local_disabled

#ifdef OPT_BIN_REND_V2_NBE

    shift_q = add( sub( Q_filterStates, Q_curr ), 1 );

    hBinRenderer->hBinRenConvModule->Q_filterStatesLeft = Q_curr;

    hBinRenderer->hBinRenConvModule->Q_filterStates[pos_idx] = Q_curr;

#else  /* OPT_BIN_REND_V2_NBE */

    Word64 Cldfb_RealBuffer_64fx[BINAURAL_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES];

    Word64 Cldfb_ImagBuffer_64fx[BINAURAL_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES];
@@ -85,7 +85,7 @@ static void ivas_binRenderer_filterModule_fx( 
    FOR( bandIdx = 0; bandIdx < hBinRenderer->conv_band; bandIdx++ )

    {

        // Todo main-pc update: This needs work

#ifndef OPT_BIN_REND_V2_NBE_local_disabled

#ifndef OPT_BIN_REND_V2_NBE

        set64_fx( &Cldfb_RealBuffer_64fx[0][0], 0, BINAURAL_CHANNELS * MAX_PARAM_SPATIAL_SUBFRAMES );

        set64_fx( &Cldfb_ImagBuffer_64fx[0][0], 0, BINAURAL_CHANNELS * MAX_PARAM_SPATIAL_SUBFRAMES );
@@ -108,7 +108,7 @@ static void ivas_binRenderer_filterModule_fx( 
                move64();

                move64();

                // Todo main-pc update: This needs work

#ifdef OPT_BIN_REND_V2_NBE_local_disabled

#ifdef OPT_BIN_REND_V2_NBE

                Word64 outRealLeft = 0, outRealRight = 0, outImagLeft = 0, outImagRight = 0;

                move64();

                move64();
@@ -117,8 +117,8 @@ static void ivas_binRenderer_filterModule_fx( 


                FOR( chIdx = 0; chIdx < hBinRenderer->nInChannels; chIdx++ )

                {

                    filterStatesLeftRealPtr_fx = (Word32 *) &( hBinRenderer->hBinRenConvModule->filterStatesLeftReal_fx[bandIdx][chIdx][0] );

                    filterStatesLeftImagPtr_fx = (Word32 *) &( hBinRenderer->hBinRenConvModule->filterStatesLeftImag_fx[bandIdx][chIdx][0] );

                    filterStatesLeftRealPtr_fx = (Word32 *) &( hBinRenderer->hBinRenConvModule->filterStatesLeftReal_fx[pos_idx][bandIdx][chIdx][0] );

                    filterStatesLeftImagPtr_fx = (Word32 *) &( hBinRenderer->hBinRenConvModule->filterStatesLeftImag_fx[pos_idx][bandIdx][chIdx][0] );



                    filterTapsLeftRealPtr_fx = hBinRenderer->hBinRenConvModule->filterTapsLeftReal_fx[bandIdx][chIdx];   // Q29

                    filterTapsLeftImagPtr_fx = hBinRenderer->hBinRenConvModule->filterTapsLeftImag_fx[bandIdx][chIdx];   // Q29
@@ -149,7 +149,7 @@ static void ivas_binRenderer_filterModule_fx( 
                    }



                    // Todo main-pc update: This needs work

#ifndef OPT_BIN_REND_V2_NBE_local_disabled

#ifndef OPT_BIN_REND_V2_NBE

                    shift_q = add( sub( Q_filterStates, Q_curr ), 1 );



                    IF( shift_q != 0 )
@@ -168,7 +168,7 @@ static void ivas_binRenderer_filterModule_fx( 
                    move32();



                    // Todo main-pc update: This needs work

#ifdef OPT_BIN_REND_V2_NBE_local_disabled

#ifdef OPT_BIN_REND_V2_NBE

                    /* Left Real and Imag */

                    Word32 neg_temp2 = L_negate( filterStatesLeftImagPtr_fx[0] ); // Q_curr -1