Commit a26e683c authored by vaclav's avatar vaclav
Browse files

Merge branch 'main' into 237-external-renderer-function-declarations-2

parents 80327aad 69875a00

lib_com/ivas_prot.h

+10 −0
Original line number Diff line number Diff line
@@ -40,10 +40,20 @@ 
#include "stat_enc.h"

#include "stat_dec.h"

#include "stat_com.h"

#ifndef FIX_197_CREND_INTERFACE_LIB_REND_H

#ifdef FIX_197_CREND_INTERFACE

#include "ivas_stat_rend.h" // VE!!!!!

#endif

#endif

#include "ivas_stat_enc.h"

#include "ivas_stat_dec.h"

#include "ivas_stat_com.h"

#include "ivas_error_utils.h"

#ifdef FIX_197_CREND_INTERFACE

#ifndef FIX_197_CREND_INTERFACE_LIB_REND_H

#include "lib_rend.h"

#endif

#endif



/* clang-format off */

lib_com/options.h

+6 −1
Original line number Diff line number Diff line
@@ -150,12 +150,17 @@ 


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



#define DFT_STEREO_SPAR_MIXING

#ifdef DFT_STEREO_SPAR_MIXING

#define FIX_345_MSAN_ERROR                           /* FhG. Fix memory sanitizer error in PLC modes */

/*#define DFT_STEREO_SPAR_MIXING_DEBUG*/             /* more debugging output for DFT_STEREO_SPAR_MIXING_DEBUG */

#define DISABLE_RES_CHANNELS_MCT                     /* decode only W and residual for Y when outputting to stereo */

#endif

lib_dec/ivas_dec.c

+11 −0
Original line number Diff line number Diff line
@@ -210,8 +210,13 @@ 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,
@@ -423,8 +428,14 @@ 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

+5 −0
Original line number Diff line number Diff line
@@ -1249,8 +1249,13 @@ 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

+5 −0
Original line number Diff line number Diff line
@@ -1088,8 +1088,13 @@ 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,