Commit 6feb710b authored by vasilache's avatar vasilache
Browse files

fix 2433 add UWords

parent 6f241a47

lib_enc/ivas_qmetadata_enc_fx.c

+10 −10
Original line number Diff line number Diff line
@@ -5023,13 +5023,13 @@ static Word16 encode_spread_coherence_1sf_fx( 
            {

                k = sub( k, 16 );

#ifdef FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC

                push_next_indice( hMasaMetaData, u_extract_l( W_extract_l( W_shr( idx1, k ) ) ), 16 ); /*  ( ( idx1 >> k ) & 65535 );   16 bits */

                push_next_indice( hMasaMetaData, u_extract_l( (UWord32) W_extract_l( W_shr( idx1, k ) ) ), 16 ); /*  ( ( idx1 >> k ) & 65535 );   16 bits */

#else

                push_next_indice( hMasaMetaData, ( ( idx1 >> k ) & 65535 ), 16 ); /* 16 bits */

#endif

            }

#ifdef FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC

            push_next_indice( hMasaMetaData, u_extract_l( L_and( W_extract_l( idx1 ), L_sub( L_shl( 1, k ), 1 ) ) ), k ); /* ( idx1 & ( ( 1 << k ) - 1 ) ); */

            push_next_indice( hMasaMetaData, u_extract_l( (UWord32) L_and( W_extract_l( idx1 ), L_sub( L_shl( 1, k ), 1 ) ) ), k ); /* ( idx1 & ( ( 1 << k ) - 1 ) ); */

#else

            push_next_indice( hMasaMetaData, ( idx1 & ( ( 1 << k ) - 1 ) ), k );

#endif
@@ -5232,13 +5232,13 @@ static Word16 encode_surround_coherence_fx( 
            {

                k = sub( k, 16 );

#ifdef FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC

                push_next_indice( hMetaData, u_extract_l( W_extract_l( W_shr( idx, k ) ) ), 16 ); /*  ( ( idx >> k ) & 65535 );   16 bits */

                push_next_indice( hMetaData, u_extract_l( (UWord32) W_extract_l( W_shr( idx, k ) ) ), 16 ); /*  ( ( idx >> k ) & 65535 );   16 bits */

#else

                push_next_indice( hMetaData, ( ( idx >> k ) & 65535 ), 16 ); /* 16 bits */

#endif

            }

#ifdef FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC

            push_next_indice( hMetaData, u_extract_l( L_and( W_extract_l( idx ), L_sub( L_shl( 1, k ), 1 ) ) ), k ); /* ( idx & ( ( 1 << k ) - 1 ) ); */

            push_next_indice( hMetaData, u_extract_l( (UWord32) L_and( W_extract_l( idx ), L_sub( L_shl( 1, k ), 1 ) ) ), k ); /* ( idx & ( ( 1 << k ) - 1 ) ); */

#else

            push_next_indice( hMetaData, ( idx & ( ( 1 << k ) - 1 ) ), k );

#endif
@@ -5264,13 +5264,13 @@ static Word16 encode_surround_coherence_fx( 
                {

                    k = sub( k, 16 );

#ifdef FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC

                    push_next_indice( hMetaData, u_extract_l( W_extract_l( W_shr( idx1, k ) ) ), 16 ); /*  ( ( idx1 >> k ) & 65535 );   16 bits */

                    push_next_indice( hMetaData, u_extract_l( (UWord32) W_extract_l( W_shr( idx1, k ) ) ), 16 ); /*  ( ( idx1 >> k ) & 65535 );   16 bits */

#else

                    push_next_indice( hMetaData, ( ( idx1 >> k ) & 65535 ), 16 ); /* 16 bits */

#endif

                }

#ifdef FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC

                push_next_indice( hMetaData, u_extract_l( L_and( W_extract_l( idx1 ), L_sub( L_shl( 1, k ), 1 ) ) ), k ); /* ( idx1 & ( ( 1 << k ) - 1 ) ); */

                push_next_indice( hMetaData, u_extract_l( (UWord32) L_and( W_extract_l( idx1 ), L_sub( L_shl( 1, k ), 1 ) ) ), k ); /* ( idx1 & ( ( 1 << k ) - 1 ) ); */

#else

                push_next_indice( hMetaData, ( idx1 & ( ( 1 << k ) - 1 ) ), k );

#endif
@@ -5475,13 +5475,13 @@ static Word16 encode_surround_coherence_hr_fx( 
                    {

                        k = sub( k, 16 );

#ifdef FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC

                        push_next_indice( hMetaData, u_extract_l( W_extract_l( W_shr( idx, k ) ) ), 16 ); /*  ( ( idx >> k ) & 65535 );   16 bits */

                        push_next_indice( hMetaData, u_extract_l( (UWord32) W_extract_l( W_shr( idx, k ) ) ), 16 ); /*  ( ( idx >> k ) & 65535 );   16 bits */

#else

                        push_next_indice( hMetaData, ( ( idx >> k ) & 65535 ), 16 ); /* 16 bits */

#endif

                    }

#ifdef FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC

                    push_next_indice( hMetaData, u_extract_l( L_and( W_extract_l( idx ), L_sub( L_shl( 1, k ), 1 ) ) ), k ); /* ( idx & ( ( 1 << k ) - 1 ) ); */

                    push_next_indice( hMetaData, u_extract_l( (UWord32) L_and( W_extract_l( idx ), L_sub( L_shl( 1, k ), 1 ) ) ), k ); /* ( idx & ( ( 1 << k ) - 1 ) ); */

#else

                    push_next_indice( hMetaData, ( idx & ( ( 1 << k ) - 1 ) ), k );

#endif
@@ -5505,13 +5505,13 @@ static Word16 encode_surround_coherence_hr_fx( 
                        {

                            k = sub( k, 16 );

#ifdef FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC

                            push_next_indice( hMetaData, u_extract_l( W_extract_l( W_shr( idx1, k ) ) ), 16 ); /*  ( ( idx1 >> k ) & 65535 );   16 bits */

                            push_next_indice( hMetaData, u_extract_l( (UWord32) W_extract_l( W_shr( idx1, k ) ) ), 16 ); /*  ( ( idx1 >> k ) & 65535 );   16 bits */

#else

                            push_next_indice( hMetaData, ( ( idx1 >> k ) & 65535 ), 16 ); /* 16 bits */

#endif

                        }

#ifdef FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC

                        push_next_indice( hMetaData, u_extract_l( L_and( W_extract_l( idx1 ), L_sub( L_shl( 1, k ), 1 ) ) ), k ); /* ( idx1 & ( ( 1 << k ) - 1 ) ); */

                        push_next_indice( hMetaData, u_extract_l( (UWord32) L_and( W_extract_l( idx1 ), L_sub( L_shl( 1, k ), 1 ) ) ), k ); /* ( idx1 & ( ( 1 << k ) - 1 ) ); */

#else

                        push_next_indice( hMetaData, ( idx1 & ( ( 1 << k ) - 1 ) ), k );

#endif