Commit 432faa6b authored by sagnowski's avatar sagnowski
Browse files

Rename preprocessor define

parent bf5bf105

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ 
/* any switch which is non-be wrt. TS 26.258 V3.0 */



#define FIX_2432_ISM_SPIKES_16KHZ                       /* VA: basop issue 2432: fix spikes in ISM decoding at 16kHz output sampling rate */

#define FIX_BASOP_2283_OMASA_SR                         /* FhG: basop issue 2283: fix garbage output for >1 object OMASA with extrend as ISAR prerenderer */

#define FIX_BASOP_2436_REUSED_CLDFB_IN_OMASA_SR         /* FhG: basop issue 2436 (related to 2283): fix garbage output for >1 object OMASA with extrend as ISAR prerenderer */



/* ##################### End NON-BE switches ########################### */

lib_rend/lib_rend.c

+9 −9
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ static void accumulate2dArrayToBuffer( 
}





#ifdef FIX_BASOP_2283_OMASA_SR

#ifdef FIX_BASOP_2436_REUSED_CLDFB_IN_OMASA_SR

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

 * audio_buffer_td_to_cldfb()

 *
@@ -6126,7 +6126,7 @@ static ivas_error renderIsmToSplitBinaural( 


    push_wmops( "renderIsmToSplitBinaural" );



#ifdef FIX_BASOP_2283_OMASA_SR

#ifdef FIX_BASOP_2436_REUSED_CLDFB_IN_OMASA_SR

    assert( !outAudio.config.is_cldfb &&

            "ISM renderering only supports TD output. If CLDFB output was requested, "

            "we convert to CLDFB higher up the stack after rendering all ISMs" );
@@ -6192,7 +6192,7 @@ static ivas_error renderIsmToSplitBinaural( 
            return error;

        }



#ifndef FIX_BASOP_2283_OMASA_SR

#ifndef FIX_BASOP_2436_REUSED_CLDFB_IN_OMASA_SR

        if ( outAudio.config.is_cldfb )

        {

            /* Perform CLDFB analysis on rendered audio, since the output buffer is CLDFB domain */
@@ -6216,7 +6216,7 @@ static ivas_error renderIsmToSplitBinaural( 
             * overwrite original audio, which is still needed for rendering next head pose. */

            mvr2r( tmpProcessing[0], tmpBinaural[BINAURAL_CHANNELS * pos_idx], output_frame );

            mvr2r( tmpProcessing[1], tmpBinaural[BINAURAL_CHANNELS * pos_idx + 1], output_frame );

#ifndef FIX_BASOP_2283_OMASA_SR

#ifndef FIX_BASOP_2436_REUSED_CLDFB_IN_OMASA_SR

        }

#endif
@@ -6230,7 +6230,7 @@ static ivas_error renderIsmToSplitBinaural( 
        pCombinedOrientationData->Quaternions[i] = originalHeadRot[i];

    }



#ifndef FIX_BASOP_2283_OMASA_SR

#ifndef FIX_BASOP_2436_REUSED_CLDFB_IN_OMASA_SR

    if ( outAudio.config.is_cldfb )

    {

        accumulateCLDFBArrayToBuffer( tmpBinaural_CldfbRe, tmpBinaural_CldfbIm, &outAudio );
@@ -6239,7 +6239,7 @@ static ivas_error renderIsmToSplitBinaural( 
    {

#endif

        accumulate2dArrayToBuffer( tmpBinaural, &outAudio );

#ifndef FIX_BASOP_2283_OMASA_SR

#ifndef FIX_BASOP_2436_REUSED_CLDFB_IN_OMASA_SR

    }

#endif

    pop_wmops();
@@ -6348,7 +6348,7 @@ static ivas_error renderActiveInputsIsm( 
    int16_t i;

    input_ism *pCurrentInput;

    ivas_error error;

#ifdef FIX_BASOP_2283_OMASA_SR

#ifdef FIX_BASOP_2436_REUSED_CLDFB_IN_OMASA_SR

    IVAS_REND_AudioBuffer tmp_td_audio_buf;

    float tmpBinaural[MAX_HEAD_ROT_POSES * BINAURAL_CHANNELS * L_FRAME48k];
@@ -6372,7 +6372,7 @@ static ivas_error renderActiveInputsIsm( 
            continue;

        }



#ifdef FIX_BASOP_2283_OMASA_SR

#ifdef FIX_BASOP_2436_REUSED_CLDFB_IN_OMASA_SR

        if ( ( error = renderInputIsm( pCurrentInput,

                                       hIvasRend->outputConfig,

                                       outAudio.config.is_cldfb ? tmp_td_audio_buf : outAudio ) ) != IVAS_ERR_OK )
@@ -6384,7 +6384,7 @@ static ivas_error renderActiveInputsIsm( 
        }

    }



#ifdef FIX_BASOP_2283_OMASA_SR

#ifdef FIX_BASOP_2436_REUSED_CLDFB_IN_OMASA_SR

    if ( outAudio.config.is_cldfb )

    {

        audio_buffer_td_to_cldfb( tmp_td_audio_buf,