Commit e520e222 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

fix formatting

parent abd666e4

lib_com/ivas_prot.h

+0 −5
Original line number Diff line number Diff line
@@ -3021,12 +3021,7 @@ void ivas_mct_core_enc( 
    const int32_t ivas_total_brate,                             /* i  : IVAS total bitrate                      */

    const int16_t switch_bw,                                    /* i  : flag bandwidth switch occurance         */

    const int16_t lfe_bits,                                     /* i  : bits spent for LFE                      */

#ifdef NONBE_FIX_ISM_XOVER_BR

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

    const int16_t nchan_ism                                     /* i  : number of input ISM's                   */

#else

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

#endif

);



void ivas_mdct_quant_coder(

lib_enc/ivas_mct_core_enc.c

+6 −10
Original line number Diff line number Diff line
@@ -191,10 +191,6 @@ void ivas_mct_core_enc( 
    const int16_t switch_bw,             /* i  : flag bandwidth switch occurance */

    const int16_t lfe_bits,              /* i  : bits spent for LFE              */

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

#ifdef NONBE_FIX_ISM_XOVER_BR

    ,

    const int16_t nchan_ism /* i  : number of input ISM's           */

#endif

)

{

    int16_t ch, ch_core, nSubframes, L_subframeTCX;

lib_enc/ivas_mct_enc.c

+1 −6
Original line number Diff line number Diff line
@@ -248,12 +248,7 @@ ivas_error ivas_mct_enc( 
    }



    /* joint MCT encoding */

    ivas_mct_core_enc( ivas_format, hMCT, st_ivas->hCPE, hMCT->nchan_out_woLFE, ivas_total_brate, switch_bw, ( ivas_format == MC_FORMAT && ( st_ivas->mc_mode == MC_MODE_MCT || st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) ) ? (int16_t) st_ivas->hLFE->lfe_bits : 0, st_ivas->hEncoderConfig->sba_order

#ifdef NONBE_FIX_ISM_XOVER_BR

                       ,

                       st_ivas->hEncoderConfig->nchan_ism

#endif

    );

    ivas_mct_core_enc( ivas_format, hMCT, st_ivas->hCPE, hMCT->nchan_out_woLFE, ivas_total_brate, switch_bw, ( ivas_format == MC_FORMAT && ( st_ivas->mc_mode == MC_MODE_MCT || st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) ) ? (int16_t) st_ivas->hLFE->lfe_bits : 0, st_ivas->hEncoderConfig->sba_order );



    /* Spectrum quantization and coding */

    for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ )

lib_dec/ivas_init_dec.c

+22 −22

File changed.

Contains only whitespace changes.