Commit d093d407 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

port NONBE_FIX_1075

parent add4f598

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ 
#define FIX_1003_PARAMISM_BINAURAL_RECONFIG_USAN        /* FhG: fix for #1003: fix USAN caused by ParamISM reconfig                    */

#define FIX_1001_ARI_HM_OVERFLOW                        /* FhG: (no changes needed in BASOP) fix for undef behaviour in in the harmonic TCX model arithmetic coder */

#define NONBE_FIX_1005_MC_RS_TCBUFFER_UPDATE                  /* FhG: issue #1005: fix TC Buffer update at a MC rate switch */

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



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

lib_dec/ivas_init_dec_fx.c

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

                {

                    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 ) )
@@ -2473,6 +2482,15 @@ 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 ) )

                {

                    return error;

                }

            }

#endif

        }

    }

lib_dec/ivas_mct_dec_fx.c

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

                    {

                        return error;

                    }

                }

#endif

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

                {

#ifdef SPLIT_REND_WITH_HEAD_ROT

lib_dec/ivas_omasa_dec_fx.c

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

                        {

                            return error;

                        }

                    }

#endif

                }



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

lib_dec/ivas_sba_dec_fx.c

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

                        {

                            return error;

                        }

                    }

#endif

                }

            }