Commit d0034383 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch 'fix-masa-extend-customls-crash-main-pc' into 'main-pc' 

[fix][skip-name-check] main-pc: MASA number of output channels not set correctly for Custom LS output in external renderer

See merge request !1852
parents 2dda2283 dd52617a

lib_rend/lib_rend_fx.c

+6 −1
Original line number Diff line number Diff line
@@ -9905,7 +9905,12 @@ static ivas_error initMasaExtRenderer( 
        return error;

    }



    IF( NE_32( ( error = getAudioConfigNumChannels( outConfig, &hMasaExtRend->nchan_output ) ), IVAS_ERR_OK ) )

    IF( EQ_32( outConfig, IVAS_AUDIO_CONFIG_LS_CUSTOM ) )

    {

        hMasaExtRend->nchan_output = add( inputMasa->base.ctx.pCustomLsOut->num_spk, inputMasa->base.ctx.pCustomLsOut->num_lfe );

        move16();

    }

    ELSE IF( NE_32( ( error = getAudioConfigNumChannels( outConfig, &hMasaExtRend->nchan_output ) ), IVAS_ERR_OK ) )

    {

        return error;

    }