Commit 9d653a89 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Removal of use_brir and late_reverb_on flags from renderer configuration

parent f2739dcc

lib_dec/ivas_init_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -2259,7 +2259,7 @@ static ivas_error doSanityChecks_IVAS( 


#ifdef DEBUGGING

#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG

    if ( ( st_ivas->hDecoderConfig->force_rend == FORCE_TD_RENDERER ) && ( ( st_ivas->ivas_format != MC_FORMAT && st_ivas->ivas_format != ISM_FORMAT ) || ( output_config != AUDIO_CONFIG_BINAURAL && output_config != AUDIO_CONFIG_BINAURAL ) || ( st_ivas->ivas_format == ISM_FORMAT && st_ivas->ism_mode == ISM_MODE_PARAM ) || ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode != MC_MODE_MCT ) ) )

    if ( ( st_ivas->hDecoderConfig->force_rend == FORCE_TD_RENDERER ) && ( ( st_ivas->ivas_format != MC_FORMAT && st_ivas->ivas_format != ISM_FORMAT ) || ( output_config != AUDIO_CONFIG_BINAURAL && output_config != AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) || ( st_ivas->ivas_format == ISM_FORMAT && st_ivas->ism_mode == ISM_MODE_PARAM ) || ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode != MC_MODE_MCT ) ) )

#else

    if ( ( st_ivas->hDecoderConfig->force_rend == FORCE_TD_RENDERER ) && ( ( st_ivas->ivas_format != MC_FORMAT && st_ivas->ivas_format != ISM_FORMAT ) || output_config != AUDIO_CONFIG_BINAURAL || ( st_ivas->ivas_format == ISM_FORMAT && st_ivas->ism_mode == ISM_MODE_PARAM ) || ( st_ivas->ivas_format == MC_FORMAT && ( st_ivas->mc_mode != MC_MODE_MCT && st_ivas->mc_mode != MC_MODE_PARAMUPMIX ) ) ) )

#endif

lib_dec/ivas_output_config.c

+2 −2
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ void ivas_renderer_select( 
            else /* ISM_MODE_DISC */

            {

#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG

                if ( output_config == AUDIO_CONFIG_BINAURAL )

                if ( output_config == AUDIO_CONFIG_BINAURAL || output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#else

                if ( output_config == AUDIO_CONFIG_BINAURAL || st_ivas->hRenderConfig->roomAcoustics.use_brir == 0 )

#endif