Commit 2c4e0b62 authored by fotopoulou's avatar fotopoulou
Browse files

Merge branch 'revision_of_todos' of forge.3gpp.org:ivas-codec-pc/ivas-codec into revision_of_todos

parents b130f851 ccf5d2e6

lib_dec/ivas_binRenderer_internal.c

+3 −2
Original line number Diff line number Diff line
@@ -151,14 +151,15 @@ static ivas_error ivas_binRenderer_convModuleOpen( 
    if ( !isLoudspeaker )

    {

#ifdef UPDATE_SBA_FILTER

        hBinRenderer->nInChannels = audioCfg2channels( input_config ); // TODO maybe an audioCfg2channels_woLFE() function? Works as long as only 1 LFE is present

        hBinRenderer->nInChannels = audioCfg2channels( input_config );

#else

        hBinRenderer->nInChannels = 16;

#endif

    }

    else

    {

        hBinRenderer->nInChannels = ( audioCfg2channels( input_config ) - isLoudspeaker ); // TODO maybe an audioCfg2channels_woLFE() function? Works as long as only 1 LFE is present

        /* Note: needs to be revisited if multiple LFE support is required */

        hBinRenderer->nInChannels = ( audioCfg2channels( input_config ) - isLoudspeaker );

    }



    if ( renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM && hRenderConfig->roomAcoustics.use_brir )

lib_rend/ivas_crend.c

+0 −1
Original line number Diff line number Diff line
@@ -1090,7 +1090,6 @@ ivas_error ivas_rend_openCrend( 
    HRTFS_CREND_HANDLE hSetOfHRTF,

    const int32_t output_Fs )

{

    /* TODO tmu : Based on ivas_crend_open() - could be harmonized / refactored */

    int16_t i, subframe_length;

    int16_t max_total_ir_len;

    HRTFS_HANDLE hHrtf;

lib_rend/lib_rend.h

+0 −1
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ ivas_error IVAS_REND_ConfigureCustomOutputLoudspeakerLayout( 
    const IVAS_CUSTOM_LS_DATA layout                /* i  : custom loudspeaker layout for renderer output       */

);



/* ToDo: Support for custom HRTFs will be added in the future. */

/* Note: this affects output delay */

ivas_error IVAS_REND_SetCustomHrtf(

    IVAS_REND_HANDLE hIvasRend,                     /* i/o: Renderer handle                                     */