Commit b769bf8c authored by vaclav's avatar vaclav
Browse files

formatting

parent 7bb94b29

lib_dec/ivas_spar_md_dec.c

+3 −10
Original line number Diff line number Diff line
@@ -444,8 +444,7 @@ ivas_error ivas_spar_md_dec_init( 


    hMdDec->spar_md.num_bands = ( hMdDec->spar_hoa_md_flag ) ? IVAS_MAX_NUM_BANDS : min( IVAS_MAX_NUM_BANDS, SPAR_DIRAC_SPLIT_START_BAND );



    ivas_spar_set_bitrate_config( &hMdDec->spar_md_cfg, hMdDec->table_idx,

                                  hMdDec->spar_md.num_bands );

    ivas_spar_set_bitrate_config( &hMdDec->spar_md_cfg, hMdDec->table_idx, hMdDec->spar_md.num_bands );



    nchan_transport = hMdDec->spar_md_cfg.nchan_transport;
@@ -2758,10 +2757,7 @@ void ivas_spar_to_dirac( 
    /* DirAC MD averaged over 4 subframes and converted to SPAR format similar to encoder processing */

    if ( hMdDec->spar_md_cfg.nchan_transport > 1 )

    {

        ivas_get_spar_md_from_dirac( azi_dirac, ele_dirac, diffuseness, 1, NULL, &hMdDec->spar_md, &hMdDec->spar_md_cfg,

                                     end_band, num_bands_out,

                                     ( hMdDec->spar_hoa_md_flag ) ? 1 : sba_order_internal,

                                     dtx_vad, NULL );

        ivas_get_spar_md_from_dirac( azi_dirac, ele_dirac, diffuseness, 1, NULL, &hMdDec->spar_md, &hMdDec->spar_md_cfg, end_band, num_bands_out, ( hMdDec->spar_hoa_md_flag ) ? 1 : sba_order_internal, dtx_vad, NULL );



        /* temporarily copy frame-wise prediction coefficients in DirAC bands*/

        for ( pred_idx = 0; pred_idx < FOA_CHANNELS - 1; pred_idx++ )
@@ -2773,10 +2769,7 @@ void ivas_spar_to_dirac( 
        }

    }



    ivas_get_spar_md_from_dirac( azi_dirac, ele_dirac, diffuseness, MAX_PARAM_SPATIAL_SUBFRAMES, NULL, &hMdDec->spar_md, &hMdDec->spar_md_cfg,

                                 end_band, num_bands_out,

                                 ( hMdDec->spar_hoa_md_flag ) ? 1 : sba_order_internal,

                                 dtx_vad, NULL );

    ivas_get_spar_md_from_dirac( azi_dirac, ele_dirac, diffuseness, MAX_PARAM_SPATIAL_SUBFRAMES, NULL, &hMdDec->spar_md, &hMdDec->spar_md_cfg, end_band, num_bands_out, ( hMdDec->spar_hoa_md_flag ) ? 1 : sba_order_internal, dtx_vad, NULL );



    /* expand DirAC TC 20ms MD for residual channels to all subframes*/

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

lib_enc/ivas_spar_encoder.c

+2 −6
Original line number Diff line number Diff line
@@ -549,8 +549,7 @@ static ivas_error ivas_spar_enc_process( 
    if ( hSpar->hMdEnc->table_idx != table_idx )

    {

        hSpar->hMdEnc->table_idx = table_idx;

        ivas_spar_set_bitrate_config( &hSpar->hMdEnc->spar_md_cfg, table_idx,

                                      ( hSpar->hMdEnc->spar_hoa_md_flag ) ? IVAS_MAX_NUM_BANDS : SPAR_DIRAC_SPLIT_START_BAND );

        ivas_spar_set_bitrate_config( &hSpar->hMdEnc->spar_md_cfg, table_idx, ( hSpar->hMdEnc->spar_hoa_md_flag ) ? IVAS_MAX_NUM_BANDS : SPAR_DIRAC_SPLIT_START_BAND );

    }



    nchan_transport = st_ivas->nchan_transport;
@@ -603,10 +602,7 @@ static ivas_error ivas_spar_enc_process( 
            Wscale_d[b] = min( 2.0f, max( Wscale_d[b], 1.0f ) );

        }



        ivas_get_spar_md_from_dirac( azi_dirac, ele_dirac, diffuseness, 1, hSpar->hMdEnc->mixer_mat, &hSpar->hMdEnc->spar_md, &hSpar->hMdEnc->spar_md_cfg,

                                     d_start_band, d_end_band,

                                     ( hSpar->hMdEnc->spar_hoa_md_flag ) ? 1 : sba_order,

                                     dtx_vad, Wscale_d );

        ivas_get_spar_md_from_dirac( azi_dirac, ele_dirac, diffuseness, 1, hSpar->hMdEnc->mixer_mat, &hSpar->hMdEnc->spar_md, &hSpar->hMdEnc->spar_md_cfg, d_start_band, d_end_band, ( hSpar->hMdEnc->spar_hoa_md_flag ) ? 1 : sba_order, dtx_vad, Wscale_d );

    }



    if ( hSpar->hMdEnc->spar_hoa_md_flag )

lib_enc/ivas_spar_md_enc.c

+1 −2
Original line number Diff line number Diff line
@@ -322,8 +322,7 @@ static ivas_error ivas_spar_md_enc_init( 
    table_idx = ivas_get_spar_table_idx( hEncoderConfig->ivas_total_brate, sba_order, SPAR_CONFIG_BW, NULL, NULL );



    hMdEnc->spar_md_cfg.gen_bs = 1;

    ivas_spar_set_bitrate_config( &hMdEnc->spar_md_cfg, table_idx,

                                  ( hMdEnc->spar_hoa_md_flag ) ? IVAS_MAX_NUM_BANDS : SPAR_DIRAC_SPLIT_START_BAND );

    ivas_spar_set_bitrate_config( &hMdEnc->spar_md_cfg, table_idx, ( hMdEnc->spar_hoa_md_flag ) ? IVAS_MAX_NUM_BANDS : SPAR_DIRAC_SPLIT_START_BAND );



    /* get FB coefficients */

    for ( i = 0; i < IVAS_MAX_NUM_BANDS; i++ )