Commit 01e9e91c authored by Fabian Müller's avatar Fabian Müller
Browse files

Remove getConstInputByIndex again

parent ef695613

lib_rend/lib_rend.c

+2 −22
Original line number Diff line number Diff line
@@ -3310,28 +3310,8 @@ static void *getInputByIndex( void *inputsArray, const size_t index, const IVAS_ 
    }

}



/* Const variant of getInputByIndex. Unfortunately, this duplication is required to keep const-correctness. */

static const void *getConstInputByIndex( const void *inputsArray, const size_t index, const IVAS_REND_AudioConfigType inputType )

{

    switch ( inputType )

    {

        case IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED:

            return (const input_mc *) inputsArray + index;

        case IVAS_REND_AUDIO_CONFIG_TYPE_AMBISONICS:

            return (const input_sba *) inputsArray + index;

        case IVAS_REND_AUDIO_CONFIG_TYPE_OBJECT_BASED:

            return (const input_ism *) inputsArray + index;

        case IVAS_REND_AUDIO_CONFIG_TYPE_MASA:

            return (const input_masa *) inputsArray + index;

        default:

            /* this should be unreachable */

            assert( 0 );

            return NULL;

    }

}



static ivas_error findFreeInputSlot(

    const void *inputs,

    void *inputs,

    const IVAS_REND_AudioConfigType inputType,

    const int32_t maxInputs,

    int32_t *inputIndex )
@@ -3352,7 +3332,7 @@ static ivas_error findFreeInputSlot( 
    /* Find first unused input in array */

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

    {

        pInputBase = (const input_base *) getConstInputByIndex( inputs, i, inputType );

        pInputBase = (const input_base *) getInputByIndex( inputs, i, inputType );



        if ( pInputBase->inConfig == IVAS_AUDIO_CONFIG_INVALID )

        {