Commit 0520cd90 authored by vasilache's avatar vasilache
Browse files

fix 2433 change ops

parent 15fe9b3d

lib_enc/ivas_qmetadata_enc_fx.c

+16 −16
Original line number Diff line number Diff line
@@ -4669,14 +4669,14 @@ static Word16 encode_coherence_indexesDCT0_fx( 
    {

        k = sub( k, 16 );

#ifdef FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC

        hMetaData->ind_list[indice_coherence + i].value = extract_l( W_extract_l( W_shr( idx, k ) ) ); /*   ( ( idx >> k ) & 65535 );   16 bits */

        hMetaData->ind_list[indice_coherence + i].value = u_extract_l( W_extract_l( W_shr( idx, k ) ) ); /*   ( ( idx >> k ) & 65535 );   16 bits */

#else

        hMetaData->ind_list[indice_coherence + i].value = ( ( idx >> k ) & 65535 ); /* 16 bits */

        move16();

#endif

    }

#ifdef FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC

    hMetaData->ind_list[indice_coherence + i].value = s_and( extract_l( W_extract_l( idx ) ), sub( shl( 1, k ), 1 ) ); /* ( idx & ( ( 1 << k ) - 1 ) ); */

    hMetaData->ind_list[indice_coherence + i].value = u_extract_l(L_and( W_extract_l( idx ), L_sub( L_shl( 1, k ), 1 ) ) ); /* ( idx & ( ( 1 << k ) - 1 ) ); */

#else

    hMetaData->ind_list[indice_coherence + i].value = ( idx & ( ( 1 << k ) - 1 ) );

    move16();
@@ -4703,14 +4703,14 @@ static Word16 encode_coherence_indexesDCT0_fx( 
        {

            k = sub( k, 16 );

#ifdef FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC

            hMetaData->ind_list[indice_coherence + j].value = extract_l( W_extract_l( W_shr( idx1, k ) ) ); /*   ( ( idx1 >> k ) & 65535 );   16 bits */

            hMetaData->ind_list[indice_coherence + j].value = u_extract_l( W_extract_l( W_shr( idx1, k ) ) ); /*   ( ( idx1 >> k ) & 65535 );   16 bits */

#else

            hMetaData->ind_list[indice_coherence + j].value = ( ( idx1 >> k ) & 65535 ); /* 16 bits */

            move16();

#endif

        }

#ifdef FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC

        hMetaData->ind_list[indice_coherence + j].value = s_and( extract_l( W_extract_l( idx1 ) ), sub( shl( 1, k ), 1 ) ); /* ( idx1 & ( ( 1 << k ) - 1 ) ); */

        hMetaData->ind_list[indice_coherence + j].value = u_extract_l( L_and( W_extract_l( idx1 ), L_sub( L_shl( 1, k ), 1 ) ) ); /* ( idx1 & ( ( 1 << k ) - 1 ) ); */

#else

        hMetaData->ind_list[indice_coherence + j].value = ( idx1 & ( ( 1 << k ) - 1 ) );

        move16();
@@ -4991,13 +4991,13 @@ static Word16 encode_spread_coherence_1sf_fx( 
        {

            k = sub( k, 16 );

#ifdef FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC

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

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

#else

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

#endif

        }

#ifdef FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC

        push_next_indice( hMasaMetaData, s_and( extract_l( W_extract_l( idx ) ), sub( shl( 1, k ), 1 ) ), k ); /* ( idx & ( ( 1 << k ) - 1 ) ); */

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

#else

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

#endif
@@ -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, extract_l( W_extract_l( W_shr( idx1, k ) ) ), 16 ); /*  ( ( idx >> k ) & 65535 );   16 bits */

                push_next_indice( hMasaMetaData, u_extract_l( 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, s_and( extract_l( W_extract_l( idx1 ) ), sub( shl( 1, k ), 1 ) ), k ); /* ( idx1 & ( ( 1 << k ) - 1 ) ); */

            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 ) ); */

#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, extract_l( W_extract_l( W_shr( idx, k ) ) ), 16 ); /*  ( ( idx >> k ) & 65535 );   16 bits */

                push_next_indice( hMetaData, u_extract_l( 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, s_and( extract_l( W_extract_l( idx ) ), sub( shl( 1, k ), 1 ) ), k ); /* ( idx & ( ( 1 << k ) - 1 ) ); */

            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 ) ); */

#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, extract_l( W_extract_l( W_shr( idx1, k ) ) ), 16 ); /*  ( ( idx >> k ) & 65535 );   16 bits */

                    push_next_indice( hMetaData, u_extract_l( 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, s_and( extract_l( W_extract_l( idx1 ) ), sub( shl( 1, k ), 1 ) ), k ); /* ( idx & ( ( 1 << k ) - 1 ) ); */

                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 ) ); */

#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, extract_l( W_extract_l( W_shr( idx, k ) ) ), 16 ); /*  ( ( idx >> k ) & 65535 );   16 bits */

                        push_next_indice( hMetaData, u_extract_l( 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, s_and( extract_l( W_extract_l( idx ) ), sub( shl( 1, k ), 1 ) ), k ); /* ( idx & ( ( 1 << k ) - 1 ) ); */

                    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 ) ); */

#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, extract_l( W_extract_l( W_shr( idx1, k ) ) ), 16 ); /*  ( ( idx >> k ) & 65535 );   16 bits */

                            push_next_indice( hMetaData, u_extract_l( 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, s_and( extract_l( W_extract_l( idx1 ) ), sub( shl( 1, k ), 1 ) ), k ); /* ( idx & ( ( 1 << k ) - 1 ) ); */

                        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 ) ); */

#else

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

#endif