Commit f9b8d5b2 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1466_EXTREND

parent 8c4042de

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ 
#define FIX_1990_SANITIZER_IN_REVERB_LOAD               /* Nokia: Fix issue part of issue 1990 by introducing missing free of structure - keep until #2059 is addressed */

#define FIX_1999_TEMPORARY_DISABLE_DIST_ATT_CHECK       /* Eri: Issue 1999: Range check on float values of distance attenuation, while the float values are not propagated to this function. The test is not correct, but configurable distance attenuation is not used in Characterization.*/

#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define FIX_1466_EXTREND                                /* FhG: float issue 1466: enable rendering of mono/stereo to other formats in the external renderer */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define FIX_1435_MOVE_STEREO_PANNING                    /* VA: issue 1435: do the EVS stereo panning in the renderer */

#define FIX_2249_MEMORY_LEAK_IN_SBA                     /* OR : issue 2249 : Memory leak in SBA to BINAURAL_ROOM_REVERB with memory instrumentation */

lib_rend/lib_rend_fx.c

+0 −28
Original line number Diff line number Diff line
@@ -1398,7 +1398,6 @@ static bool isIoConfigPairSupported( 
    const AUDIO_CONFIG inConfig,

    const AUDIO_CONFIG outConfig )

{

#ifdef FIX_1466_EXTREND

    /* input config cannot be binaural */

    test();

    test();
@@ -1413,15 +1412,6 @@ static bool isIoConfigPairSupported( 
    {

        return false;

    }

#else

    /* Rendering mono or stereo to binaural is not supported */

    test();

    test();

    IF( ( EQ_32( inConfig, IVAS_AUDIO_CONFIG_MONO ) || EQ_32( inConfig, IVAS_AUDIO_CONFIG_STEREO ) ) && EQ_32( getAudioConfigType( outConfig ), IVAS_REND_AUDIO_CONFIG_TYPE_BINAURAL ) )

    {

        return false;

    }

#endif



    /* If not returned so far, config pair is supported */

    return true;
@@ -2586,23 +2576,18 @@ static ivas_error updateMcPanGainsForAmbiOut( 
{

    Word16 ch_in, ch_out, lfeIdx, i;

    Word16 numNonLfeInChannels, outAmbiOrder;

#ifdef FIX_1466_EXTREND

    AUDIO_CONFIG inConfig;

#endif

    const Word32 *spkAzi_fx, *spkEle_fx; /* Q22 */

    ivas_error error;



#ifdef FIX_1466_EXTREND

    inConfig = inputMc->base.inConfig;

    move32();



#endif

    IF( NE_32( ( error = getAmbisonicsOrder_fx( outConfig, &outAmbiOrder ) ), IVAS_ERR_OK ) )

    {

        return error;

    }



#ifdef FIX_1466_EXTREND

    test();

    IF( EQ_32( inConfig, IVAS_AUDIO_CONFIG_MONO ) || EQ_32( inConfig, IVAS_AUDIO_CONFIG_STEREO ) )

    {
@@ -2630,9 +2615,6 @@ static ivas_error updateMcPanGainsForAmbiOut( 
        return IVAS_ERR_OK;

    }

    ELSE IF( NE_32( inputMc->base.inConfig, IVAS_AUDIO_CONFIG_LS_CUSTOM ) )

#else

    IF( NE_32( inputMc->base.inConfig, IVAS_AUDIO_CONFIG_LS_CUSTOM ) )

#endif

    {

        IF( NE_32( ( error = getNumNonLfeChannelsInSpeakerLayout( inputMc->base.inConfig, &numNonLfeInChannels ) ), IVAS_ERR_OK ) )

        {
@@ -2743,7 +2725,6 @@ static ivas_error updateMcPanGainsForAmbiOut( 


    return IVAS_ERR_OK;

}

#ifdef FIX_1466_EXTREND



static ivas_error updateMcPanGainsForBinauralOut(

    input_mc *inputMc )
@@ -2775,7 +2756,6 @@ static ivas_error updateMcPanGainsForBinauralOut( 
    return IVAS_ERR_OK;

}



#endif

static ivas_error updateMcPanGains(

    input_mc *inputMc,

    const AUDIO_CONFIG outConfig )
@@ -2797,7 +2777,6 @@ static ivas_error updateMcPanGains( 
            error = updateMcPanGainsForAmbiOut( inputMc, outConfig );

            BREAK;

        case IVAS_REND_AUDIO_CONFIG_TYPE_BINAURAL:

#ifdef FIX_1466_EXTREND

            test();

            IF( EQ_32( inputMc->base.inConfig, IVAS_AUDIO_CONFIG_MONO ) || EQ_32( inputMc->base.inConfig, IVAS_AUDIO_CONFIG_STEREO ) )

            {
@@ -2806,7 +2785,6 @@ static ivas_error updateMcPanGains( 
            }



            /* not mono or stereo */

#endif

            SWITCH( outConfig )

            {

                case IVAS_AUDIO_CONFIG_BINAURAL:
@@ -2864,14 +2842,12 @@ static ivas_error initMcBinauralRendering( 
    Word32 outSampleRate;

    Word8 useTDRend;

    Word16 i;

#ifdef FIX_1466_EXTREND



    test();

    IF( EQ_32( inputMc->base.inConfig, IVAS_AUDIO_CONFIG_MONO ) || EQ_32( inputMc->base.inConfig, IVAS_AUDIO_CONFIG_STEREO ) )

    {

        return IVAS_ERR_OK;

    }

#endif



    /* Allocate TD binaural renderer for custom loudspeaker layouts (regardless of headrotation)

      or planar MC layouts with headrotation, CREND for the rest */
@@ -7390,7 +7366,6 @@ static ivas_error renderActiveInputsIsm( 
    }

    return IVAS_ERR_OK;

}

#ifdef FIX_1466_EXTREND



static void renderMonoStereoToBinaural(

    const input_mc *mcInput,
@@ -7412,7 +7387,6 @@ static void renderMonoStereoToBinaural( 
    return;

}



#endif



static ivas_error renderLfeToBinaural_fx(

    const input_mc *mcInput,
@@ -8167,7 +8141,6 @@ static ivas_error renderInputMc( 
            renderMcToSba( mcInput, outAudio );

            BREAK;

        case IVAS_REND_AUDIO_CONFIG_TYPE_BINAURAL:

#ifdef FIX_1466_EXTREND

            test();

            IF( EQ_32( mcInput->base.inConfig, IVAS_AUDIO_CONFIG_MONO ) || EQ_32( mcInput->base.inConfig, IVAS_AUDIO_CONFIG_STEREO ) )

            {
@@ -8176,7 +8149,6 @@ static ivas_error renderInputMc( 
            }



            /* not mono or stereo */

#endif

            SWITCH( outConfig )

            {

                case IVAS_AUDIO_CONFIG_BINAURAL: