Commit 3a818c14 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

Revert all changes but FIX_2436_CLDFBANAHANDLE_ADRESS

parent ee8a9aef

lib_com/cldfb_fx.c

+1 −0
Original line number Diff line number Diff line
@@ -1428,6 +1428,7 @@ ivas_error openCldfb_ivas_fx( 
    return IVAS_ERR_OK;

}





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

 * resampleCldfb_ivas()

 *

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ 
#define FIX_2431_AVOID_CALLOC                           /* VA: basp issue 2431: avoid use of calloc() */

#define FIX_2424_REMOVE_GAUSS_L2_ENC                    /* VA: basop issue 2424: Remove duplicated code in gauss_L2_ivas_fx() */





/* #################### End BE switches ################################## */



/* #################### Start NON-BE switches ############################ */

lib_com/stat_com.h

+0 −1
Original line number Diff line number Diff line
@@ -656,7 +656,6 @@ typedef struct ivas_cldfb_filter_bank_struct 
    /* main filter state */

    Word32 *cldfb_state_fx; // Q_cldfb_state

    Word16 cldfb_state_length;

    Word16 cldfb_state_multiStates; /*multiple states per channel*/

    Word16 cldfb_size;

    Word16 Q_cldfb_state;

lib_isar/lib_isar_pre_rend.c

+37 −36
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
#include "isar_rom_post_rend.h"

#include "lib_isar_pre_rend.h"

#include "isar_prot.h"



#ifdef DEBUGGING

#include "debug.h"

#endif
@@ -117,9 +116,11 @@ ivas_error ISAR_PRE_REND_open( 


        num_ch = hSplitRendWrapper->multiBinPoseData.num_poses * BINAURAL_CHANNELS;



        FOR( ch = 0; ch < num_ch; ch++ ){

        FOR( ch = 0; ch < num_ch; ch++ )

        {

            IF( ( error = openCldfb_ivas_fx( &( hSplitRendWrapper->hCldfbHandles->cldfbAna[ch] ),

                                             CLDFB_ANALYSIS, OutSampleRate, CLDFB_PROTOTYPE_5_00MS, DEC ) ) != IVAS_ERR_OK ){

                                             CLDFB_ANALYSIS, OutSampleRate, CLDFB_PROTOTYPE_5_00MS, DEC ) ) != IVAS_ERR_OK )

            {

                return error;

            }

        }

lib_rend/lib_rend_fx.c

+52 −52
Original line number Diff line number Diff line
@@ -4388,14 +4388,17 @@ static ivas_error isar_pre_rend_init( 
    }



    /* these functions should only be called once during initial allocation */

    IF( pSplitRendEncBuffer->data_fx == NULL ){

        IF( EQ_32( pSplit_rend_config->poseCorrectionMode, ISAR_SPLIT_REND_POSE_CORRECTION_MODE_CLDFB ) ){

    IF( pSplitRendEncBuffer->data_fx == NULL )

    {

        IF( EQ_32( pSplit_rend_config->poseCorrectionMode, ISAR_SPLIT_REND_POSE_CORRECTION_MODE_CLDFB ) )

        {

            ISAR_PRE_REND_GetMultiBinPoseData( pSplit_rend_config, &pSplitRendWrapper->multiBinPoseData, headRotData.sr_pose_pred_axis );

        }

        ELSE IF( EQ_32( pSplit_rend_config->poseCorrectionMode, ISAR_SPLIT_REND_POSE_CORRECTION_MODE_NONE ) )

        {

            isar_renderSplitUpdateNoCorrectionPoseData( pSplit_rend_config, &pSplitRendWrapper->multiBinPoseData );

        }



        IF( ( error = ISAR_PRE_REND_open( pSplitRendWrapper, pSplit_rend_config, outputSampleRate, cldfb_in_flag, outConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM, num_subframes, 0 ) ) != IVAS_ERR_OK )

        {

            return error;
@@ -7305,7 +7308,6 @@ static ivas_error renderActiveInputsIsm( 
    ivas_error error;

    Word16 input_q = outAudio.q_factor;

    move16();



    FOR( ( i = 0, pCurrentInput = hIvasRend->inputsIsm ); i < RENDERER_MAX_ISM_INPUTS; ( ++i, ++pCurrentInput ) )

    {

        IF( EQ_32( pCurrentInput->base.inConfig, IVAS_AUDIO_CONFIG_INVALID ) )
@@ -7320,7 +7322,6 @@ static ivas_error renderActiveInputsIsm( 
        {

            return error;

        }



        FOR( Word16 j = 0; j < outAudio.config.numSamplesPerChannel * outAudio.config.numChannels; ++j )

        {

            outAudio.data_fx[j] = L_shl( outAudio.data_fx[j], sub( sub( input_q, 1 ), ( *outAudio.pq_fact ) ) ); /* Q(input_q - 1) */
@@ -7329,7 +7330,6 @@ static ivas_error renderActiveInputsIsm( 
        *outAudio.pq_fact = sub( input_q, 1 );

        move16();

    }



    return IVAS_ERR_OK;

}