Commit c5de9c9a authored by sagnowski's avatar sagnowski
Browse files

Merge branch 'main' into sgi-fix-237-branch

parents 3f343bc7 fd43700a

lib_com/options.h

+0 −4
Original line number Diff line number Diff line
@@ -150,10 +150,6 @@ 


#define FIX_197_CREND_INTERFACE 



#ifdef FIX_197_CREND_INTERFACE

#define FIX_197_CREND_INTERFACE_LIB_REND_H

#endif



#define FIX_MEMORY_COUNTING_HRTF_BINARY_FILE

#define FIX_334_DEBUG_BE_STEREO_SWITCHING               /* FhG: Fix non-BE issue for stereo switching when DEBUGGING is enabled */

#define FIX_198_TDREND_INTERFACE                        /* Issue 198: Harmonize interface for TD renderer between decoder and external renderer */

lib_dec/ivas_dec.c

+2 −12
Original line number Diff line number Diff line
@@ -210,13 +210,8 @@ ivas_error ivas_dec( 
            {

#ifdef FIX_197_CREND_INTERFACE

                if ( ( error = ivas_rend_crendProcess( st_ivas->hCrendWrapper,

#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H

                                                       AUDIO_CONFIG_7_1_4,

                                                       AUDIO_CONFIG_BINAURAL_ROOM,

#else

                                                       IVAS_REND_AUDIO_CONFIG_7_1_4,

                                                       IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM,

#endif

                                                       NULL,

                                                       NULL,

                                                       NULL,
@@ -428,13 +423,8 @@ ivas_error ivas_dec( 
            {

#ifdef FIX_197_CREND_INTERFACE

                if ( ( error = ivas_rend_crendProcess( st_ivas->hCrendWrapper,

#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H

                                                        st_ivas->intern_config ,

                                                        st_ivas->hOutSetup.output_config ,

#else

                                                       getRendAudioConfigFromIvasAudioConfig( st_ivas->intern_config ),

                                                       getRendAudioConfigFromIvasAudioConfig( st_ivas->hOutSetup.output_config ),

#endif

                                                       st_ivas->hDecoderConfig,

                                                       st_ivas->hHeadTrackData,

                                                       &st_ivas->hIntSetup,

lib_dec/ivas_init_dec.c

+0 −5
Original line number Diff line number Diff line
@@ -1249,13 +1249,8 @@ ivas_error ivas_init_decoder( 
        }



        if ( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ),

#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H

                                            st_ivas->intern_config,

                                            st_ivas->hDecoderConfig->output_config,

#else

                                            getRendAudioConfigFromIvasAudioConfig( st_ivas->intern_config ),

                                            getRendAudioConfigFromIvasAudioConfig( st_ivas->hDecoderConfig->output_config ),

#endif

                                            st_ivas->hRenderConfig, st_ivas->hDecoderConfig->Opt_Headrotation,

                                            st_ivas->hSetOfHRTF,

                                            st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

lib_dec/ivas_ism_param_dec.c

+0 −5
Original line number Diff line number Diff line
@@ -1088,13 +1088,8 @@ static ivas_error ivas_ism_bitrate_switching( 
            /* Open Crend Binaural renderer */

#ifdef FIX_197_CREND_INTERFACE

            if ( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ),

#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H

                                                st_ivas->intern_config,

                                                st_ivas->hOutSetup.output_config,

#else

                                                getRendAudioConfigFromIvasAudioConfig( st_ivas->intern_config ),

                                                getRendAudioConfigFromIvasAudioConfig( st_ivas->hOutSetup.output_config ),

#endif

                                                st_ivas->hRenderConfig,

                                                st_ivas->hDecoderConfig->Opt_Headrotation,

                                                st_ivas->hSetOfHRTF,

lib_dec/ivas_mct_dec.c

+0 −5
Original line number Diff line number Diff line
@@ -1159,13 +1159,8 @@ static ivas_error ivas_mc_dec_reconfig( 
            else if ( st_ivas->hCrendWrapper == NULL && ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) )

            {

                if ( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ),

#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H

                                                    st_ivas->intern_config,

                                                    st_ivas->hDecoderConfig->output_config,

#else

                                                    getRendAudioConfigFromIvasAudioConfig( st_ivas->intern_config ),

                                                    getRendAudioConfigFromIvasAudioConfig( st_ivas->hDecoderConfig->output_config ),

#endif

                                                    st_ivas->hRenderConfig, st_ivas->hDecoderConfig->Opt_Headrotation,

                                                    st_ivas->hSetOfHRTF,

                                                    st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )