Commit e334b2d9 authored by vasilache's avatar vasilache
Browse files

fix 819 update 2

parent cc9ad208

lib_dec/ivas_qmetadata_dec.c

+9 −9
Original line number Diff line number Diff line
@@ -8719,9 +8719,9 @@ void ivas_omasa_decode_masa_to_total_fx( 
            move32();

            masa_to_total_energy_ratio_fx[i][j] = L_min( ONE_IN_Q30, masa_to_total_energy_ratio_fx[i][j] );

            move32();

#ifdef NON_BE_FIX_BASOP_819_THRESHOLD_MASA2TOTAL1

            masa_to_total_energy_ratio_fx[i][j] = masa_to_total_energy_ratio_fx[i][j] >> 15; /* Q30 to reach the Q10 used before comparing with threshold*/

            masa_to_total_energy_ratio_fx[i][j] = masa_to_total_energy_ratio_fx[i][j] << 15;

#ifdef NON_BE_FIX_BASOP_819_THRESHOLD_MASA2TOTAL

            masa_to_total_energy_ratio_fx[i][j] = masa_to_total_energy_ratio_fx[i][j] >> 13; /* Q30 to reach the Q17 used before comparing with threshold*/

            masa_to_total_energy_ratio_fx[i][j] = masa_to_total_energy_ratio_fx[i][j] << 13;

#endif

            k = add( k, 1 );

        }
@@ -8734,9 +8734,9 @@ void ivas_omasa_decode_masa_to_total_fx( 
            FOR( j = 0; j < nbands; j++ )

            {

                masa_to_total_energy_ratio_fx[i][j] = masa_to_total_energy_ratio_fx[0][j];

#ifdef NON_BE_FIX_BASOP_819_THRESHOLD_MASA2TOTAL1

                masa_to_total_energy_ratio_fx[i][j] = masa_to_total_energy_ratio_fx[i][j] >> 15; /* Q30 to reach the Q10 used before comparing with threshold*/

                masa_to_total_energy_ratio_fx[i][j] = masa_to_total_energy_ratio_fx[i][j] << 15;

#ifdef NON_BE_FIX_BASOP_819_THRESHOLD_MASA2TOTAL

                masa_to_total_energy_ratio_fx[i][j] = masa_to_total_energy_ratio_fx[i][j] >> 13; /* Q30 to reach the Q17 used before comparing with threshold*/

                masa_to_total_energy_ratio_fx[i][j] = masa_to_total_energy_ratio_fx[i][j] << 13;

#endif

                move32();

            }
@@ -8750,9 +8750,9 @@ void ivas_omasa_decode_masa_to_total_fx( 
            FOR( i = 0; i < nblocks; i++ )

            {

                masa_to_total_energy_ratio_fx[i][j] = masa_to_total_energy_ratio_fx[i][0];

#ifdef NON_BE_FIX_BASOP_819_THRESHOLD_MASA2TOTAL1

                masa_to_total_energy_ratio_fx[i][j] = masa_to_total_energy_ratio_fx[i][j] >> 15; /* Q30 to reach the Q10 used before comparing with threshold*/

                masa_to_total_energy_ratio_fx[i][j] = masa_to_total_energy_ratio_fx[i][j] << 15;

#ifdef NON_BE_FIX_BASOP_819_THRESHOLD_MASA2TOTAL

                masa_to_total_energy_ratio_fx[i][j] = masa_to_total_energy_ratio_fx[i][j] >> 13; /* Q30 to reach the Q17 used before comparing with threshold*/

                masa_to_total_energy_ratio_fx[i][j] = masa_to_total_energy_ratio_fx[i][j] << 13;

#endif

                move32();

            }