Commit bf22037f authored by TYAGIRIS's avatar TYAGIRIS
Browse files

Merge branch 'split_rendering_masa_and_mc_fixes' of... 

Merge branch 'split_rendering_masa_and_mc_fixes' of forge.3gpp.org:ivas-codec-pc/ivas-codec into split_rendering_masa_and_mc_fixes
parents f33d58a6 9e83b17a

lib_rend/lib_rend.c

+3 −3
Original line number Diff line number Diff line
@@ -4134,15 +4134,15 @@ static int16_t getCldfbRendFlag( 
        }

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

        {

            numSbaInputs = ( hIvasRend->inputsSba[i].base.inConfig == IVAS_REND_AUDIO_CONFIG_UNKNOWN && new_config != IVAS_REND_AUDIO_CONFIG_TYPE_AMBISONICS ) ? 0 : 1;

            numSbaInputs += ( hIvasRend->inputsSba[i].base.inConfig == IVAS_REND_AUDIO_CONFIG_UNKNOWN && new_config != IVAS_REND_AUDIO_CONFIG_TYPE_AMBISONICS ) ? 0 : 1;

        }

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

        {

            numIsmInputs = ( hIvasRend->inputsIsm[i].base.inConfig == IVAS_REND_AUDIO_CONFIG_UNKNOWN && new_config != IVAS_REND_AUDIO_CONFIG_TYPE_OBJECT_BASED ) ? 0 : 1;

            numIsmInputs += ( hIvasRend->inputsIsm[i].base.inConfig == IVAS_REND_AUDIO_CONFIG_UNKNOWN && new_config != IVAS_REND_AUDIO_CONFIG_TYPE_OBJECT_BASED ) ? 0 : 1;

        }

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

        {

            numMcInputs = ( hIvasRend->inputsMc[i].base.inConfig == IVAS_REND_AUDIO_CONFIG_UNKNOWN && new_config != IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED ) ? 0 : 1;

            numMcInputs += ( hIvasRend->inputsMc[i].base.inConfig == IVAS_REND_AUDIO_CONFIG_UNKNOWN && new_config != IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED ) ? 0 : 1;

        }



        if ( numIsmInputs > 0 || numMcInputs > 0 )