Commit fd3ba83e authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge branch 'main' to '196-refactor-renderer-output-configuration'

parents c8654099 48639e13

lib_com/fine_gain_bits.c

+6 −0
Original line number Diff line number Diff line
@@ -101,7 +101,9 @@ int16_t assign_gain_bits( 
    int16_t *Rcalc             /* o  : Bit budget for shape quantizer (Q3)     */

)

{

#ifndef FIX_506_WARNINGS

    int16_t subband_cnt;

#endif

    int16_t gain_bits_tot;

    int16_t i;
@@ -116,14 +118,18 @@ int16_t assign_gain_bits( 
    }



    /* Re-adjust bit budget for gain quantization */

#ifndef FIX_506_WARNINGS

    subband_cnt = 0;

#endif

    gain_bits_tot = 0;

    *Rcalc = 0;

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

    {

        if ( Rk[i] > 0 )

        {

#ifndef FIX_506_WARNINGS

            subband_cnt++;

#endif

            Rk[i] -= gain_bits_array[i] * 8;

            gain_bits_tot += gain_bits_array[i];

            *Rcalc += Rk[i];

lib_com/hq_tools.c

+4 −0
Original line number Diff line number Diff line
@@ -1228,7 +1228,9 @@ int16_t calc_nor_delta_hf( 
    int16_t i;

    int16_t ynrm_t[44], normqlg2_t[44];

    int16_t delta, max_delta, min_delta, bitsforDelta, add_bits_denv;

#ifndef FIX_506_WARNINGS

    int16_t temp_num = 0;

#endif



    max_delta = -100;

    calc_norm( t_audio, ynrm_t, normqlg2_t, 0, nb_sfm, sfmsize, sfm_start );
@@ -1290,7 +1292,9 @@ int16_t calc_nor_delta_hf( 
                ynrm[i] += delta;

                add_bits_denv += bitsforDelta;



#ifndef FIX_506_WARNINGS

                temp_num++;

#endif

            }

        }

lib_com/ivas_prot.h

+6 −0
Original line number Diff line number Diff line
@@ -3999,9 +3999,15 @@ void ivas_mc_paramupmix_dec( 
    float output_f[][L_FRAME48k]                                    /* i/o: synthesized core-coder transport channels/DirAC output  */

);



#ifdef FIX_506_WARNINGS

int16_t ivas_mc_paramupmix_enc_getNumTransportChannels(

    void

);

#else

int16_t ivas_mc_paramupmix_getNumTransportChannels(

    void

);

#endif



ivas_error ivas_mc_paramupmix_dec_open(

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

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ 


#define FIX_483                                         /* FhG: fix issue 483, division by zero in nois_est */

#define FIX_483b                                        /* FhG: fix issue 483, uninitialized values in ivas_mct_core_enc */

#define FIX_506_WARNINGS                                /* FhG/Eri/Dlb/VA: Issue 508, Warnings on MacOS */

#define FIX_170_DTX_MASA                                /* Nokia: Fix issue 170, relaxing the use of DTX in MASA format */

#define FIX_296_CFG_LFE_SCENE_DESC                       /* FhG: Fix issue 296 - add configurable LFE handling to the scene description file */

#define FIX_510                                         /* FhG: fix issue 510, misleading error message for invalid input format */
@@ -243,6 +244,7 @@ 
#define BINAURAL_AUDIO_CMDLINE

#define FIX_570_TCX_LPC_WRITE                           /* FhG: fix issue 570: LPC bitstream writer in TCX */

#define FIX_506                                         /* FhG: Compiler warnings */

#define FIX_511_OPTIMIZE_PARAMBIN_GAIN_FETCH            /* Nokia: Issue 511, significant optimization of parametric binauralizer gain fetching. */



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

lib_dec/ivas_mc_paramupmix_dec.c

+24 −1
Original line number Diff line number Diff line
@@ -66,6 +66,10 @@ static void dequant_beta( int16_t nv, int16_t ivStart, QUANT_TYPE quant_type, in 


static void get_ec_data( Decoder_State *st, PAR_TYPE parType, QUANT_TYPE quant_type, int16_t nParBand, int16_t parBandStart, int32_t *parQ, int32_t *alphaQEnv, float ab[IVAS_MAX_NUM_BANDS] );



#ifdef FIX_506_WARNINGS

static int16_t ivas_mc_paramupmix_dec_getNumTransportChannels( void );

#endif



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

 * ivas_mc_paramupmix_dec_read_BS()

 *
@@ -288,6 +292,7 @@ void ivas_mc_paramupmix_dec( 
    return;

}



#ifndef FIX_506_WARNINGS

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

 * ivas_mc_paramupmix_getNumTransportChannels()

 *
@@ -299,6 +304,7 @@ int16_t ivas_mc_paramupmix_getNumTransportChannels() 
    nchan_transport = MC_PARAMUPMIX_MAX_TRANSPORT_CHANS; /* 5.1.2 */

    return nchan_transport;

}

#endif



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

 * ivas_mc_paramupmix_dec_open()
@@ -328,8 +334,11 @@ ivas_error ivas_mc_paramupmix_dec_open( 
    }

    output_Fs = st_ivas->hDecoderConfig->output_Fs;

    hMCParamUpmix->first_frame = 1;



#ifdef FIX_506_WARNINGS

    st_ivas->nchan_transport = ivas_mc_paramupmix_dec_getNumTransportChannels();

#else

    st_ivas->nchan_transport = ivas_mc_paramupmix_getNumTransportChannels();

#endif

    nchan_transport = st_ivas->nchan_transport;



    switch ( nchan_transport )
@@ -691,3 +700,17 @@ static void get_ec_data( 
        dequant_beta( nParBand, parBandStart, quant_type, alphaQEnv, parQ, ab );

    }

}



#ifdef FIX_506_WARNINGS

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

 * ivas_mc_paramupmix_getNumTransportChannels()

 *

 *

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

static int16_t ivas_mc_paramupmix_dec_getNumTransportChannels( void )

{

    int16_t nchan_transport;

    nchan_transport = MC_PARAMUPMIX_MAX_TRANSPORT_CHANS; /* 5.1.2 */

    return nchan_transport;

}

#endif