Commit 8dce4bc0 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_BASOP_2531_MCT_CP_BITRATE

parent 3fe68251

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_2531_MCT_CP_BITRATE                   /* FhG: BASOP issue 2531: Fix MCT cp_bitrate calculation; affects bitrate switching only */

#define FIX_BASOP_2541_OMASA_ENC_FIXES                  /* Nokia: BASOP issue 2541: Fix function ivas_encode_masaism_metadata_fx */

#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 */

lib_enc/ivas_mct_enc_fx.c

+0 −10
Original line number Diff line number Diff line
@@ -234,24 +234,14 @@ ivas_error ivas_mct_enc_fx( 
    IF( NE_32( ivas_total_brate, st_ivas->hEncoderConfig->last_ivas_total_brate ) )

    {

        Word32 cp_bitrate;

#ifdef FIX_BASOP_2531_MCT_CP_BITRATE

        Word32 L_tmp;

#endif

        // cp_bitrate = ivas_total_brate / hMCT->nchan_out_woLFE * CPE_CHANNELS;

#ifdef FIX_BASOP_2531_MCT_CP_BITRATE

        iDiv_and_mod_32( L_shl( ivas_total_brate, 1 ), hMCT->nchan_out_woLFE, &cp_bitrate, &L_tmp, 0 );

#else

        cp_bitrate = L_shl( L_deposit_l( div_l( ivas_total_brate, hMCT->nchan_out_woLFE ) ), 2 ); // a/b => div_l(a, b/2) or (2 * div_l(a, b))

#endif



        IF( EQ_32( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) )

        {

            // cp_bitrate = ivas_total_brate / st_ivas->nchan_transport * CPE_CHANNELS;

#ifdef FIX_BASOP_2531_MCT_CP_BITRATE

            iDiv_and_mod_32( L_shl( ivas_total_brate, 1 ), st_ivas->nchan_transport, &cp_bitrate, &L_tmp, 0 );

#else

            cp_bitrate = L_shl( L_deposit_l( div_l( ivas_total_brate, st_ivas->nchan_transport ) ), 2 ); // a/b => div_l(a, b/2) or (2 * div_l(a, b))

#endif

        }



        IF( st_ivas->hCPE[0]->hCoreCoder[0]->igf )