Commit 487815fe authored by vaclav's avatar vaclav
Browse files

replace "st_ivas->hDecoderConfig" with "hDecoderConfig"

parent be159dca

lib_dec/ivas_spar_decoder.c

+7 −9
Original line number Diff line number Diff line
@@ -89,8 +89,7 @@ ivas_error ivas_spar_dec_open( 
    }



    /* MD handle */

    if ( ( error = ivas_spar_md_dec_open( &hSpar->hMdDec, st_ivas->hDecoderConfig, num_channels_internal,

                                          sba_order_internal ) ) != IVAS_ERR_OK )

    if ( ( error = ivas_spar_md_dec_open( &hSpar->hMdDec, st_ivas->hDecoderConfig, num_channels_internal, sba_order_internal ) ) != IVAS_ERR_OK )

    {

        return error;

    }
@@ -1022,7 +1021,7 @@ void ivas_spar_dec_upmixer( 
     *---------------------------------------------------------------------*/



    /* set-up pointers */

    if ( st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_FOA )

    if ( hDecoderConfig->output_config != AUDIO_CONFIG_FOA )

    {

        /* at this point, output channels are used as intermediate procesing buffers */

        for ( in_ch = 0; in_ch < MAX_OUTPUT_CHANNELS; in_ch++ )
@@ -1063,7 +1062,7 @@ void ivas_spar_dec_upmixer( 
    /* determine if we can skip certain data */

    ivas_spar_get_skip_mat( hSpar, numch_out, numch_in, num_spar_bands, b_skip_mat ); /* this can be precomputed based on bitrate and format*/



    numch_out_dirac = st_ivas->hDecoderConfig->nchan_out;

    numch_out_dirac = hDecoderConfig->nchan_out;



    for ( int16_t i_sf = 0; i_sf < MAX_PARAM_SPATIAL_SUBFRAMES; i_sf++ )

    {
@@ -1084,7 +1083,7 @@ void ivas_spar_dec_upmixer( 
        for ( ts = 0; ts < MAX_PARAM_SPATIAL_SUBFRAMES; ts++ )

        {

            /* determine SPAR parameters for this time slots */

            ivas_spar_get_parameters( hSpar, st_ivas->hDecoderConfig, ts + i_sf * MAX_PARAM_SPATIAL_SUBFRAMES, numch_out, numch_in, num_spar_bands, mixer_mat );

            ivas_spar_get_parameters( hSpar, hDecoderConfig, ts + i_sf * MAX_PARAM_SPATIAL_SUBFRAMES, numch_out, numch_in, num_spar_bands, mixer_mat );



            for ( cldfb_band = 0; cldfb_band < num_cldfb_bands; cldfb_band++ )

            {
@@ -1133,9 +1132,9 @@ void ivas_spar_dec_upmixer( 
            }

        }



        if ( st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_FOA

        if ( hDecoderConfig->output_config != AUDIO_CONFIG_FOA

#ifdef SPAR_STEREO_NO_DIRAC

             && st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_STEREO && st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_MONO

             && hDecoderConfig->output_config != AUDIO_CONFIG_STEREO && hDecoderConfig->output_config != AUDIO_CONFIG_MONO

#endif

        )

        {
@@ -1162,8 +1161,7 @@ void ivas_spar_dec_upmixer( 
                }

                else

                {

                    if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_FOA ||

                         !( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL || st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM ) )

                    if ( hDecoderConfig->output_config == AUDIO_CONFIG_FOA || !( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL || st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM ) )

                    {

                        for ( ts = 0; ts < MAX_PARAM_SPATIAL_SUBFRAMES; ts++ )

                        {

lib_enc/ivas_spar_encoder.c

+3 −3
Original line number Diff line number Diff line
@@ -161,11 +161,11 @@ ivas_error ivas_spar_enc_open( 


    if ( st_ivas->nchan_transport == 1 )

    {

        st_ivas->hEncoderConfig->element_mode_init = IVAS_SCE;

        hEncoderConfig->element_mode_init = IVAS_SCE;

    }

    else

    {

        st_ivas->hEncoderConfig->element_mode_init = IVAS_CPE_MDCT;

        hEncoderConfig->element_mode_init = IVAS_CPE_MDCT;

    }



    /*-----------------------------------------------------------------*
@@ -297,7 +297,7 @@ ivas_error ivas_spar_enc( 
    hEncoderConfig = st_ivas->hEncoderConfig;



    /* front VAD */

    if ( ( error = front_vad_spar( st_ivas->hSpar, data_f[0], st_ivas->hEncoderConfig, input_frame ) ) != IVAS_ERR_OK )

    if ( ( error = front_vad_spar( st_ivas->hSpar, data_f[0], hEncoderConfig, input_frame ) ) != IVAS_ERR_OK )

    {

        return error;

    }