Commit 949815b2 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_1075

parent 31ddfe67

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -187,7 +187,6 @@ 
#define FIX_1053_REVERB_RECONFIGURATION                 /* Philips: issue 1053: fix for dynamic switching of acoustic environment */

#define NON_BE_FIX_EVS_USAN_ERR_IN_WAVEADJUST           /* FhG: address issue 1037 */

#define NONBE_FIX_1056_ISM_RATE_SWITCH                  /* FhG: Fix #1056: fix TC buffer udpate on a ISM rate switch */	

#define NONBE_FIX_1075                                  /* FhG: fix segfault for bitrate switching + BINAURAL_ROOM_REVERB output in MC */

#define NONBE_FIX_1063_DIV_BY_ZERO_SUMNRG               /* VoiceAge: issue 1063: division by zero for angle_rot feature in the UNCLR classifier */

#define NONBE_FIX_SBA_SIGNALING_BITS_B                  /* FhG: issue 1061: option B: signal sba order additionally in OSBA */

#define NONBE_FIX_1045_ISM_BITRATE_SWITCHING            /* Eri: Difference between ROM/File HRTF in ISM bitrate switching */

lib_dec/ivas_init_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -2038,7 +2038,6 @@ ivas_error ivas_init_decoder( 
            {

                return error;

            }

#ifdef NONBE_FIX_1075

            if ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

            {

                if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )
@@ -2046,7 +2045,6 @@ ivas_error ivas_init_decoder( 
                    return error;

                }

            }

#endif



            /* Allocate 'hIsmRendererData' handle and memory for delay buffer within 'hMasaIsmData' */

            if ( ( error = ivas_omasa_separate_object_renderer_open( st_ivas ) ) != IVAS_ERR_OK )
@@ -2117,7 +2115,6 @@ ivas_error ivas_init_decoder( 
            {

                return error;

            }

#ifdef NONBE_FIX_1075

            if ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

            {

                if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )
@@ -2126,7 +2123,6 @@ ivas_error ivas_init_decoder( 
                }

            }



#endif

        }

    }

lib_dec/ivas_mct_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -1231,7 +1231,6 @@ static ivas_error ivas_mc_dec_reconfig( 
                {

                    return error;

                }

#ifdef NONBE_FIX_1075

                if ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

                {

                    if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )
@@ -1239,7 +1238,6 @@ static ivas_error ivas_mc_dec_reconfig( 
                        return error;

                    }

                }

#endif



                if ( st_ivas->hIntSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

                {

lib_dec/ivas_omasa_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -437,7 +437,6 @@ ivas_error ivas_omasa_dec_config( 
                    {

                        return error;

                    }

#ifdef NONBE_FIX_1075

                    if ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

                    {

                        if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )
@@ -445,7 +444,6 @@ ivas_error ivas_omasa_dec_config( 
                            return error;

                        }

                    }

#endif

                }



                /* Allocate 'hIsmRendererData' handle and memory for delay buffer within 'hMasaIsmData' */

lib_dec/ivas_sba_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -486,7 +486,6 @@ ivas_error ivas_sba_dec_reconfigure( 
                        return error;

                    }

                }

#ifdef NONBE_FIX_1075

                if ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

                {

                    if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )
@@ -494,7 +493,6 @@ ivas_error ivas_sba_dec_reconfigure( 
                        return error;

                    }

                }

#endif

            }



            /* Allocate memory for OSBA delay buffer */