Commit 0e4f420f authored by vaclav's avatar vaclav
Browse files

- Merge remote-tracking branch 'remotes/origin/main' into 20231020_maintenance

parents 8d778169 544ee16d

ci/complexity_measurements/mergeNewsletterRam.py

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
# accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and

# the United Nations Convention on Contracts on the International Sales of Goods.

import csv

import re

import sys



newsletterFilename = ""

ci/complexity_measurements/mergeNewsletterRom.py

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
# accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and

# the United Nations Convention on Contracts on the International Sales of Goods.

import csv

import re

import sys



newsletterFilename = ""

lib_com/ivas_prot.h

+7 −7
Original line number Diff line number Diff line
@@ -1095,11 +1095,13 @@ void ivas_param_ism_dec_close( 
    const AUDIO_CONFIG output_config                            /* i  : output audio configuration                  */

);



#ifndef FIX_1022_REMOVE_PARAMISM_DEC

void ivas_param_ism_dec(

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

    float *output_f[]                                           /* i/o: synthesized core-coder transport channels/DirAC output  */

);



#endif

void ivas_ism_dec_digest_tc(

    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                      */

);
@@ -3495,13 +3497,6 @@ ivas_error ivas_cldfb_dec_reconfig( 
    const int16_t numCldfbSyntheses_old                         /* i  : number of CLDFB synthesis instances in previous frame */

);



#ifndef FIX_993_REMOVE_SBA_GET_ORDER

/*! r: Ambisonic (SBA) order */

int16_t ivas_sba_get_order(

    const int16_t nb_channels,                                  /* i  : Number of ambisonic channels            */

    const int16_t sba_planar                                    /* i  : SBA planar flag                         */

);

#endif

/*! r: Ambisonic (SBA) order used for analysis and coding */

int16_t ivas_sba_get_analysis_order(

    const int32_t ivas_total_brate,                             /* i  : IVAS total bitrate                      */
@@ -3871,11 +3866,13 @@ void ivas_param_mc_dec_render( 
    float *output_f[]                                           /* o  : rendered time signal                                */

);



#ifndef FIX_1023_REMOVE_PARAMMC_DEC

void ivas_param_mc_dec(

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

    float *output_f[]                                           /* i/o: synthesized core-coder transport channels/DirAC output  */

);



#endif

/*! r: number of cldfb synthesis instances */

int16_t param_mc_get_num_cldfb_syntheses( 

    Decoder_Struct *st_ivas                                     /* i  : IVAS decoder structure                              */
@@ -5199,6 +5196,9 @@ void ivas_ism_renderer_close( 


void ivas_ism_render_sf(

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

#ifdef NONBE_FIX_1021_ISM_BRIR_RS_FLUSH

    const RENDERER_TYPE renderer_type,                          /* i  : active renderer type                            */

#endif

    float *output_f[],                                          /* i/o: core-coder transport channels/object output     */

    const int16_t n_samples_to_render                           /* i  : output frame length per channel                 */

);

lib_com/ivas_sba_config.c

+0 −47
Original line number Diff line number Diff line
@@ -64,23 +64,7 @@ void ivas_sba_config( 
    int16_t *element_mode          /* o  : element mode of the core coder           */

)

{

#ifndef FIX_993_REMOVE_SBA_GET_ORDER

    if ( ( sba_order < 0 ) && ( nb_channels < 0 ) )

    {

        assert( 0 && "Either order or number of channels must be positive" );

    }

    else if ( sba_order < 0 )

    {

        sba_order = ivas_sba_get_order( nb_channels, sba_planar );

    }

    else if ( nb_channels < 0 )

    {

        nb_channels = ivas_sba_get_nchan( sba_order, sba_planar );

    }

    else

#else

    if ( nb_channels > 0 )

#endif

    {

        if ( sba_planar )

        {
@@ -121,37 +105,6 @@ void ivas_sba_config( 
    return;

}



#ifndef FIX_993_REMOVE_SBA_GET_ORDER

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

 * ivas_sba_get_order()

 *

 * Get Ambisonic order from number of ambisonic channels

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



/*! r: Ambisonic (SBA) order */

int16_t ivas_sba_get_order(

    const int16_t nb_channels, /* i  : Number of ambisonic channels     */

    const int16_t sba_planar   /* i  : SBA Planar flag                  */

)

{

    int16_t sba_order;



    if ( sba_planar )

    {

        sba_order = ( nb_channels - 1 ) / 2;

        assert( ( 2 * sba_order + 1 == nb_channels ) && "Number of channels not supported in Planar SBA!" );

    }

    else

    {

        sba_order = (int16_t) sqrtf( (float) nb_channels ) - 1;

        assert( ( ( sba_order + 1 ) * ( sba_order + 1 ) == nb_channels ) && "Number of channels not supported in SBA!" );

    }



    assert( ( sba_order <= 3 ) && "Error: SBA order must be <= 3!" );



    return ( sba_order );

}

#endif



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

 * ivas_sba_get_analysis_order()

lib_com/ivas_stat_com.h

+0 −1
Original line number Diff line number Diff line
@@ -242,7 +242,6 @@ typedef struct ivas_spar_md_com_cfg 
    int16_t max_bits_per_blk;

    int16_t prev_quant_idx;

    int16_t agc_bits_ch_idx;

    int16_t planarCP;

    int16_t num_umx_chs;

    int16_t max_md_bits_spar;