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

Merge branch '1326-ivas_rend-custom-loudspeaker-layouts-do-not-work-with-masa-input' into 'main' 

Resolve "IVAS_rend custom loudspeaker layouts do not work with MASA input"

See merge request !2129
parents 2b4bdd22 1b7834c2

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ 


#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */ 

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define NONBE_FIX_1326_MASA_EXTREND_CUSTOMLS_OUT        /* FhG: Fix crash for external renderer MASA to custom LS rendering, number of output channels not set correctly */



/* ##################### End NON-BE switches ########################### */

lib_rend/lib_rend.c

+8 −1
Original line number Diff line number Diff line
@@ -8503,6 +8503,13 @@ static ivas_error initMasaExtRenderer( 
        return error;

    }



#ifdef NONBE_FIX_1326_MASA_EXTREND_CUSTOMLS_OUT

    if ( outConfig == IVAS_AUDIO_CONFIG_LS_CUSTOM )

    {

        hMasaExtRend->nchan_output = inputMasa->base.ctx.pCustomLsOut->num_spk + inputMasa->base.ctx.pCustomLsOut->num_lfe;

    }

    else

#endif

        if ( ( error = getAudioConfigNumChannels( outConfig, &hMasaExtRend->nchan_output ) ) != IVAS_ERR_OK )

    {

        return error;