Commit f361abd0 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_REND_ROUNDING, FIX_REND_MONO_DMX, FIX_REND_ROT_MC_BIN

parent 5a0e4734

apps/renderer.c

+0 −6
Original line number Diff line number Diff line
@@ -2432,9 +2432,7 @@ static void convertOutputBuffer( 
    int16_t *intBuffer )

{

    int16_t chnl, smpl, i;

#ifdef FIX_REND_ROUNDING

    float temp;

#endif



    i = 0;
@@ -2442,7 +2440,6 @@ static void convertOutputBuffer( 
    {

        for ( chnl = 0; chnl < numChannels; ++chnl )

        {

#ifdef FIX_REND_ROUNDING

            temp = floatBuffer[chnl * numSamplesPerChannel + smpl];

            temp = (float) floor( temp + 0.5f );

            if ( temp > MAX16B_FLT )
@@ -2454,9 +2451,6 @@ static void convertOutputBuffer( 
                temp = MIN16B_FLT;

            }

            intBuffer[i] = (int16_t) temp;

#else

            intBuffer[i] = (int16_t) roundf( floatBuffer[chnl * numSamplesPerChannel + smpl] );

#endif



            ++i;

        }

lib_com/options.h

+0 −3
Original line number Diff line number Diff line
@@ -148,9 +148,6 @@ 
#define SBA_BR_SWITCHING                                /* Issue 114: Changes for sba bit rate switching*/

#define BRATE_SWITCHING_RENDERING                       /* Bitrate switching changes related to the renderers */

#define FIX_150                                         /* Issue 150: Crash in EVS mono, HQ_HARMONIC mode, related to BASOP_NOGLOB */

#define FIX_REND_ROUNDING                               /* Issue 195: Align float to int16 conversion in renderer with decoder */

#define FIX_REND_MONO_DMX                               /* Issue 195: Fix mono downmix coefficients in decoder and renderer */

#define FIX_REND_ROT_MC_BIN                             /* Issue 195: Fix wrong EFAP handle passed to renderer, resulting in no rotation for BINAURAL_ROOM output */

#define FIX_ITD_CNG                                     /* Eri Contribution 11: Fix for CNG ITD */

#define FIX_VBR_COMPLEXITY                              /* Issue 234: fix extremely high complexity numbers for IVAS EVS mode */

#define FIX_ISM_INACTIVE_BITS                           /* Issue 230: fix bitbudget distribution in inactive frames in ISM format */

lib_rend/ivas_rom_rend.c

+0 −15
Original line number Diff line number Diff line
@@ -361,7 +361,6 @@ const uint32_t ls_LFE_last_idx_CICP19[12] = { 0, 1, 2, 4, 5, 6, 7, 8, 9, 10, 11, 
 /* Downmix matrices */

const float ls_conversion_cicpX_mono[12][1] =

{

#ifdef FIX_REND_MONO_DMX

    {1.00000000f},

    {1.00000000f},

    {1.00000000f},
@@ -374,20 +373,6 @@ const float ls_conversion_cicpX_mono[12][1] = 
    {0.849999964f},

    {0.849999964f},

    {0.849999964f}

#else

    {1.00000000f},

    {1.00000000f},

    {1.00000000f},

    {1.00000000f},

    {1.00000000f},

    {1.00000000f},

    {1.00000000f},

    {1.00000000f},

    {1.00000000f},

    {1.00000000f},

    {1.00000000f},

    {1.00000000f},

#endif

};



const float ls_conversion_cicpX_stereo[12][2] =

lib_rend/lib_rend.c

+0 −15
Original line number Diff line number Diff line
@@ -1198,11 +1198,9 @@ static ivas_error initMcPanGainsWithMonoOut( 
{

    int16_t i;

    int16_t numInChannels;

#ifdef FIX_REND_MONO_DMX

    int16_t readIdx;

    int16_t writeIdx;

    bool skipSideSpeakers;

#endif

    ivas_error error;



    if ( ( error = getRendInputNumChannels( inputMc, &numInChannels ) ) != IVAS_ERR_OK )
@@ -1210,7 +1208,6 @@ static ivas_error initMcPanGainsWithMonoOut( 
        return error;

    }



#ifdef FIX_REND_MONO_DMX

    if ( inputMc->base.inConfig == IVAS_REND_AUDIO_CONFIG_LS_CUSTOM )

    {

        for ( i = 0; i < numInChannels; ++i )
@@ -1246,14 +1243,6 @@ static ivas_error initMcPanGainsWithMonoOut( 
            inputMc->panGains[writeIdx][0] = ls_conversion_cicpX_mono[readIdx][0];

        }

    }

#else

    for ( i = 0; i < numInChannels; ++i )

    {

        /* It's OK to also set gain 1 for LFE input channels here.

         * Correct LFE handling will be applied within updateMcPanGains() */

        inputMc->panGains[i][0] = 1.f;

    }

#endif



    return IVAS_ERR_OK;

}
@@ -1536,12 +1525,10 @@ static ivas_error initMcBinauralRendering( 
    {

        ivas_rend_closeCrend( &inputMc->crendWrapper );

    }

#ifdef FIX_REND_ROT_MC_BIN

    if ( inputMc->efapInWrapper.hEfap != NULL )

    {

        efap_free_data( &inputMc->efapInWrapper.hEfap );

    }

#endif



    outSampleRate = *inputMc->base.ctx.pOutSampleRate;
@@ -1580,13 +1567,11 @@ static ivas_error initMcBinauralRendering( 
        }

    }



#ifdef FIX_REND_ROT_MC_BIN

    /* Initialise the EFAP handle for rotation on input layout */

    if ( inConfig != IVAS_REND_AUDIO_CONFIG_LS_CUSTOM && inputMc->base.ctx.pHeadRotData->headRotEnabled )

    {

        initEfap( &inputMc->efapInWrapper, inConfig, NULL );

    }

#endif



    return error;

}