Commit 8001cf02 authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch 'remotes/origin/main' into 1929-basop-PortFlpMr1737

parents 96a6f1cf 99ffa8ac

lib_com/cnst.h

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
#define NUM_SAMPLES_320 (320)

#define NUM_SAMPLES_160 (160)

#define L_SUBFRAME_48k         (240)

#define L_SUBFRAME_32k         (180)

#define L_SUBFRAME_32k         (160)

#define L_SUBFRAME_16k         (80)

#define L_SUBFRAME_8k           (40)

#define Q31_BY_NUM_SAMPLES_960 ( 2239294 ) /* 1/959 in Q31 */

lib_com/ivas_cnst.h

+4 −0
Original line number Diff line number Diff line
@@ -273,7 +273,11 @@ typedef enum 
#define SID_MDCT_STEREO                         0x1                         /*      1|      0|     0 */

#define SID_ISM                                 0x2                         /*      0|      1|     0 */

#define SID_MASA_1TC                            0x3                         /*      1|      1|     0 */

#ifdef FIX_1209_SID_SIGNALING

/*reserved*/                                  /*0x4*/                       /*      0|      0|     1 */

#else

#define SID_MULTICHANNEL                        0x4                         /*      0|      0|     1 */

#endif

#define SID_SBA_1TC                             0x5                         /*      1|      0|     1 */

#define SID_SBA_2TC                             0x6                         /*      0|      1|     1 */

#define SID_MASA_2TC                            0x7                         /*      1|      1|     1 */

lib_com/ivas_prot_fx.h

+2 −5
Original line number Diff line number Diff line
@@ -4048,7 +4048,6 @@ void ivas_syn_output_f_fx( 
    Word32 *synth_out          /* o  : integer 16 bits synthesis signal    */

);





ivas_error ivas_init_encoder_fx(

    Encoder_Struct *st_ivas /* i/o: IVAS encoder structure                  */

);
@@ -4059,10 +4058,8 @@ ivas_error ivas_output_buff_dec_fx( 
    const Word16 nchan_out_buff      /* i  : number of output channels                  */

);



/*! r: flag to indicate if split rendering is enabled */

Word16 is_split_rendering_enabled(

    const DECODER_CONFIG_HANDLE hDecoderConfig,   /* i  : configuration structure         */

    const IVAS_RENDER_CONFIG_HANDLE hRenderConfig /* i  : Render config data structure    */

ivas_error ivas_dec_get_format_fx(

    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                  */

);



ivas_error ivas_dec_setup(

lib_com/ivas_spar_com_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -802,7 +802,11 @@ static void ivas_get_pred_coeffs_enc_fx( 
                tmp64 = W_mult0_32_32( w_norm_fac, dm_w ); // Q=q_tmp

                IF( LT_16( q_tmp, q_cov_real[0][0][b] ) )

                {

#ifdef FIX_ISSUE_1811_EXCEEDING_W_SHIFTS

                    tmp64 = W_shr( tmp64, s_min( 63, sub( q_cov_real[0][0][b], q_tmp ) ) ); // Q=q_tmp

#else

                    tmp64 = W_shr( tmp64, sub( q_cov_real[0][0][b], q_tmp ) ); // Q=q_tmp

#endif

                }

                ELSE

                {

lib_com/options.h

+4 −0
Original line number Diff line number Diff line
@@ -82,6 +82,9 @@ 
#define FIX_ISSUE_1817_REPLACE_CARRY_OVERFLOW                /* FhG: bit-exact, replace carry and overflow operations by 64-bit operations, MR 1931 */

#define	NONBE_SVD_OPTIMIZATION                               /* FhG: reduce WMOPS of HouseHolderReduction() in ivas_svd_dec.c() by removing redundant mathematics and using 64 bit additions */

#define FIX_1766_TCX2ACELP_BWE_ISSUE                         /* VA : Fix rare BWE issue when switching from TCX to ACELP */

#define FIX_1781_SPECTRAL_GAPS                               /* FhG: Change internal calculation of tcx_noise_factor_ivas_fx() to 32-bit*/

#define FIX_ISSUE_1811_EXCEEDING_W_SHIFTS                    /* FhG: limit exceeding 64bit shifts */





/* #################### Start BASOP porting switches ############################ */
@@ -128,6 +131,7 @@ 
#define NONBE_1360_LFE_DELAY                            /* Dlb: LFE delay alignment when rendering in CLDFB domain*/

#define NONBE_1229_FIX_ISM1_DPID                        /* Eri: issue 1229: fix bug causing ISM 1 to use default -dpid instead of the specified one */

#define NONBE_SVD_OPTIMIZATION 

#define FIX_1209_SID_SIGNALING                          /* VA: issue 1209: remove dead code in IVAS SID signaling */

#define NONBE_FIX_1176_OSBA_REVERB_JBM_ASAN_ERROR       /* Ericsson: Issue 1176, fix in TDREND_firfilt for subframes shorter than the filter length */

#define NONBE_1131_ACELP_OOB                            /* VA: issue 1131: fix division-by-zero in acelp gain decoding caused by wrong length of buffer update when switching from HQ core to ACELP core */

#define NONBE_1240_FIX_CORE_SELECTION_ISM_SW            /* VA: issue 1240: Remove the forcing of the TCX core in ISM when switching from a high bitarte to a low one */