Commit 7e7a6546 authored by emerit's avatar emerit
Browse files

start to fix not finished

parent 9f858d30

lib_com/ivas_prot.h

+17 −0
Original line number Diff line number Diff line
@@ -5411,6 +5411,7 @@ ivas_error ivas_crend_process( 


#else



#ifndef FIX_197_CREND_INTERFACE_LIB_REND_H

IVAS_REND_AudioConfigType getAudioConfigType(

    const IVAS_REND_AudioConfig config );
@@ -5421,10 +5422,16 @@ ivas_error getAudioConfigNumChannels( 
IVAS_REND_AudioConfig getRendAudioConfigFromIvasAudioConfig(

    AUDIO_CONFIG config );



#endif

ivas_error ivas_rend_initCrend(

    CREND_WRAPPER *pCrend,

#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H

    const AUDIO_CONFIG inConfig,

    const AUDIO_CONFIG outConfig,

#else

    const IVAS_REND_AudioConfig inConfig,

    const IVAS_REND_AudioConfig outConfig,

#endif    

    RENDER_CONFIG_DATA *hRendCfg,

#ifdef HRTF_BINARY_FILE

    HRTFS_CREND_HANDLE hSetOfHRTF,
@@ -5433,8 +5440,13 @@ ivas_error ivas_rend_initCrend( 


ivas_error ivas_rend_openCrend(

    CREND_WRAPPER_HANDLE *pCrend,

#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H

    const AUDIO_CONFIG inConfig,

    const AUDIO_CONFIG outConfig,

#else

    const IVAS_REND_AudioConfig inConfig,

    const IVAS_REND_AudioConfig outConfig,

#endif    

    RENDER_CONFIG_DATA *hRendCfg,

    int16_t Opt_Headrotation,

#ifdef HRTF_BINARY_FILE
@@ -5451,8 +5463,13 @@ ivas_error ivas_rend_closeCrend( 


ivas_error ivas_rend_crendProcess(

    const CREND_WRAPPER *pCrend,

#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H    

    const AUDIO_CONFIG inConfig,

    const AUDIO_CONFIG outConfig,

#else

    const IVAS_REND_AudioConfig inConfig,

    const IVAS_REND_AudioConfig outConfig,

#endif    

    DECODER_CONFIG_HANDLE hDecoderConfig,

    HEAD_TRACK_DATA_HANDLE hHeadTrackData,   

    IVAS_OUTPUT_SETUP_HANDLE hIntSetup,

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ 
#define FIX_309_PREMPH_MEM_SCE                          /* FhG: issue 309 - fix overwriting of mem_preemph_enc in ivas preprocessing for SCE and tcxonly modes*/



#define FIX_317                                         /* FhG: issue 317 - address sanitizer error in MDCT-Stereo PLC */



//#define FIX_197_CREND_INTERFACE_LIB_REND_H



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

lib_dec/ivas_dec.c

+11 −0
Original line number Diff line number Diff line
@@ -209,8 +209,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,
@@ -406,8 +411,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
@@ -1220,8 +1220,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,

#ifdef HRTF_BINARY_FILE

                                            st_ivas->hSetOfHRTF,

lib_dec/ivas_ism_param_dec.c

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

#ifdef HRTF_BINARY_FILE