Commit 04d3c40d authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_BASOP_2545_FIX_LTV_REGRESSION_2529

parent e643e048

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ 
#define FIX_BASOP_2023_TDREND_DISTATT_PRECISION         /* Eri: Basop issue 2023: Distance attenuation scaling, adding clamping of distance att input and listener position */

#define FIX_BASOP_2023_TDREND_DISTATT_PRECISION_BUGFIX  /* Eri: Bug discovered in cleanup of basop issue 2023 */

#define FIX_1576_LCLD_CRASH_DIFFERENT_CODEC_ISAR_FRAME_SIZE  /* Dolby: float issue 1576: fix for crash in LCLD mode when codec frame size is less than isar frame size */

#define FIX_BASOP_2545_FIX_LTV_REGRESSION_2529          /* Nokia: BASOP issue 2545: Fix LTV regression caused by issue 2529 fix */

#define FIX_1548_HARMONIZE_NON_DIEGETIC_PANNING_LAW     /* Orange: float issue 1548: Harmonize non diegetic panning law in ISM and renderers */

#define FIX_FLOAT_1573_POSITION_UPDATE                  /* Eri: Float issue 1573: For static orientation and listener movement, the PoseUpdated flag is cleared and prevents 5 ms update rate. */

#define FIX_BASOP_2521_DIRAC_STEREO_STEFFI_NRGS         /* FhG: BASOP issue 2521: Fix wrong porting for determination of first subframe length in ivas_sba_dirac_stereo_compute_td_stefi_nrgs() */

lib_enc/ivas_masa_enc_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -3129,11 +3129,7 @@ static void average_masa_metadata_fx( 
            hMeta->directional_meta[i].spread_coherence_fx[j][k] = BASOP_Util_Divide3232_Scale( spread_coh_sum_fx, L_add( energy_sum_fx, EPSILON_FX ), &temp2_e );

            move16();

            temp2_e = add( temp2_e, sub( spread_coh_sum_e, energy_sum_e ) );

#ifdef FIX_BASOP_2545_FIX_LTV_REGRESSION_2529

            hMeta->directional_meta[i].spread_coherence_fx[j][k] = shl_sat( hMeta->directional_meta[i].spread_coherence_fx[j][k], temp2_e ); /*changing q from 15-temp2_e to q15*/

#else

            hMeta->directional_meta[i].spread_coherence_fx[j][k] = shl( hMeta->directional_meta[i].spread_coherence_fx[j][k], temp2_e ); /*changing q from 15-temp2_e to q15*/

#endif

            move16();

            IF( i == 0 )

            {

lib_util/masa_file_reader.c

+0 −8
Original line number Diff line number Diff line
@@ -205,12 +205,8 @@ ivas_error MasaFileReader_readNextFrame( 


            for ( b = 0; b < MASA_FREQUENCY_BANDS; b++ )

            {

#ifdef FIX_BASOP_2545_FIX_LTV_REGRESSION_2529

                int32_t tmp_coh = ( (int32_t) readOther[b] * ONE_IN_Q15 + 254 ) / 255;

                hMeta->directional_meta[i].spread_coherence_fx[j][b] = (Word16) ( tmp_coh > MAX_16 ? MAX_16 : tmp_coh ); // Q15, need to clamp

#else

                hMeta->directional_meta[i].spread_coherence_fx[j][b] = (Word16) ( ( (int32_t) readOther[b] * ONE_IN_Q15 + 254 ) / 255 ); // Q15

#endif

            }

        }
@@ -234,12 +230,8 @@ ivas_error MasaFileReader_readNextFrame( 


        for ( b = 0; b < MASA_FREQUENCY_BANDS; b++ )

        {

#ifdef FIX_BASOP_2545_FIX_LTV_REGRESSION_2529

            int32_t tmp_coh = ( (int32_t) readOther[b] * ONE_IN_Q15 + 254 ) / 255;

            hMeta->common_meta.surround_coherence_fx[j][b] = (Word16) ( tmp_coh > MAX_16 ? MAX_16 : tmp_coh ); // Q15, need to clamp

#else

            hMeta->common_meta.surround_coherence_fx[j][b] = (Word16) ( ( (int32_t) readOther[b] * ONE_IN_Q15 + 254 ) / 255 ); // Q15

#endif

        }



        /* Remainder-to-total ratio */