Commit d48d3a34 authored by Manuel Jander's avatar Manuel Jander
Browse files

Disable NONBE_FIX_2549_REMOVE_RECONFIG_RESCALE.

parent f2a1e2ea

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ 
#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_2549_REMOVE_RECONFIG_RESCALE          /* FhG: Remove rescaling of audio during mode switching. */

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

#define FIX_BASOP_2530_IVAS_DECISION_MAT                /* VA: Fix ambiguous usage of extract_l() */

lib_enc/ivas_corecoder_enc_reconfig_fx.c

+43 −2
Original line number Diff line number Diff line
@@ -225,7 +225,28 @@ ivas_error ivas_corecoder_enc_reconfig_fx( 
            move16();

        }



#ifndef NONBE_FIX_2549_REMOVE_RECONFIG_RESCALE

#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();
@@ -339,6 +360,26 @@ 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 );
@@ -357,7 +398,7 @@ 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 );