Commit 534acaaa authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

Merge branch 'main' into... 

Merge branch 'main' into basop-2298-port-float-mr-2468-swb-tbe-fix-constant-in-create_random_vector-to-allow-more-reliable
parents e6d88659 039c9ce6

apps/decoder.c

+3 −0
Original line number Diff line number Diff line
@@ -913,6 +913,9 @@ static bool parseCmdlIVAS_dec( 
    arg->inputFormat = IVAS_DEC_INPUT_FORMAT_G192;

    arg->non_diegetic_pan_enabled = false;

    arg->non_diegetic_pan_gain = 0.f;

#ifdef FIX_2318_CLANG_DECODER

    arg->non_diegetic_pan_gain_fx = 0;

#endif

    arg->tsmEnabled = false;

    arg->render_num_subframes = IVAS_RENDER_NUM_SUBFR_20MS;

    arg->aeSequence.count = 0;

lib_com/options.h

+4 −0
Original line number Diff line number Diff line
@@ -98,12 +98,16 @@ 
#define REMOVE_UNUSED_CODE_IVAS_DEC                     /* VA: remove unused code in ivas_jbm_dec_tc_fx() */

#define FIX_2294_CLANG_18_WARNINGS_ENC                  /* VA: Fix some encoder clang-18 warnings, desc. in 2294 */

#define REMOVE_CAM_FROM_IVAS                            /* VA: basop issue 210: remove obsoelte CAM code from IVAS */

#define FIX_2318_CLANG_DECODER                          /* VA: basop issue 2318: Initialize command-line parameter arg.non_diegetic_pan_gain_fx */

#define OPT_BE_2311_HARM_GSC_GAIN                       /* VA: issue 2311: BE part of the GSC gain harmonization pipeline #70380 shows the BE */

#define HARM_CORECODER_UPDT                             /* VA: basop issue 2342: Remove duplicated code in core-coder common update functions */

#define HARM_CORE_SW                                    /* VA: basop issue 2314: Remove duplicated code in the core switching */

#define HARM_PREPROC                                    /* VA: basop issue 2339: Remove duplicated code in the core-coder DTX  */

#define HARM_NON_LINEARITY                              /* VA: basop issue 2345: Remove duplicated code in core-coder: non_linearity_fx() and LP CNG */

#define FIX_2344_ALIGN_PREPROC                          /* VA: basop issue 2344: Align pre_proc_ivas() between FLP and BASOP */

#define FIX_2334_HARM_CODER_MODIF                       /* VA: basop issue 2334 : harmonizing coder_modif_function */

#define FIX_FLOAT_1501_UNIT_VALUE_IN_OMASA              /* Nokia: Fix float issue 1501, uninitialized value in ivas_masa_combine_directions for OMASA */

#define FIX_BASOP_2323_DIRAC_ENC_WRONG_INIT             /* Nokia/FhG: basop issue 2323: Use correct init size */



/* #################### End BE switches ################################## */

lib_enc/ivas_cpe_enc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -1133,7 +1133,11 @@ ivas_error ivas_cpe_enc_fx( 
        IF( ( NE_16( hCPE->element_mode, IVAS_CPE_DFT ) && NE_16( hCPE->element_mode, IVAS_CPE_TD ) ) || n == 0 ) /* modify coder_type of primary channel */

        {

            /* limit coder_type depending on the bitrate */

#ifndef FIX_2334_HARM_CODER_MODIF

            coder_type_modif_ivas_fx( sts[n], relE_fx[n] );

#else

            coder_type_modif_fx( sts[n], relE_fx[n] );

#endif

        }

    }

lib_enc/ivas_dirac_enc_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -1574,9 +1574,17 @@ void computeDiffuseness_mdft_fx( 
    set_zero_fx( intensity_slow, i_mult( DIRAC_NUM_DIMS, MASA_FREQUENCY_BANDS ) );

    set16_fx( intensity_slow_e, 0, i_mult( DIRAC_NUM_DIMS, MASA_FREQUENCY_BANDS ) );

    set_zero_fx( intensity_slow_abs, MASA_FREQUENCY_BANDS );

#ifdef FIX_BASOP_2323_DIRAC_ENC_WRONG_INIT

    set16_fx( intensity_slow_abs_e, 0, MASA_FREQUENCY_BANDS );

#else

    set16_fx( intensity_slow_abs_e, 0, no_col_avg_diff );

#endif

    set_zero_fx( energy_slow, MASA_FREQUENCY_BANDS );

#ifdef FIX_BASOP_2323_DIRAC_ENC_WRONG_INIT

    set16_fx( energy_slow_e, 0, MASA_FREQUENCY_BANDS );

#else

    set16_fx( energy_slow_e, 0, no_col_avg_diff );

#endif



    FOR( i = 0; i < no_col_avg_diff; ++i )

    {

lib_enc/ivas_ism_enc_fx.c

+4 −1
Original line number Diff line number Diff line
@@ -453,8 +453,11 @@ ivas_error ivas_ism_enc_fx( 
        }



        /* modify the coder_type depending on the total_brate per channel */

#ifndef FIX_2334_HARM_CODER_MODIF

        coder_type_modif_ivas_fx( st, relE_fx[sce_id][0] );



#else

        coder_type_modif_fx( st, relE_fx[sce_id][0] );

#endif

        /*----------------------------------------------------------------*

         * Encoder

         *----------------------------------------------------------------*/