Commit 2ac53f31 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

do not disable TD renderer for BINAURAL_ROOM_REVERB output from 5.1 and 7.1 format

parent 11766a1f

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -180,6 +180,8 @@ 
#endif

#define NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING        /* FhG: issue 987: fix broken output with ParamMC to BINAURAL_REVERB rendering */



#define DISABLE_LIMITER



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



/* ################## End DEVELOPMENT switches ######################### */

lib_dec/ivas_output_config.c

+8 −9
Original line number Diff line number Diff line
@@ -224,18 +224,9 @@ void ivas_renderer_select( 
                *internal_config = transport_config;



#ifdef SPLIT_REND_WITH_HEAD_ROT

#ifdef NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING

                if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED )



#else

                if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED )

#endif

#else

#ifdef NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING

                if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL )

#else

                if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#endif

#endif

                {

#ifdef DEBUGGING
@@ -252,6 +243,10 @@ void ivas_renderer_select( 
                        {

                            *renderer_type = RENDERER_BINAURAL_MIXER_CONV;

                        }

						else if (output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB)

						{

							*renderer_type = RENDERER_BINAURAL_FASTCONV_ROOM;

						}

                        else

                        {

                            *renderer_type = RENDERER_BINAURAL_FASTCONV;
@@ -267,7 +262,11 @@ void ivas_renderer_select( 
                            *renderer_type = RENDERER_BINAURAL_FASTCONV;

                        }

#endif

#ifdef NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING

                        if ( ( st_ivas->hDecoderConfig->Opt_Headrotation || st_ivas->hDecoderConfig->Opt_ExternalOrientation ) && !(output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB) )

#else

                        if ( st_ivas->hDecoderConfig->Opt_Headrotation || st_ivas->hDecoderConfig->Opt_ExternalOrientation )

#endif

                        {

                            /* force HOA3 domain for rotation*/

                            *internal_config = IVAS_AUDIO_CONFIG_HOA3;