Commit f03e50f5 authored by multrus's avatar multrus
Browse files

formatting

parent 4d84ca10

lib_com/ivas_spar_com_fx.c

+0 −2
Original line number Diff line number Diff line
@@ -4145,7 +4145,6 @@ void ivas_get_spar_md_from_dirac_enc_fx( 
                            move32();

                        }

                    }



                }

            }
@@ -4594,7 +4593,6 @@ void ivas_get_spar_md_from_dirac_fx( 
                            move32();

                        }

                    }



                }

            }

lib_com/options.h

+1 −16
Original line number Diff line number Diff line
@@ -71,9 +71,6 @@ 
#define BASOP_NOGLOB_DECLARE_LOCAL

#endif









/* Note: each compile switch (FIX_1101_...) is independent from the other ones */

#define OPT_MCT_ENC_V3_BE

#define OPT_BIN_REND_V2_NBE
@@ -82,22 +79,9 @@ 
#define FIX_1348_BIT_PRECISION_IMPROVEMENT_QWIN

#define FIX_1348_BIT_PRECISION_IMPROVEMENT_DYNAMIC_QOLD









#define NONBE_FIX_864_JBM_RENDER_FRAMESIZE                    /* FhG: issue #864: fix different behaviour of JBM TSM with different render frame sizes */







/* Info for issue 1816:

 * Some compilers do not automatically use 32 bit for 16x16bit products. The code "Word32 c = (Word16) a * (Word16) b;" creates then a 16-bit result, sign-extending the

 * lower 16-bit of the product, any upper bits are omitted. Example: Product 0x0100 * 0x0100 results in 0x0001.0000, gets truncated to its lower bits and return 0x0000.

 * The issue is fixed by simply casting one of the product operands to Word32 in lib_com/basop32.c

 */









#define NONBE_FIX_TCX5_INTERLEAVING_FOR_FS_IN_UNEQUAL_FS_OUT /* FhG: apply correct TCX5 grouping/interleaving when input_fs != output_fs */



#define FIX_1824
@@ -127,6 +111,7 @@ 
#define NONBE_FIX_1075                                  /* FhG: fix segfault for bitrate switching + BINAURAL_ROOM_REVERB output in MC */

#define NON_BE_FIX_1041_USE_OLD_CNG_LSPS_IF_NONSTAB     /* FhG: fix bug in TD MDCT-Stereo concealment */

#define NONBE_FIX_1063_DIV_BY_ZERO_SUMNRG               /* VoiceAge: issue 1063: division by zero for angle_rot feature in the UNCLR classifier */



/* #################### End BASOP porting switches ############################ */



#endif

lib_dec/ivas_mct_dec_fx.c

+0 −1
Original line number Diff line number Diff line
@@ -236,7 +236,6 @@ ivas_error ivas_mct_dec_fx( 
        }



        ivas_mdct_core_tns_ns_fx( hCPE, fUseTns[cpe_id], tnsData[cpe_id], x_fx, Aq_fx_32[cpe_id], 1, 20 );



    }

lib_dec/ivas_mct_dec_mct_fx_fx.c

+1 −2
Original line number Diff line number Diff line
@@ -165,8 +165,7 @@ void ivas_mct_dec_mct_fx( 
static void applyGlobalILD_fx(

    Decoder_State **sts,

    MCT_DEC_HANDLE hMCT,

    Word32 *x[MCT_MAX_CHANNELS][NB_DIV]

)

    Word32 *x[MCT_MAX_CHANNELS][NB_DIV] )

{

    Word16 ch, k;

    Word16 nSubframes, L_subframeTCX;

lib_dec/ivas_mdct_core_dec_fx.c

+0 −1
Original line number Diff line number Diff line
@@ -1824,7 +1824,6 @@ void ivas_mdct_core_tns_ns_fx( 
            }



            TonalMDCTConceal_Apply_ivas_fx( st->hTonalMDCTConc, x_fx[ch][0], x_e, st->hTcxCfg->psychParamsCurrent );



        }



        test();