Commit 14a6140d authored by emerit's avatar emerit
Browse files

Merge branch 'main' into update_crend_v2

parents 8c5f123a 969ec18e

lib_com/options.h

+4 −0
Original line number Diff line number Diff line
@@ -192,4 +192,8 @@ 
#define NONBE_FIX_1402_WAVEADJUST               /* VA: BASOP iisue 1402: fix waveform adjustment decoder PLC */

#define FIX_ISSUE_1376                          /* VA: Fix for issue 1376 (issue with GSC excitation) */

#define OPT_SBA_AVOID_SPAR_RESCALE              /* Optimization made to spar decoder and IGF */

#define NONBE_FIX_1386_STEREO_DMX_EVS_PHA       /* Orange: Fix for stereo DMX / PHA mode : Change the filter taps resolution (Q31->Q30), improve precision for the IR window, for the ILD & IPD smoothing in sub-bands, for the ISD counters and for ICCr. */

#define FIX_1326_SUBSTITUTE_CMPMANT32EXP        /* FhG: Minor WMOPS tuning*/

#define FIX_1326_SUBSTITUTE_DIV_SQRT_IOSQRT     /* FhG: WMOPS tuning */

#define FIX_1326_SPEEDUP_eig2x2_fx              /* FhG: Minor WMOPS tuning*/

#endif

lib_enc/cng_enc_fx.c

+5 −5
Original line number Diff line number Diff line
@@ -1876,7 +1876,7 @@ void CNG_enc_ivas_fx( 
    {

        E_LPC_f_lsp_a_conversion( hDtxEnc->lspCNG_fx, Aq, M );

        exp = sub( Q14, norm_s( Aq[0] ) );

        Scale_sig( Aq, M, sub( Q12, exp ) ); // Q12

        Scale_sig( Aq, M + 1, sub( Q12, exp ) ); // Q12

    }



    tmp_loop = shr( st_fx->L_frame, 6 );
@@ -1986,19 +1986,19 @@ void CNG_enc_ivas_fx( 
            move16();

            BREAK;

        case L_FRAME32k:

            inv_frame_len = ONE_BY_L_FRAME48k_Q31;

            inv_frame_len = ONE_BY_L_FRAME32k_Q31;

            move16();

            BREAK;

        case L_FRAME16k:

            inv_frame_len = ONE_BY_L_FRAME48k_Q31;

            inv_frame_len = ONE_BY_L_FRAME16k_Q31;

            move16();

            BREAK;

        case L_FRAME8k:

            inv_frame_len = ONE_BY_L_FRAME48k_Q31;

            inv_frame_len = ONE_BY_L_FRAME8k_Q31;

            move16();

            BREAK;

        case L_FRAME4k:

            inv_frame_len = ONE_BY_L_FRAME48k_Q31;

            inv_frame_len = ONE_BY_L_FRAME4k_Q31;

            move16();

            BREAK;

        default:

lib_enc/ivas_enc_fx.c

+14 −5
Original line number Diff line number Diff line
@@ -344,7 +344,10 @@ ivas_error ivas_enc_fx( 
                {

                    norm_data_in = s_min( norm_data_in, L_norm_arr( data_fx[i], input_frame ) );

                }

                IF( LT_16( norm_data_in, 31 ) )

                {

                    norm_data_in = sub( norm_data_in, 7 );    /*guard bit is 4->to handle overflow in cldfbAnalysis*/

                    norm_data_in = s_min( norm_data_in, 20 ); // limit Q to 31 (11 + norm)

                    FOR( i = 0; i < hEncoderConfig->nchan_ism + st_ivas->nchan_transport; i++ )

                    {

                        scale_sig32( data_fx[i], input_frame, norm_data_in ); /*  st_ivas->q_data_fx + norm_data_in */
@@ -352,6 +355,12 @@ ivas_error ivas_enc_fx( 
                    st_ivas->q_data_fx = add( st_ivas->q_data_fx, norm_data_in );

                    move16();

                }

                ELSE

                {

                    st_ivas->q_data_fx = 31;

                    move16();

                }

            }



            /* Estimate MASA parameters for the objects */

            ivas_omasa_enc_fx( st_ivas->hOMasa, st_ivas->hMasa, st_ivas->hIsmMetaData, data_fx, st_ivas->q_data_fx, input_frame, st_ivas->nchan_transport, hEncoderConfig->nchan_ism, st_ivas->ism_mode, data_separated_object_fx, &idx_separated_object );

lib_enc/ivas_stat_enc.h

+9 −2
Original line number Diff line number Diff line
@@ -1183,7 +1183,11 @@ typedef struct stereo_dmx_evs_correlation_filter_structure 
{

    Word16 init_frmCntr;



#ifdef NONBE_FIX_1386_STEREO_DMX_EVS_PHA

    Word32 isd_rate_s_fx; // Q31

#else

    Word16 isd_rate_s_fx;                            // Q15

#endif

    Word32 iccr_s_fx;                                // Q31

    Word32 ipd_ff_fx[STEREO_DMX_EVS_NB_SUBBAND_MAX]; // Q31

    Word32 Pr_fx[STEREO_DMX_EVS_NB_SUBBAND_MAX];     // Q31
@@ -1224,8 +1228,11 @@ typedef struct stereo_dmx_evs_enc_data_structure 
    STEREO_DMX_EVS_POC_HANDLE hPOC;

    STEREO_DMX_EVS_PHA_HANDLE hPHA;





#ifdef NONBE_FIX_1386_STEREO_DMX_EVS_PHA

    Word16 itd_fx; // Q0

#else

    Word32 itd_fx;                                   // Q16

#endif



    Word32 pre_dmx_energy_fx[1];

    Word16 pre_dmx_energy_fx_e[1];

lib_enc/ivas_stereo_dmx_evs_fx.c

+179 −28

File changed.

Preview size limit exceeded, changes collapsed.