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

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

[fix] main: MASA number of output channels not set correctly for Custom LS output in external renderer

See merge request !1851
parents 03eadf8a e6c50249
Loading
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -8050,7 +8050,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;
    }