Commit 98737583 authored by Nicolas Roussin's avatar Nicolas Roussin
Browse files

Fix build failures.

parent f8eb1f0e

lib_rend/ivas_dirac_dec_binaural_functions_fx.c

+1 −36
Original line number Diff line number Diff line
@@ -1317,41 +1317,6 @@ static void ivas_dirac_dec_decorrelate_slot_fx( 
    return;

}



static UWord32 ceil_pow2( UWord32 x )

{

    --x;

    x |= x >> 1;

    x |= x >> 2;

    x |= x >> 4;

    x |= x >> 8;

    x |= x >> 16;

    ++x;

    return x;

}



static UWord32 popcnt( UWord32 x )

{

    // it takes once cycle

    x = ( x & 0x55555555 ) + ( ( x & 0xAAAAAAAA ) >> 1 );

    x = ( x & 0x33333333 ) + ( ( x & 0xCCCCCCCC ) >> 2 );

    x = ( x & 0x0F0F0F0F ) + ( ( x & 0xF0F0F0F0 ) >> 4 );

    x = ( x & 0x00FF00FF ) + ( ( x & 0xFF00FF00 ) >> 8 );

    x = ( x & 0x0000FFFF ) + ( ( x & 0xFFFF0000 ) >> 16 );

    return x;

}



static UWord32 ceil_log2( UWord32 x )

{

    if ( x )

    {

        return popcnt( ceil_pow2( x ) - 1 );

    }

    else

    {

        return 0;

    }

}



static Word64 Mpy_64_32( Word64 W_var1, Word32 L_var2 )

{

#if 1
@@ -1582,7 +1547,7 @@ static void ivas_dirac_dec_binaural_formulate_input_covariance_matrices_fx( 
                tempIm = L_add( inIm_fx[0][slot][bin], inIm_fx[1][slot][bin] );                     // q

                temp64 = W_add( W_mult0_32_32( tempRe, tempRe ), W_mult0_32_32( tempIm, tempIm ) ); // 2q

#ifdef NONBE_2157_IVAS_DIRAC_DEC_BINAURAL_FORMULATE_INPUT_COVARIANCE_MATRICES

                subFrameSumEne[bin] = W_add( subFrameSumEne[bin], W_shr( temp64, rsh1 ) );

                subFrameSumEne[bin] = W_add( subFrameSumEne[bin], temp64 );

                move64();

#else

                exp1 = W_norm( temp64 );