Commit c4219156 authored by emerit's avatar emerit
Browse files

Merge branch 'main' into orange/no-diegetic-pan-with-radius

parents dccd7a0b 02f4a45e

apps/renderer.c

+5 −1
Original line number Diff line number Diff line
@@ -2651,7 +2651,11 @@ static void parseSceneDescriptionFile( 
    return;

}



static void printSupportedAudioConfigs()

static void printSupportedAudioConfigs(

#ifdef FIX_CLANG_WARNING

    void

#endif

)

{

    uint16_t i;

    const char *supportedFormats[] = {

lib_com/bitstream.c

+8 −0
Original line number Diff line number Diff line
@@ -989,7 +989,11 @@ void indices_to_serial_generic( 
    Word16 *pFrame_size       /* i/o: number of bits in the binary encoded access unit [bits]       */

)

{

#ifdef FIX_CLANG_WARNING

    Word16 i, k;

#else

    Word16 i, k, j;

#endif

    Word32 mask;

    UWord8 omask;

    UWord8 *pt_pFrame = pFrame;
@@ -1002,7 +1006,9 @@ void indices_to_serial_generic( 
     * Bitstream packing (conversion of individual indices into a serial stream)

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



#ifndef FIX_CLANG_WARNING

    j = 0;

#endif

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

    {

        if ( ind_list[i].nb_bits > 0 )
@@ -1014,7 +1020,9 @@ void indices_to_serial_generic( 
            for ( k = 0; k < ind_list[i].nb_bits; k++ )

            {

                pack_bit( ind_list[i].value & mask, &pt_pFrame, &omask );

#ifndef FIX_CLANG_WARNING

                j++;

#endif

                mask >>= 1;

            }

            nb_bits_tot += ind_list[i].nb_bits;

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_CLANG_WARNING

    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_CLANG_WARNING

    subband_cnt = 0;

#endif    

    gain_bits_tot = 0;

    *Rcalc = 0;

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

    {

        if ( Rk[i] > 0 )

        {

#ifndef FIX_CLANG_WARNING

            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 −1
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_CLANG_WARNING    

    int16_t temp_num = 0;

#endif



    max_delta = -100;

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

                add_bits_denv += bitsforDelta;





#ifndef FIX_CLANG_WARNING   

                temp_num++;

                #endif

            }

        }

lib_com/ivas_mct_com.c

+6 −0
Original line number Diff line number Diff line
@@ -66,10 +66,14 @@ void splitAvailableBitsMCT( 
    int16_t min_chan_bits[MCT_MAX_CHANNELS], min_bits_tot, remaining_bits;

    int16_t core[MCT_MAX_CHANNELS];

    MCT_CHAN_MODE mct_chan_mode[MCT_MAX_CHANNELS];

#ifndef FIX_CLANG_WARNING

    int16_t num_lfe;

#endif

    int16_t lfe_channel;



#ifndef FIX_CLANG_WARNING

    num_lfe = 0;

#endif

    lfe_channel = -1;

    min_bits_tot = 0;
@@ -88,7 +92,9 @@ void splitAvailableBitsMCT( 


        if ( mct_chan_mode[i] == MCT_CHAN_MODE_LFE )

        {

#ifndef FIX_CLANG_WARNING

            num_lfe++;

#endif

            lfe_channel = i;

            assert( lfe_channel == LFE_CHANNEL );

        }