Commit 2cbb8a59 authored by Brown, Stefanie's avatar Brown, Stefanie
Browse files

Confining adaptive smoothing changes to HOA2 and HOA3 outputs, as discussed.

parent 7ee6ae7e

lib_dec/ivas_spar_decoder.c

+2 −2
Original line number Diff line number Diff line
@@ -1180,7 +1180,7 @@ void ivas_spar_dec_upmixer( 
        }



#ifdef LBR_ADAP_SMOOTHING

        if ( hDecoderConfig->ivas_total_brate < IVAS_24k4 )

        if ( ( hDecoderConfig->ivas_total_brate < IVAS_24k4 ) && ( ( hDecoderConfig->output_config == AUDIO_CONFIG_HOA2 ) || ( hDecoderConfig->output_config == AUDIO_CONFIG_HOA3 ) ) )

        {

            for ( in_ch = 0; in_ch < numch_in; in_ch++ )

            {
@@ -1195,7 +1195,7 @@ void ivas_spar_dec_upmixer( 
            ivas_spar_get_parameters( hSpar, hDecoderConfig, ts + i_sf * MAX_PARAM_SPATIAL_SUBFRAMES, numch_out, numch_in, num_spar_bands, mixer_mat );



#ifdef LBR_ADAP_SMOOTHING

            if ( hDecoderConfig->ivas_total_brate < IVAS_24k4 )

            if ( ( hDecoderConfig->ivas_total_brate < IVAS_24k4 ) && ( ( hDecoderConfig->output_config == AUDIO_CONFIG_HOA2 ) || ( hDecoderConfig->output_config == AUDIO_CONFIG_HOA3 ) ) )

            {

                for ( spar_band = 0; spar_band < num_spar_bands; spar_band++ )

                {