Commit 9bd12633 authored by malenov's avatar malenov
Browse files

cleanup NON_BE_FIX_1048_THRESHOLD_COH_BASOP

parent 53c9dce2

lib_com/ivas_cnst.h

+0 −2
Original line number Diff line number Diff line
@@ -1194,10 +1194,8 @@ enum 
#define MASA_RATIO_TOLERANCE                    0.1f

#define MASA_RATIO_THRESHOLD                    0.1f

#define MASA_ANGLE_TOLERANCE                    0.5f

#ifdef  NON_BE_FIX_1048_THRESHOLD_COH_BASOP

#define MASA_SUR_COH_THRESHOLD                  1e-7f

#define MASA_SUR_COH_PRECISION                  1e7f

#endif

#define MASA_LIMIT_NO_BANDS_SUR_COH             8

#define MINIMUM_BIT_BUDGET_NORMAL_META          100

#define DIFF_DFRATIO_2BIT_LIMIT_IDX_HODIRAC     4

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_1048_THRESHOLD_COH_BASOP             /* Nokia: Fix 1048 replace comparison with 0 with comparison to threshold, to align with BASOP*/

#define NONBE_FIX_1054_NEGATIVE_LVQ_INDEX               /* Nokia: issue 1054: Input to decode_comb in deindex_lvq_SHB should be positive */

#define NONBE_FIX_738_QUATERNION_SLERP_PRECISION        /* Philips: issue 738: Quaternion spherical linear interpolation precision handling issues */

#define FIX_1033_MEMORY_LEAK_OMASA                      /* Nokia / Orange: issue #1033: Memory leak in OMASA to BINAURAL with HRTF with bitrate switching */

lib_dec/ivas_qmetadata_dec.c

+2 −4
Original line number Diff line number Diff line
@@ -4076,9 +4076,7 @@ static int16_t read_surround_coherence_hr( 
    IVAS_QDIRECTION *q_direction;

    int16_t min_index;

    int16_t d, idx;

#ifdef NON_BE_FIX_1048_THRESHOLD_COH_BASOP

    int32_t int_error_ratio_surr;

#endif

    coding_subbands = hQMetaData->q_direction[0].cfg.nbands;

    q_direction = hQMetaData->q_direction;
@@ -4101,10 +4099,10 @@ static int16_t read_surround_coherence_hr( 
            {

                error_ratio_surr = 1.0f - q_direction[0].band_data[j].energy_ratio[sf];

            }

#ifdef NON_BE_FIX_1048_THRESHOLD_COH_BASOP



            int_error_ratio_surr = (int32_t) ( MASA_SUR_COH_PRECISION * error_ratio_surr );

            error_ratio_surr = (float) ( int_error_ratio_surr * MASA_SUR_COH_THRESHOLD );

#endif



            if ( error_ratio_surr <= 0 )

            {

                error_ratio_surr = 0;

lib_enc/ivas_qmetadata_enc.c

+2 −4
Original line number Diff line number Diff line
@@ -4911,9 +4911,8 @@ static int16_t encode_surround_coherence_hr( 
    int16_t max_val = 0, nbits_max;

    int16_t no_cv_shift[MASA_MAXIMUM_CODING_SUBBANDS], min_idx;

    int16_t idx16;

#ifdef NON_BE_FIX_1048_THRESHOLD_COH_BASOP

    int32_t int_error_ratio_surr;

#endif

    

    coding_subbands = hQMetaData->q_direction[0].cfg.nbands;

    all_coherence_zero = hQMetaData->all_coherence_zero;

    q_direction = &( hQMetaData->q_direction[0] );
@@ -4942,10 +4941,9 @@ static int16_t encode_surround_coherence_hr( 
                {

                    error_ratio_surr = 1.0f - q_direction[0].band_data[j].energy_ratio[sf];

                }

#ifdef NON_BE_FIX_1048_THRESHOLD_COH_BASOP



                int_error_ratio_surr = (int32_t) ( MASA_SUR_COH_PRECISION * error_ratio_surr );

                error_ratio_surr = (float) ( int_error_ratio_surr * MASA_SUR_COH_THRESHOLD );

#endif



                if ( error_ratio_surr <= 0 )

                {