Commit 8743ee4c authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_1075

parent 2fb077ad

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ 
#define FIX_1835_REVERB_ACTIVATION                      /* FhG: Modified reverberation activation logic and corrected factEQ calculation */

#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_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -2445,7 +2445,6 @@ ivas_error ivas_init_decoder_fx( 
                SrcSpatial_p->q_Pos_p = Q31;

                move16();

            }

#ifdef NONBE_FIX_1075

            IF( EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

            {

                IF( NE_32( ( error = ivas_reverb_open_fx( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ), IVAS_ERR_OK ) )
@@ -2453,7 +2452,6 @@ ivas_error ivas_init_decoder_fx( 
                    return error;

                }

            }

#endif



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

            IF( NE_32( ( error = ivas_omasa_separate_object_renderer_open( st_ivas ) ), IVAS_ERR_OK ) )
@@ -2570,7 +2568,6 @@ ivas_error ivas_init_decoder_fx( 
                SrcSpatial_p->q_Pos_p = Q31;

                move16();

            }

#ifdef NONBE_FIX_1075

            IF( EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

            {

                IF( NE_32( ( error = ivas_reverb_open_fx( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ), IVAS_ERR_OK ) )
@@ -2578,7 +2575,6 @@ ivas_error ivas_init_decoder_fx( 
                    return error;

                }

            }

#endif

        }

    }

lib_dec/ivas_mct_dec_fx.c

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

                    return error;

                }

#ifdef NONBE_FIX_1075

                IF( EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

                {

                    IF( NE_32( ( error = ivas_reverb_open_fx( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ), IVAS_ERR_OK ) )
@@ -1484,7 +1483,6 @@ static ivas_error ivas_mc_dec_reconfig_fx( 
                        return error;

                    }

                }

#endif

                IF( EQ_16( st_ivas->hIntSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

                {

                    IF( ( error = ivas_rend_initCrendWrapper( &st_ivas->hCrendWrapper, 1 ) ) != IVAS_ERR_OK )

lib_dec/ivas_omasa_dec_fx.c

+0 −2
Original line number Diff line number Diff line
@@ -721,7 +721,6 @@ ivas_error ivas_omasa_dec_config_fx( 
                    IF( NE_32( ( error = ivas_td_binaural_open_fx( st_ivas, SrcInd, num_src ) ), IVAS_ERR_OK ) ){

                        return error;

            }

#ifdef NONBE_FIX_1075

            IF( EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

            {

                IF( NE_32( ( error = ivas_reverb_open_fx( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ), IVAS_ERR_OK ) )
@@ -729,7 +728,6 @@ ivas_error ivas_omasa_dec_config_fx( 
                    return error;

                }

            }

#endif

        }



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

lib_dec/ivas_sba_dec_fx.c

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

                        return error;

                    }

#ifdef NONBE_FIX_1075

                    IF( EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

                    {

                        IF( NE_32( ( error = ivas_reverb_open_fx( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ), IVAS_ERR_OK ) )
@@ -572,7 +571,6 @@ ivas_error ivas_sba_dec_reconfigure_fx( 
                            return error;

                        }

                    }

#endif

                }

            }