Commit b1cc181a authored by multrus's avatar multrus
Browse files

[cleanup] accept SBA_HOA_HBR_IMPROV

parent 9a69a5ba

lib_com/ivas_prot.h

+0 −8
Original line number Diff line number Diff line
@@ -3018,10 +3018,8 @@ void ivas_dirac_param_est_enc( 
    float **pp_fr_real,

    float **pp_fr_imag,

    const int16_t input_frame 

#ifdef SBA_HOA_HBR_IMPROV

	,

    const SBA_MODE sba_mode                                    

#endif

 );



/*----------------------------------------------------------------------------------*
@@ -3081,13 +3079,11 @@ int16_t ivas_sba_get_nchan_metadata( 
    const int16_t sba_order                                     /* i  : Ambisonic (SBA) order                   */

);



#ifdef SBA_HOA_HBR_IMPROV

/*! r: flag indicating to code SPAR HOA MD for all bands */

int16_t ivas_sba_get_spar_hoa_md_flag(

    const int16_t sba_order,                                    /* i  : Ambisonic (SBA) order                   */

    const int32_t ivas_total_brate                              /* i  : IVAS total bitrate                      */

);

#endif



void ivas_sba_zero_vert_comp(

    float sba_data[][L_FRAME48k],                               /* i/o: SBA data frame                          */
@@ -3975,10 +3971,8 @@ ivas_error ivas_spar_md_dec_open( 
    ivas_spar_md_dec_state_t **hMdDec_out,                      /* i/o: SPAR MD decoder handle                  */

    const DECODER_CONFIG_HANDLE hDecoderConfig,                 /* i  : configuration structure                 */

    const int16_t num_channels                                  /* i  : number of internal channels             */

#ifdef SBA_HOA_HBR_IMPROV

    ,

	const int16_t sba_order                                     /* i  : SBA order                               */

#endif

);



void ivas_spar_md_dec_close(
@@ -4812,10 +4806,8 @@ void computeReferencePower_enc( 
    float *reference_power,                                     /* o  : Estimated power                                 */

    const int16_t enc_param_start_band,                         /* i  : first band to process                           */

    const int16_t num_freq_bands                                /* i  : Number of frequency bands                       */

#ifdef SBA_HOA_HBR_IMPROV

	,

    const SBA_MODE sba_mode                                     /* i  : SBA mode                                        */

#endif

);

lib_com/ivas_sba_config.c

+0 −2
Original line number Diff line number Diff line
@@ -281,7 +281,6 @@ int16_t ivas_sba_get_nchan_metadata( 
    return ( nb_channels );

}



#ifdef SBA_HOA_HBR_IMPROV

/*-------------------------------------------------------------------*

 * ivas_sba_get_spar_hoa_md_flag()

 *
@@ -307,7 +306,6 @@ int16_t ivas_sba_get_spar_hoa_md_flag( 


    return spar_hoa_md_flag;

}

#endif



/*-------------------------------------------------------------------*

 * ivas_sba_zero_vert_comp()

lib_com/ivas_spar_com.c

+0 −5
Original line number Diff line number Diff line
@@ -1737,11 +1737,6 @@ void ivas_get_spar_md_from_dirac( 


            /*SPAR from DirAC*/

            set_f( response_avg, 0.0f, MAX_OUTPUT_CHANNELS );

#ifndef SBA_HOA_HBR_IMPROV

            set_f( hSpar_md->band_coeffs[band + i_ts * IVAS_MAX_NUM_BANDS].pred_re, 0.0f, IVAS_SPAR_MAX_CH - 1 );

            set_f( &hSpar_md->band_coeffs[band + i_ts * IVAS_MAX_NUM_BANDS].C_re[0][0], 0.0f, ( IVAS_SPAR_MAX_CH - IVAS_SPAR_MAX_DMX_CHS ) * ( IVAS_SPAR_MAX_DMX_CHS - 1 ) );

            set_f( &hSpar_md->band_coeffs[band + i_ts * IVAS_MAX_NUM_BANDS].P_re[0], 0.0f, ( IVAS_SPAR_MAX_CH - 1 ) );

#endif

            if ( n_ts > 1 )

            {

                ivas_dirac_dec_get_response( (int16_t) azi_dirac[band][i_ts], (int16_t) ele_dirac[band][i_ts], response_avg, order );

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -144,7 +144,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define FIX_I1_113*/                                  /* under review : MCT bit distribution optimization for SBA high bitrates*/



#define SBA_HOA_HBR_IMPROV                              /* issue 91: Improvements to SBA high bitrate HOA3 coding */

#define ALLRAD_OPTIM                                    /* Issue 159: Optimize memory allocation for ALLRAD */

#define FIX_I178_HQ_BUFFER_OVERRUN                      /* issue 178: Buffer overrun in HQ core decoder -- spectral filling buffer did not account for extended transition frame in IVAS */

#define PRINT_SBA_ORDER                                 /* Issue 179: print-out also the SBA order of IVAS SBA format to stdout */

lib_dec/ivas_spar_decoder.c

+0 −8
Original line number Diff line number Diff line
@@ -90,10 +90,8 @@ ivas_error ivas_spar_dec_open( 


    /* MD handle */

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

#ifdef SBA_HOA_HBR_IMPROV

                                          ,

                                          sba_order_internal

#endif

                                          ) ) != IVAS_ERR_OK )

    {

        return error;
@@ -649,13 +647,11 @@ static void ivas_spar_dec_MD( 
        {

            ivas_parse_spar_header( hDecoderConfig->ivas_total_brate, sba_order, st0, &table_idx );



#ifdef SBA_HOA_HBR_IMPROV

            if ( hSpar->hMdDec->spar_hoa_md_flag )

            {

                hSpar->hMdDec->spar_md.num_bands = IVAS_MAX_NUM_BANDS;

            }

            else

#endif

            {

                hSpar->hMdDec->spar_md.num_bands = min( SPAR_DIRAC_SPLIT_START_BAND, IVAS_MAX_NUM_BANDS );

            }
@@ -801,11 +797,7 @@ void ivas_spar_get_parameters( 


    weight = ivas_spar_get_cldfb_slot_gain( hSpar, hDecoderConfig, ts, &ts0, &ts1, &weight_20ms );



#ifdef SBA_HOA_HBR_IMPROV

    split_band = hSpar->hMdDec->spar_md.num_bands;

#else

    split_band = SPAR_DIRAC_SPLIT_START_BAND;

#endif



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

    {