Commit 78ce31d4 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch '1633_ref_port_fl1503' into 'ivas-float-update' 

Port MR 1503 into float-pc

See merge request !1708
parents 32c4fc38 7ffd2c1d

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ 
#define FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI      /* FhG: move setting of pointers for parameter decoding so they are skipped in lost frames when they are not needed */

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

#define FIX_970_USAN_IN_NELP_SEED

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



#define NONBE_FIX_984_OMASA_EXT_OUTPUT                  /* Nok: issue 1497 - porting OMASA EXT MR   */

/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_init_dec.c

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

                }



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

lib_dec/ivas_sba_dec.c

+9 −0
Original line number Diff line number Diff line
@@ -486,6 +486,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 */