Commit 6cd82539 authored by Manuel Jander's avatar Manuel Jander
Browse files

Remove NONBE_FIX_2549_REMOVE_RECONFIG_RESCALE.

parent 05ace855

lib_com/options.h

+1 −3
Original line number Diff line number Diff line
@@ -91,8 +91,6 @@ 
#define NONBE_FIX_ISSUE_2206_AVOID_OVERFLOW_SWB_fenv_fx2 /* FhG: Avoid overflow of SWB_fenv_fx in SWB_BWE_encoding_fx because of very small energies. */

#define NONBE_FIX_ISSUE_2206_AVOID_OVERFLOW_MSVQ_Interpol_Tran_fx /* FhG: Fix saturation crash in MSVQ_Interpol_Tran_fx() */

#define NONBE_FIX_ISSUE_2206_SWB_EXPERIMENT_FIX_2527    /* Fix crash from issue #2527 */

#define NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549       /* FhG: Correct scale inconsistency of old_inp_16k_fx buffer scale. */

//#define NONBE_FIX_2549_REMOVE_RECONFIG_RESCALE          /* FhG: Remove rescaling of audio during mode switching. */

#define NONBE_FIX_2507                                  /* Fix porting error in SQ_gain_estimate_fx() */

#define FIX_FLOAT_1539_G192_FORMAT_SWITCH               /* VA/Nokia: reintroduce format switching for g192 bitstreams */

#define HARMONIZE_2499_CONFIGUREFDCNGDEC                /* FhG: basop issue 2499: harmonoize configureFdCngDec */
@@ -131,7 +129,7 @@ 
#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() */

#define FIX_1452_DEFAULT_REVERB                         /* Nokia/Philips/FhG: Fix default room presets and their usage in renderer */



#define NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549       /* FhG: Correct scale inconsistency of old_inp_16k_fx buffer scale. */



/* ##################### End NON-BE switches ########################### */

lib_enc/ivas_corecoder_enc_reconfig_fx.c

+0 −48
Original line number Diff line number Diff line
@@ -59,11 +59,7 @@ ivas_error ivas_corecoder_enc_reconfig_fx( 
    const MC_MODE last_mc_mode        /* i  : switching between MC modes: last mode */

)

{

#ifdef NONBE_FIX_2549_REMOVE_RECONFIG_RESCALE

    Word16 n, sce_id, cpe_id;

#else

    Word16 n, sce_id, cpe_id, k, shift;

#endif

    Word16 len_inp_memory, n_CoreCoder_existing, nSCE_existing, nCPE_existing;



    Word32 input_buff_fx[MCT_MAX_BLOCKS][L_FRAME48k + NS2SA( 48000, IVAS_FB_ENC_DELAY_NS )];
@@ -225,28 +221,6 @@ ivas_error ivas_corecoder_enc_reconfig_fx( 
            move16();

        }



#ifdef NONBE_FIX_2549_REMOVE_RECONFIG_RESCALE

        IF( GT_16( len_inp_memory, input_frame ) )

        {

            Word16 k;



            IF( nSCE_old > 0 )

            {

                FOR( k = 0; k < nSCE_old; k++ )

                {

                    assert( st_ivas->hSCE[k]->hCoreCoder[0]->q_old_inp32 == st_ivas->hSCE[k]->hCoreCoder[0]->q_inp32 );

                }

            }

            IF( nCPE_old > 0 )

            {

                FOR( k = 0; k < nCPE_old; k++ )

                {

                    assert( st_ivas->hCPE[k]->hCoreCoder[0]->q_old_inp32 == st_ivas->hCPE[k]->hCoreCoder[0]->q_inp32 );

                    assert( st_ivas->hCPE[k]->hCoreCoder[1]->q_old_inp32 == st_ivas->hCPE[k]->hCoreCoder[1]->q_inp32 );

                }

            }

        }

#else

        Word16 q_com_sce = Q15, q_com_sce32 = Q31;

        move16();

        move16();
@@ -351,7 +325,6 @@ ivas_error ivas_corecoder_enc_reconfig_fx( 
                }

            }

        }

#endif



        test();

        test();
@@ -360,26 +333,6 @@ ivas_error ivas_corecoder_enc_reconfig_fx( 
            /* within McMASA we can modify the transport signals when switching */

            /* copy earlier dmx buffers */



#ifdef NONBE_FIX_2549_REMOVE_RECONFIG_RESCALE

            set32_fx( input_buff_fx[0], 0, len_inp_memory );

            IF( nSCE_old > 0 )

            {

                Copy_Scale_sig32( st_ivas->hSCE[0]->hCoreCoder[0]->input_buff32_fx, input_buff_fx[0], len_inp_memory, -Q4 );

                q_input_buff[0] = sub( st_ivas->hSCE[0]->hCoreCoder[0]->q_old_inp32, Q4 );

                move16();

            }



            FOR( n = 0; n < CPE_CHANNELS; n++ )

            {

                set32_fx( input_buff_fx[n + 1], 0, len_inp_memory );

                IF( nCPE_old > 0 )

                {

                    Copy_Scale_sig32( st_ivas->hCPE[0]->hCoreCoder[n]->input_buff32_fx, input_buff_fx[n + 1], len_inp_memory, -Q4 ); /* st_ivas->hCPE[0]->hCoreCoder[n]->q_inp32 */

                    q_input_buff[n + 1] = sub( st_ivas->hCPE[0]->hCoreCoder[n]->q_old_inp32, Q4 );

                    move16();

                }

            }

#else

            IF( nSCE_old > 0 )

            {

                set32_fx( input_buff_fx[0], 0, len_inp_memory );
@@ -398,7 +351,6 @@ ivas_error ivas_corecoder_enc_reconfig_fx( 
                    move16();

                }

            }

#endif

            ivas_mcmasa_dmx_modify_fx( len_inp_memory, input_buff_fx, q_input_buff, nSCE_old + CPE_CHANNELS * nCPE_old, st_ivas->nSCE + CPE_CHANNELS * st_ivas->nCPE );