Commit cd5c12f3 authored by malenov's avatar malenov
Browse files

merge main to branch

parents 7edc959a 315a2539

Makefile

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ CFLAGS += -std=c99 -pedantic -Wcast-qual -Wall -W -Wextra -Wno-long-long \ 
            -Wno-implicit-fallthrough -ffp-contract=off

# to be uncommented in CI

# CFLAGS += -Werror

CFLAGS += -Winit-self

CFLAGS += -Wunused-but-set-variable



# libs to link

LDLIBS   += -lm

lib_com/basop_util.c

+16 −0
Original line number Diff line number Diff line
@@ -1583,6 +1583,22 @@ Word16 idiv1616( Word16 x, Word16 y ) 
    return y;

}



Word16 idiv1616_1( Word16 x, Word16 y )

{

    IF( L_mult0( x, y ) < 0 )

    {

        return negate( idiv1616( abs_s( x ), abs_s( y ) ) );

    }

    ELSE IF( L_mult0( x, y ) > 0 )

    {

        return idiv1616( x, y );

    }

    ELSE

    {

        return 0;

    }

}



Word32 norm_llQ31(               /* o : normalized result              Q31 */

                   Word32 L_c,   /* i : upper bits of accu             Q-1 */

                   Word32 L_sum, /* i : lower bits of accu, unsigned   Q31 */

lib_com/basop_util.h

+2 −0
Original line number Diff line number Diff line
@@ -582,6 +582,8 @@ Word16 idiv1616U( Word16 x, Word16 y ); 


Word16 idiv1616( Word16 x, Word16 y );



Word16 idiv1616_1( Word16 x, Word16 y );



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

 * Dot_product16HQ:

 *

lib_com/bitallocsum_fx.c

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ void bitallocsum_fx( 
        total = add( total, tmp );

    }

    *sum = total;

    move16();



    IF( LE_16( length, L_FRAME32k ) )

    {
@@ -49,6 +50,7 @@ void bitallocsum_fx( 
                move16();

                diff = sub( diff, 1 );

                *sum = add( *sum, 1 );

                move16();

            }

            i = add( i, 1 );

            if ( GE_16( i, nb_sfm ) )

lib_com/bits_alloc_fx.c

+573 −289

File changed.

Preview size limit exceeded, changes collapsed.