Commit 23cb2d77 authored by malenov's avatar malenov
Browse files

cleanup NON_BE_FIX_BASOP_819_THRESHOLD_MASA2TOTAL

parent bf74e7d6

lib_com/ivas_cnst.h

+0 −4
Original line number Diff line number Diff line
@@ -1138,13 +1138,9 @@ enum 


#define MASA_TRANSP_BITS                        1

#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

#define BITS_MASA2TOTTAL_DCT0                   6

#define STEP_M2T                                0.1f

#ifdef NONBE_1319_M2R_PRECISION_ALIGN

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ 


/* ################### Start FIXES switches ########################### */



#define NON_BE_FIX_BASOP_819_THRESHOLD_MASA2TOTAL        /* Nokia: add fix for precision limitation in comparison with masa2total energy ratio threshold */

#define FIX_828_PORT_1152_FROM_FLT_REPO                  /* FhG: fix for issue 828 - fix uninitialized value used in BASOP */

#define NONE_BE_FIX_816_LFE_PLC_FLOAT                   /* DLB: issue 816: reduce required precision to float for LFE-PLC*/

#define FIX_835_PARAMMC_BUFFER_VALUES                   /* FhG: issue 835: wide range of buffer values for cx in ParamMC */

lib_dec/ivas_qmetadata_dec.c

+0 −8
Original line number Diff line number Diff line
@@ -4393,9 +4393,7 @@ void ivas_omasa_decode_masa_to_total( 
#endif

    int16_t n_streams, len_stream;

#ifndef NONBE_1319_M2R_PRECISION_ALIGN

#ifdef NON_BE_FIX_BASOP_819_THRESHOLD_MASA2TOTAL

    int32_t int_tmp;

#endif

#endif

    /* Setup coding parameters */

    n_streams = 1;
@@ -4536,10 +4534,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) ( 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++;

        }

    }
@@ -4551,10 +4547,8 @@ void ivas_omasa_decode_masa_to_total( 
            for ( j = 0; j < nbands; j++ )

            {

                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) ( 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

            }

        }

    }
@@ -4566,10 +4560,8 @@ void ivas_omasa_decode_masa_to_total( 
            for ( i = 0; i < nblocks; i++ )

            {

                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) ( 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

+0 −4
Original line number Diff line number Diff line
@@ -6023,10 +6023,8 @@ void ivas_omasa_encode_masa_to_total( 
    int64_t step_fx;

    step_fx = STEP_M2T_FX;

#else

#ifdef NON_BE_FIX_BASOP_819_THRESHOLD_MASA2TOTAL

    int32_t int_tmp;

#endif

#endif

#ifdef DEBUG_MODE_QMETADATA

    static FILE *pF = NULL;

    static FILE *pF_ratio = NULL;
@@ -6278,10 +6276,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) ( 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++;

        }

    }