Commit 209e0454 authored by vaclav's avatar vaclav
Browse files

editorial changes

parent 0310f3dc

lib_com/ivas_prot.h

+3 −2
Original line number Diff line number Diff line
@@ -3721,8 +3721,9 @@ void ivas_sba_upmixer_renderer( 
);



void ivas_sba_mix_matrix_determiner(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder struct                     */

    float in_out[][L_FRAME48k],                                 /* i/o: transport/output audio channels         */

    SPAR_DEC_HANDLE hSpar,                                      /* i/o: SPAR decoder handle                     */

    float output[][L_FRAME48k],                                 /* i/o: transport/output audio channels         */

    const int16_t bfi,                                          /* i  : BFI flag                                */

    const int16_t nchan_remapped,                               /* i  : num channels after remapping of TCs     */

    const int16_t output_frame                                  /* i  : output frame length                     */

);

lib_dec/ivas_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ ivas_error ivas_dec( 


            if ( st_ivas->sba_mode == SBA_MODE_SPAR && ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) )

            {

                ivas_sba_mix_matrix_determiner( st_ivas, output, nchan_remapped, output_frame );

                ivas_sba_mix_matrix_determiner( st_ivas->hSpar, output, st_ivas->bfi, nchan_remapped, output_frame );

            }

        }

lib_dec/ivas_mc_param_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,6 @@ ivas_error ivas_param_mc_dec_open( 
            return error;

        }





        /* convert the ls conv dmx matrix into column order matrix format (nchan_out_cldfb x nchan_out) */

        if ( hParamMC->synthesis_conf == PARAM_MC_SYNTH_LS_CONV_COV || hParamMC->synthesis_conf == PARAM_MC_SYNTH_MONO_STEREO )

        {
@@ -297,6 +296,7 @@ ivas_error ivas_param_mc_dec_open( 
        matrix_product( hParamMC->ls_conv_dmx_matrix, nchan_out_cov, nchan_out_transport, 0,

                        ivas_param_mc_conf[config_index].dmx_fac, nchan_out_transport, nchan_transport, 0,

                        proto_matrix );



        if ( hParamMC->synthesis_conf == PARAM_MC_SYNTH_MONO_STEREO )

        {

            proto_mtx_norm = 1.f;

lib_dec/ivas_sba_rendering.c

+3 −5
Original line number Diff line number Diff line
@@ -291,19 +291,17 @@ void ivas_sba_upmixer_renderer( 
 *-------------------------------------------------------------------*/



void ivas_sba_mix_matrix_determiner(

    Decoder_Struct *st_ivas,      /* i/o: IVAS decoder struct                 */

    SPAR_DEC_HANDLE hSpar,        /* i/o: SPAR decoder handle                 */

    float output[][L_FRAME48k],   /* i/o: transport/output audio channels     */

    const int16_t bfi,            /* i  : BFI flag                            */

    const int16_t nchan_remapped, /* i  : num channels after remapping of TCs */

    const int16_t output_frame    /* i  : output frame length                 */

)

{

    int16_t i, ch;

    float temp;

    SPAR_DEC_HANDLE hSpar;

    int16_t num_bands_out, nchan_transport, nchan_out;



    hSpar = st_ivas->hSpar;



    /* Convert numeric range */

    for ( ch = 0; ch < nchan_remapped; ch++ )

    {
@@ -341,7 +339,7 @@ void ivas_sba_mix_matrix_determiner( 


    /* Mixing matrix determiner */

    num_bands_out = hSpar->hFbMixer->pFb->filterbank_num_bands;

    ivas_spar_dec_gen_umx_mat( hSpar->hMdDec, nchan_transport, num_bands_out, st_ivas->bfi );

    ivas_spar_dec_gen_umx_mat( hSpar->hMdDec, nchan_transport, num_bands_out, bfi );



    return;

}

lib_dec/ivas_stereo_mdct_core_dec.c

+1 −2
Original line number Diff line number Diff line
@@ -381,8 +381,7 @@ void stereo_mdct_core_dec( 


    ivas_mdct_core_tns_ns( hCPE, 0, fUseTns, tnsData, x, Aq, 0 );



    if (

        st_ivas->renderer_type == RENDERER_MC_PARAMMC && ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_MONO || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_STEREO ) )

    if ( st_ivas->renderer_type == RENDERER_MC_PARAMMC && ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_MONO || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_STEREO ) )

    {

        ivas_ls_setup_conversion_process_mdct_param_mc( st_ivas, x );

    }