Commit ae56f3d4 authored by emerit's avatar emerit
Browse files

bug and typo fix, merge with main

parent 7a727d52

apps/renderer.c

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

}



static void printSupportedAudioConfigs(

#ifdef FIX_CLANG_WARNING

    void

#endif

)

static void printSupportedAudioConfigs()

{

    uint16_t i;

    const char *supportedFormats[] = {

lib_com/bitstream.c

+0 −8
Original line number Diff line number Diff line
@@ -983,11 +983,7 @@ 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;
@@ -1000,9 +996,7 @@ 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,9 +1008,7 @@ 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/common_api_types.h

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ typedef struct _IVAS_ISM_METADATA 
    float yaw;

    float pitch;

#ifdef ISM_NON_DIEGETIC_PAN

    uint16_t non_diegetic_flag;

    int16_t non_diegetic_flag;

#endif

} IVAS_ISM_METADATA;

lib_com/fine_gain_bits.c

+0 −6
Original line number Diff line number Diff line
@@ -101,9 +101,7 @@ 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;
@@ -118,18 +116,14 @@ 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

+1 −4
Original line number Diff line number Diff line
@@ -1228,9 +1228,7 @@ 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 );
@@ -1292,9 +1290,8 @@ int16_t calc_nor_delta_hf( 
                ynrm[i] += delta;

                add_bits_denv += bitsforDelta;



#ifndef FIX_CLANG_WARNING   



                temp_num++;

#endif

            }

        }