Commit 302627ca authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge branch 'main' into 777-render-config-reader-fails-to-read-combined-config-file

parents 25f8c5b4 52d5de66

.gitignore

+3 −0
Original line number Diff line number Diff line
@@ -46,7 +46,10 @@ binary/ 
tests/**/[c|d]ut

tests/**/ref

tests/*/testv

tests/hrtf_binary_loading/bitstream/*

tests/hrtf_binary_loading/dec_out_*/*

scripts/testv/*_cut*.pcm

scripts/testv/*_cut*.wav

scripts/testv/stvOMASA_*.met

scripts/testv/stvOMASA_*.csv

scripts/testv/stvOMASA_2ISM_1MASA1TC48c.wav

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ 
/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_978_MC_TDREND_REVERB                        /* Eri : activate reverb for TDREND with headtracking */

#define BE_FIX_567_DOUBLE_STEREO_DMX                          /* NTT: Fix formal issues */   

#define NONBE_FIX_567_DOUBLE_STEREO_DMX                       /* Orange: Double-precision replaced by single-precision */   

#define FIX_777_COMBI_RENDER_CONFIG_FILE                      /* Philips: Fix for combined renderer config file support */

lib_dec/ivas_init_dec.c

+4 −1
Original line number Diff line number Diff line
@@ -2017,8 +2017,11 @@ ivas_error ivas_init_decoder( 
        {

            return error;

        }



#ifdef NONBE_FIX_978_MC_TDREND_REVERB

        if ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#else

        if ( st_ivas->hIntSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#endif // DEBUG

        {

            if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

            {

lib_dec/ivas_ism_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -199,7 +199,11 @@ static ivas_error ivas_ism_bitrate_switching_dec( 
                {

                    return error;

                }

#ifdef NONBE_FIX_978_MC_TDREND_REVERB

                if ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#else

                if ( st_ivas->hIntSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#endif

                {

                    if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

                    {

lib_dec/ivas_objectRenderer_internal.c

+8 −2
Original line number Diff line number Diff line
@@ -187,8 +187,11 @@ ivas_error ivas_td_binaural_renderer_sf( 
        {

            return error;

        }



#ifdef NONBE_FIX_978_MC_TDREND_REVERB

        if ( st_ivas->hRenderConfig != NULL && st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#else

        if ( st_ivas->hRenderConfig != NULL && st_ivas->hIntSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#endif

        {

            if ( ( error = ivas_reverb_process( st_ivas->hReverb, st_ivas->transport_config, 0, tc_local, p_reverb_signal, 0 ) ) != IVAS_ERR_OK )

            {
@@ -203,8 +206,11 @@ ivas_error ivas_td_binaural_renderer_sf( 
        {

            return error;

        }



#ifdef NONBE_FIX_978_MC_TDREND_REVERB

        if ( st_ivas->hRenderConfig != NULL && st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#else

        if ( st_ivas->hRenderConfig != NULL && st_ivas->hIntSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#endif

        {

            /* add reverb to rendered signals */

            v_add( reverb_signal[0], output_f_local[0], output_f_local[0], output_frame );