Commit a9c46ef9 authored by emerit's avatar emerit
Browse files

Merge branch '744_step2_tables_and_bin_update_nonBE' of... 

Merge branch '744_step2_tables_and_bin_update_nonBE' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into 744_step2_tables_and_bin_update_nonBE
parents 71c4267e c2fc9290

lib_rend/lib_rend.c

+3 −9
Original line number Diff line number Diff line
@@ -2875,13 +2875,7 @@ static ivas_error setRendInputActiveSplitPostRend( 
    void *input,

    const AUDIO_CONFIG inConfig,

    const IVAS_REND_InputId id,

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    RENDER_CONFIG_DATA *hRendCfg,

    hrtf_handles *hrtfs

#else

    RENDER_CONFIG_DATA *hRendCfg

#endif

)

    RENDER_CONFIG_DATA *hRendCfg )

{

    ivas_error error;

    rendering_context rendCtx;
@@ -3894,7 +3888,7 @@ ivas_error IVAS_REND_AddInput( 
    void *inputsArray;

    int32_t inputStructSize;

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    ivas_error ( *activateInput )( void *, AUDIO_CONFIG, IVAS_REND_InputId, RENDER_CONFIG_DATA *, hrtf_handles *hrtfs );

    ivas_error ( *activateInput )( void *, AUDIO_CONFIG, IVAS_REND_InputId, RENDER_CONFIG_DATA *, hrtf_handles * );

#else

    ivas_error ( *activateInput )( void *, AUDIO_CONFIG, IVAS_REND_InputId, RENDER_CONFIG_DATA * );

#endif