Commit ada5556d authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

Merge branch 'ivas-float-update' into ivas-float-update-debug

parents 63419993 7998716f

lib_com/ivas_cnst.h

+2 −0
Original line number Diff line number Diff line
@@ -1140,6 +1140,8 @@ enum 
#define NO_BITS_MASA_ISM_NO_OBJ                 2

#ifdef NON_BE_FIX_BASOP_819_THRESHOLD_MASA2TOTAL

#define MASA2TOTAL_THR                          0.9799999f

#define MASA2TOTAL_PREC_THRESHOLD               1e-7

#define MASA2TOTAL_PREC_INV_THRESHOLD           1e7

#else

#define MASA2TOTAL_THR                          0.98f

#endif

lib_dec/ivas_qmetadata_dec.c

+6 −6
Original line number Diff line number Diff line
@@ -4418,8 +4418,8 @@ void ivas_omasa_decode_masa_to_total( 
            masa_to_total_energy_ratio[i][j] = max( 0.0f, q_dct_data[k] );

            masa_to_total_energy_ratio[i][j] = min( 1.0f, masa_to_total_energy_ratio[i][j] );

#ifdef NON_BE_FIX_BASOP_819_THRESHOLD_MASA2TOTAL

            int_tmp = (int32_t) ( MASA_SUR_COH_PRECISION * masa_to_total_energy_ratio[i][j] );

            masa_to_total_energy_ratio[i][j] = (float) ( int_tmp * MASA_SUR_COH_THRESHOLD );

            int_tmp = (int32_t) ( MASA2TOTAL_PREC_INV_THRESHOLD * masa_to_total_energy_ratio[i][j] );

            masa_to_total_energy_ratio[i][j] = (float) ( int_tmp * MASA2TOTAL_PREC_THRESHOLD );

#endif

            k++;

        }
@@ -4433,8 +4433,8 @@ void ivas_omasa_decode_masa_to_total( 
            {

                masa_to_total_energy_ratio[i][j] = masa_to_total_energy_ratio[0][j];

#ifdef NON_BE_FIX_BASOP_819_THRESHOLD_MASA2TOTAL

                int_tmp = (int32_t) ( MASA_SUR_COH_PRECISION * masa_to_total_energy_ratio[i][j] );

                masa_to_total_energy_ratio[i][j] = (float) ( int_tmp * MASA_SUR_COH_THRESHOLD );

                int_tmp = (int32_t) ( MASA2TOTAL_PREC_INV_THRESHOLD  * masa_to_total_energy_ratio[i][j] );

                masa_to_total_energy_ratio[i][j] = (float) ( int_tmp * MASA2TOTAL_PREC_THRESHOLD );

#endif

            }

        }
@@ -4448,8 +4448,8 @@ void ivas_omasa_decode_masa_to_total( 
            {

                masa_to_total_energy_ratio[i][j] = masa_to_total_energy_ratio[i][0];

#ifdef NON_BE_FIX_BASOP_819_THRESHOLD_MASA2TOTAL

                int_tmp = (int32_t) ( MASA_SUR_COH_PRECISION * masa_to_total_energy_ratio[i][j] );

                masa_to_total_energy_ratio[i][j] = (float) ( int_tmp * MASA_SUR_COH_THRESHOLD );

                int_tmp = (int32_t) ( MASA2TOTAL_PREC_INV_THRESHOLD * masa_to_total_energy_ratio[i][j] );

                masa_to_total_energy_ratio[i][j] = (float) ( int_tmp * MASA2TOTAL_PREC_THRESHOLD );

#endif

            }

        }

lib_enc/ivas_qmetadata_enc.c

+2 −2
Original line number Diff line number Diff line
@@ -6181,8 +6181,8 @@ void ivas_omasa_encode_masa_to_total( 
            masa_to_total_energy_ratio[i][j] = max( 0.0f, q_dct_data[k] );

            masa_to_total_energy_ratio[i][j] = min( 1.0f, masa_to_total_energy_ratio[i][j] );

#ifdef NON_BE_FIX_BASOP_819_THRESHOLD_MASA2TOTAL

            int_tmp = (int32_t) ( MASA_SUR_COH_PRECISION * masa_to_total_energy_ratio[i][j] );

            masa_to_total_energy_ratio[i][j] = (float) ( int_tmp * MASA_SUR_COH_THRESHOLD );

            int_tmp = (int32_t) ( MASA2TOTAL_PREC_INV_THRESHOLD * masa_to_total_energy_ratio[i][j] );

            masa_to_total_energy_ratio[i][j] = (float) ( int_tmp * MASA2TOTAL_PREC_THRESHOLD );

#endif

            k++;

        }