Commit 110eef6c authored by vaclav's avatar vaclav
Browse files

accept NONBE_FIX_1075

parent 617aa893

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ 
/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



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



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

#define NON_BE_1055_RESET_LP_MEMORIES                   /* VA: issue 1055: Correctly reset LP filter MA and AR memories in bitrate switching */

#define NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM   /* FhG: issue 1058: do not initialize EFAP when IntSetup is HOA3 */

lib_dec/ivas_init_dec.c

+2 −4
Original line number Diff line number Diff line
@@ -2086,7 +2086,7 @@ 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 )
@@ -2094,7 +2094,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 )
@@ -2164,7 +2163,7 @@ 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 )
@@ -2172,7 +2171,6 @@ ivas_error ivas_init_decoder( 
                    return error;

                }

            }

#endif

        }

    }

lib_dec/ivas_mct_dec.c

+1 −2
Original line number Diff line number Diff line
@@ -1251,7 +1251,7 @@ 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 )
@@ -1259,7 +1259,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

+2 −2
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ 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 )
@@ -392,8 +392,8 @@ ivas_error ivas_omasa_dec_config( 
                            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 )

                {

lib_dec/ivas_sba_dec.c

+1 −2
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ 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 )
@@ -511,7 +511,6 @@ ivas_error ivas_sba_dec_reconfigure( 
                        return error;

                    }

                }

#endif

            }



            /* Allocate memory for OSBA delay buffer */