Commit ad4fcda0 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

only set hConfig->enc_param_start_band when switching between FO- and HO-DirAC... 

only set hConfig->enc_param_start_band when switching between FO- and HO-DirAC and do not reconfigure DirAC
parent 12c996b4

lib_dec/ivas_sba_dec.c

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

    }

#endif

#if 1

#ifndef NONBE_FIX_736_FOA_BR_SWITCH

    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 ) ) )
@@ -360,6 +360,8 @@ ivas_error ivas_sba_dec_reconfigure( 


        ivas_dirac_config_bands( band_grouping, IVAS_MAX_NUM_BANDS, (int16_t) ( st_ivas->hDecoderConfig->output_Fs * INV_CLDFB_BANDWIDTH + 0.5f ),

                                 st_ivas->hSpar->dirac_to_spar_md_bands, st_ivas->hQMetaData->useLowerBandRes, st_ivas->hSpar->enc_param_start_band, 0 );



        st_ivas->hDirAC->hConfig->enc_param_start_band = st_ivas->hSpar->enc_param_start_band;

    }

#endif

    if ( st_ivas->renderer_type == RENDERER_DISABLE )