Commit 1b01c0a3 authored by vaclav's avatar vaclav
Browse files

accept REMOVE_UNUSED_FUNCTION

parent 6e82962a

lib_com/ivas_fb_mixer.c

+12 −52
Original line number Diff line number Diff line
@@ -727,21 +727,13 @@ void ivas_fb_mixer_process( 


void ivas_fb_mixer_get_in_out_mapping(

    const IVAS_FB_CFG *fb_cfg,                                                       /* i  : FB config. handle  */

#ifndef REMOVE_UNUSED_FUNCTION

    const int16_t nchan_transport, /* i  : number of transport channels                  */

    const int16_t enc_dec_flag,    /* i  : encoder or decoder flag                       */

    const int16_t *order,          /* i  : downmix order                                 */

#endif

    int16_t in_out_mixer_map[IVAS_MAX_FB_MIXER_OUT_CH][IVAS_MAX_SPAR_FB_MIXER_IN_CH] /* i/o: mixing mapping     */

)

{

    int16_t i, j;



    set_s( (int16_t *) in_out_mixer_map, 0, IVAS_MAX_FB_MIXER_OUT_CH * IVAS_MAX_SPAR_FB_MIXER_IN_CH );

#ifndef REMOVE_UNUSED_FUNCTION

    if ( enc_dec_flag == ENC )

    {

#endif



    if ( fb_cfg->active_w_mixing )

    {

        for ( i = 0; i < fb_cfg->num_out_chans; i++ )
@@ -760,39 +752,7 @@ void ivas_fb_mixer_get_in_out_mapping( 
            in_out_mixer_map[i][0] = 1;

        }

    }

#ifndef REMOVE_UNUSED_FUNCTION

    }

    else

    {

        in_out_mixer_map[0][0] = 1; /* W depends on only W input*/

        for ( i = 1; i < nchan_transport; i++ )

        {

            in_out_mixer_map[order[i]][0] = 1;

            in_out_mixer_map[order[i]][i] = 1;

        }

        if ( nchan_transport == 1 )

        {

            /* no cross predicitons in 1 ch dmx*/

            for ( i = nchan_transport; i < fb_cfg->num_out_chans; i++ )

            {

                in_out_mixer_map[order[i]][0] = 1;

                in_out_mixer_map[order[i]][i] = 1;

            }

        }

        else

        {

            /* handle the cross predictions and decorrelation*/

            for ( i = nchan_transport; i < fb_cfg->num_out_chans; i++ )

            {

                for ( j = 0; j < nchan_transport; j++ )

                {

                    in_out_mixer_map[order[i]][j] = 1;

                }

                in_out_mixer_map[order[i]][i] = 1;

            }

        }

    }

#endif



    return;

}

lib_com/ivas_prot.h

+1 −14
Original line number Diff line number Diff line
@@ -110,12 +110,7 @@ ivas_error mct_enc_reconfigure( 
ivas_error ivas_sba_enc_reconfigure(

    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                  */

);

#ifndef REMOVE_UNUSED_FUNCTION

/*! r: maximum SBA metadata bit-budget */

int16_t ivas_sba_get_max_md_bits(

    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                  */

);

#endif



void destroy_sce_enc(

    SCE_ENC_HANDLE hSCE                                         /* i/o: SCE encoder structure                   */

);
@@ -4164,9 +4159,6 @@ ivas_error ivas_sba_linear_renderer( 
	const int16_t nchan_ism,

    const AUDIO_CONFIG output_config,                           /* i  : output audio configuration                              */

    const IVAS_OUTPUT_SETUP output_setup                        /* i  : output format setup                                     */

#ifndef REMOVE_UNUSED_FUNCTION

    ,const float hoa_dec_mtx[]                                   /* i  : HOA decoding mtx                                        */

#endif

);



void ivas_sba_mix_matrix_determiner(
@@ -6036,11 +6028,6 @@ void ivas_fb_mixer_process( 


void ivas_fb_mixer_get_in_out_mapping(

    const IVAS_FB_CFG *fb_cfg,                                  /* i  : FB config. handle                           */

#ifndef REMOVE_UNUSED_FUNCTION

    const int16_t nchan_transport,                              /* i  : number of transport channels                */

    const int16_t enc_dec_flag,                                 /* i  : encoder or decoder flag                     */

    const int16_t *order,                                       /* i  : downmix order                               */

#endif

    int16_t in_out_mixer_map[IVAS_MAX_FB_MIXER_OUT_CH][IVAS_MAX_SPAR_FB_MIXER_IN_CH]   /* i/o: mixing mapping       */

);

lib_com/ivas_spar_com.c

+4 −13
Original line number Diff line number Diff line
@@ -251,20 +251,11 @@ int16_t ivas_get_sba_num_TCs( 
)

{

    int16_t table_idx, nchan_transport;

#ifndef REMOVE_UNUSED_FUNCTION

    if ( ivas_total_brate == IVAS_SID_5k2 )

    {

        nchan_transport = 1;

    }

    else

    {

#endif



    table_idx = ivas_get_spar_table_idx( ivas_total_brate, sba_order, SPAR_CONFIG_BW, NULL, NULL );



    nchan_transport = ivas_spar_br_table_consts[table_idx].nchan_transport;

#ifndef REMOVE_UNUSED_FUNCTION

    }

#endif



    return nchan_transport;

}

lib_com/options.h

+0 −2
Original line number Diff line number Diff line
@@ -158,8 +158,6 @@ 
#define ROM_TO_RAM                                     /*Dlb : ROM optimization in SR mode*/     

#define FIX_712_713_SPLIT_REND_MASA_MC                 /*Dlb : Fix for issue 712 and 713*/

#endif

#define REMOVE_UNUSED_FUNCTION                          /* Dlb: Remove functions that are unhit/unused */





#define FIX_708_DPID_COMMAND_LINE                       /* issue 708: sanity checks for '-dpid' command-line */

#define FIX_513_REND_MC_ALLOC                           /* FhG: issue 513, optimise external renderer allocation for multichannel */

lib_dec/ivas_agc_dec.c

+2 −15
Original line number Diff line number Diff line
@@ -255,21 +255,8 @@ void ivas_agc_read_bits( 
    /* read AGC parameters */

    if ( AGC_flag == 1 )

    {

#ifndef REMOVE_UNUSED_FUNCTION

        if ( n_channels > 1 )

        {

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

            {

                per_ch_bit[i] = get_next_indice( st0, 1 );

            }

        }

        else

        {

#endif

        per_ch_bit[0] = 1;

#ifndef REMOVE_UNUSED_FUNCTION

        }

#endif



        assert( AGC_BITS_PER_CH == ( pState->agc_com.betaE + 1 ) );

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

        {