Commit cf7eef24 authored by Jan Kiene's avatar Jan Kiene Committed by emerit
Browse files

add ivas_reverb_open calls after each ivas_td_binaural_open

parent 43fa4798

lib_com/options.h

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

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



#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 */

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

#define NON_BE_FIX_1048_THRESHOLD_COH_BASOP             /* Nokia: Fix 1048 replace comparison with 0 with comparison to threshold, to align with BASOP*/

#define NONBE_FIX_1054_NEGATIVE_LVQ_INDEX               /* Nokia: issue 1054: Input to decode_comb in deindex_lvq_SHB should be positive */

#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_1075



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

lib_dec/ivas_init_dec.c

+19 −0
Original line number Diff line number Diff line
@@ -2086,6 +2086,15 @@ 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 )

                {

                    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 )
@@ -2155,6 +2164,16 @@ 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 )

                {

                    return error;

                }

            }

#endif



        }

    }

lib_dec/ivas_mct_dec.c

+9 −0
Original line number Diff line number Diff line
@@ -1251,6 +1251,15 @@ 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 )

                    {

                        return error;

                    }

                }

#endif



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

                {

lib_dec/ivas_omasa_dec.c

+9 −0
Original line number Diff line number Diff line
@@ -386,6 +386,15 @@ 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 )

                        {

                            return error;

                        }

                    }

#endif

#ifdef FIX_1033_MEMORY_LEAK_OMASA

                }

#endif

lib_dec/ivas_sba_dec.c

+9 −0
Original line number Diff line number Diff line
@@ -503,6 +503,15 @@ 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 )

                    {

                        return error;

                    }

                }

#endif

            }



            /* Allocate memory for OSBA delay buffer */