Commit af202945 authored by stoutjesdijk's avatar stoutjesdijk 🎧
Browse files

interim commit to check changes on FhG branch

parent d267a03c

lib_rend/ivas_crend.c

+11 −9
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 


*******************************************************************************************************/



#include "common_api_types.h"

#include <stdint.h>

#include <math.h>

#include "options.h"
@@ -1148,6 +1149,7 @@ ivas_error ivas_rend_openCrend( 
    CREND_WRAPPER *pCrend,

    IVAS_REND_AudioConfig inConfig,

    IVAS_REND_AudioConfig outConfig,

    //IVAS_RENDER_CONFIG_HANDLE hRendererConfig,

    int32_t output_Fs )

{

    /* TODO tmu : Based on ivas_crend_open() - could be harmonized / refactored */
@@ -1277,9 +1279,9 @@ ivas_error ivas_rend_openCrend( 
        }



        /* TODO tmu : implement renderConfig */

        // if ( ( ( st_ivas->hRenderConfig != NULL ) && st_ivas->hRenderConfig->roomAcoustics.late_reverb_on ) )

        //if ( ( ( hRendererConfig != NULL ) && hRendererConfig->room_acoustics.late_reverb_on ) )

        //{

        //     if ( ( error = ivas_reverb_open( &( hCrend->hReverb ), st_ivas->intern_config, hHrtf, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

        //    //if ( ( error = ivas_reverb_open( &( hCrend->hReverb ), st_ivas->intern_config, hHrtf, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

        //    {

        //        return error;

        //    }
@@ -1760,7 +1762,7 @@ ivas_error ivas_rend_closeCrend( 
}



/*-----------------------------------------------------------------------------------------*

 * Function ivas_crend_process()

 * Function ivas_rend_crend_process()

 *

 * Process call for IVAS Crend renderer

 *-----------------------------------------------------------------------------------------*/

lib_rend/ivas_lib_rend_internal.h

+2 −0
Original line number Diff line number Diff line 
#include "common_api_types.h"

#include "ivas_error.h"

#include "lib_rend.h"

#include "ivas_stat_dec.h"
@@ -40,6 +41,7 @@ ivas_error ivas_rend_openCrend( 
    CREND_WRAPPER *pCrend,

    IVAS_REND_AudioConfig inConfig,

    IVAS_REND_AudioConfig outConfig,

//    IVAS_RENDER_CONFIG_HANDLE hRendererConfig,

    int32_t output_Fs );



ivas_error ivas_rend_initCrend(

lib_rend/lib_rend.c

+2 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ struct IVAS_REND 
    input_mc inputsMc[RENDERER_MAX_MC_INPUTS];

    input_sba inputsSba[RENDERER_MAX_SBA_INPUTS];



    IVAS_REND_AudioConfig inputConfig;

    IVAS_REND_AudioConfig outputConfig;

    EFAP_WRAPPER efapOutWrapper;

    IVAS_LSSETUP_CUSTOM_STRUCT customLsOut;
@@ -3751,6 +3752,7 @@ static ivas_error renderActiveInputsMc( 
            /* Skip inactive inputs */

            continue;

        }



        if ( ( error = renderInputMc( pCurrentInput,

                                      hIvasRend->outputConfig,

                                      outAudio ) ) != IVAS_ERR_OK )