Commit 12c996b4 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

do not skip reconfiguration when switching between first and higher-order DirAC decoding

parent 6cfcf1d2

lib_dec/ivas_sba_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ ivas_error ivas_sba_dec_reconfigure( 
        return error;

    }

#endif

#ifndef NONBE_FIX_736_FOA_BR_SWITCH

#if 1

    if ( ( ( st_ivas->renderer_type != RENDERER_DISABLE ) && ( st_ivas->renderer_type != RENDERER_SBA_LINEAR_DEC ) ) || ( ( hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_FOA ) && ( st_ivas->hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_STEREO ) && ( st_ivas->hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_MONO ) ) || ( last_ivas_total_brate > IVAS_256k && ivas_total_brate <= IVAS_256k ) || ( last_ivas_total_brate <= IVAS_256k && ivas_total_brate > IVAS_256k ) )

#else

    if ( ( ( st_ivas->renderer_type != RENDERER_DISABLE ) && ( st_ivas->renderer_type != RENDERER_SBA_LINEAR_DEC ) ) || ( ( hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_FOA ) && ( st_ivas->hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_STEREO ) && ( st_ivas->hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_MONO ) ) )