Commit be1174d2 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge remote-tracking branch 'origin/main-pc' into 1716_basop_activate_switch

parents 198d3a2b d0034383
Loading
Loading
Loading
Loading
Loading
+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;
    }