Commit 565bdd4c authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_2362_TOTAL_BRATE_CALCULATION

parent f1a27819

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ 
#define FIX_1904_HARM_GSC_ENC                           /* VA: #1904 Harmonization of EVS and IVAS GSC code */

#define FIX_1478_UNINIT_ON_BFI                          /* VA: Fix issue 1478 where a vector is partly un-initialized during bfi */

#define FIX_BASOP_2358_SCALING_OOB                      /* Eri: Basip issue 2358: Clang-18 reports OOB access where scaling is applied to L_FRAME48k instead of output_frame */

#define FIX_2362_TOTAL_BRATE_CALCULATION                /* FhG: basop issue 2362: fix calculation of st->total_brate in ivas_cpe_enc_fx() */

#define FIX_2330_CLANG_18_WARNINGS_REND                 /* FhG: Fix renderer warnings */

#define FIX_BASOP_2350_HARM_0B_BWE                      /* VA: basop issue 2350: harmonization of the 0b BWE */

#define FIX_BASOP_2350_HARM_0B_BWE_2                    /* VA: basop issue 2350: Simplify calling of hf_synth_fx() */

lib_enc/ivas_cpe_enc_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -630,7 +630,6 @@ ivas_error ivas_cpe_enc_fx( 
            {

                sts[n]->bits_frame_nominal = extract_l( Mpy_32_32_r( hCPE->element_brate, ONE_BY_FRAMES_PER_SEC_Q31 ) );                             /* Q0 */

                sts[n]->bits_frame_channel = idiv1616( extract_l( Mpy_32_32_r( hCPE->element_brate, ONE_BY_FRAMES_PER_SEC_Q31 ) ), n_CoreChannels ); /* Q0 */

#ifdef FIX_2362_TOTAL_BRATE_CALCULATION

                /* sts[n]->total_brate = hCPE->element_brate / n_CoreChannels; */

                assert( n_CoreChannels == 1 || n_CoreChannels == 2 );

                sts[n]->total_brate = hCPE->element_brate;
@@ -638,9 +637,6 @@ ivas_error ivas_cpe_enc_fx( 
                {

                    sts[n]->total_brate = L_shr( hCPE->element_brate, 1 );

                }

#else

                sts[n]->total_brate = L_shl( div_l( hCPE->element_brate, n_CoreChannels ), 1 );                                                                                       /* Q0 */

#endif

                move32();

                move16();

                move16();