Commit 9f73d76f authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Fix for erroneous renderer modes switching in case of BINAURAL_ROOM_REVERB output configuration

parent a9704292

lib_dec/ivas_output_config.c

+12 −0
Original line number Diff line number Diff line
@@ -135,7 +135,11 @@ void ivas_renderer_select( 
        else if ( st_ivas->ivas_format == MASA_FORMAT || ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->nchan_transport <= 2 ) )

        {

            *internal_config = output_config;

#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM

            if ( output_config == AUDIO_CONFIG_BINAURAL || output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#else

            if ( output_config == AUDIO_CONFIG_BINAURAL )

#endif

            {

                *renderer_type = RENDERER_BINAURAL_PARAMETRIC;

            }
@@ -147,7 +151,11 @@ void ivas_renderer_select( 
        else if ( st_ivas->ivas_format == SBA_FORMAT )

        {

            *internal_config = AUDIO_CONFIG_HOA3;

#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM

            if ( output_config == AUDIO_CONFIG_BINAURAL || output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#else

            if ( output_config == AUDIO_CONFIG_BINAURAL )

#endif

            {

                *renderer_type = RENDERER_BINAURAL_FASTCONV;

            }
@@ -183,7 +191,11 @@ void ivas_renderer_select( 
            if ( st_ivas->mc_mode == MC_MODE_MCMASA )

            {

                *internal_config = output_config;

#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM

                if ( output_config == AUDIO_CONFIG_BINAURAL || output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#else

                if ( output_config == AUDIO_CONFIG_BINAURAL )

#endif

                {

                    *renderer_type = RENDERER_BINAURAL_PARAMETRIC;

                }

lib_rend/lib_rend.c

+4 −0
Original line number Diff line number Diff line
@@ -2489,7 +2489,11 @@ static ivas_error initMasaDummyDecForBinauralOut( 
    decDummy->mc_mode = MC_MODE_NONE;                       /* Todo Nokia: This should be also refactored in such way that it is not checked if not in MC mode */



    ivas_output_init( &( decDummy->hOutSetup ), output_config );

#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM

    if ( output_config == AUDIO_CONFIG_BINAURAL || output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#else

    if ( output_config == AUDIO_CONFIG_BINAURAL )

#endif

    {

        decDummy->renderer_type = RENDERER_BINAURAL_PARAMETRIC;

    }