Commit 0be39a6a authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

delete code under ifdef NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING_A

parent ba70bae2

lib_com/options.h

+1 −2
Original line number Diff line number Diff line
@@ -183,8 +183,7 @@ 
#define NONBE_FIX_1012_1013_JBM_FLUSH_BUFFER                  /* FhG: issues #1012, 1013: JBM flush function uses wrong output buffer */

#define NONBE_FIX_1004_USAN_DTX_MASA_NO_DIRS                  /* Nokia: fix USAN error caused by non-setting of correctly the number of MASA directions in DTX */



//#define NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING_A     /* FhG: issue 987: solution a: switch to SD */

#define NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING_B       /* FhG: issue 987: solution b: downmix HOA3 to stereo a input for the reverberator */

#define NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING       /* FhG: issue 987: solution b: downmix HOA3 to stereo a input for the reverberator */



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

lib_dec/ivas_binRenderer_internal.c

+1 −1
Original line number Diff line number Diff line
@@ -952,7 +952,7 @@ static void ivas_binaural_obtain_DMX( 
            set_zero( outRealRightPtr, CLDFB_NO_CHANNELS_MAX );

            set_zero( outImagRightPtr, CLDFB_NO_CHANNELS_MAX );



#ifdef NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING_B

#ifdef NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING

            /*Ambisonics input requires different processing*/

            if ( hBinRenderer->nInChannels == 16 )

            {

lib_dec/ivas_output_config.c

+0 −4
Original line number Diff line number Diff line
@@ -248,11 +248,7 @@ void ivas_renderer_select( 
                            *renderer_type = RENDERER_BINAURAL_FASTCONV;

                        }



#ifdef NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING_A

                        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;