Commit 3b9bc7c3 authored by emerit's avatar emerit
Browse files

Merge branch 'main' into 744_step3_code_changes

parents 33418777 443d8047

lib_com/ivas_cnst.h

+3 −0
Original line number Diff line number Diff line
@@ -1556,6 +1556,9 @@ typedef enum 
#define MAX_SPLIT_MD_SUBFRAMES                  1

#define COMPLEX_MD_BAND_THRESH                  MAX_SPLIT_REND_MD_BANDS

#define COMPLEX_MD_BAND_THRESH_LOW              5

#ifdef SPLIT_REND_HF_TUNING

#define SPLIT_REND_RO_MD_BAND_THRESH            4

#endif



#define IVAS_SPLIT_REND_NUM_QUANT_STRATS        4

#define IVAS_SPLIT_REND_PRED_63QUANT_PNTS       63

lib_com/options.h

+8 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ 


/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */

#define FIX_954_OTR_REF_VEC                             /* FhG: Fix forward vector direction for OTR REF VEC mode */



#define FIX_638_ENERGIE_IAC_ROM_TABLES                  /* Orange : Missing left/right and coherence late reverb tables in binary format*/

#define FIX_OLD_BINARY_FORMAT                           /* Orange: temporary to maintain bitexactness */
@@ -167,6 +168,13 @@ 
#define NONBE_FIX_AVG_IAC_CLDFB_REVERB                        /* Orange: Add computation avg energy and iac tables for rom and binaural binary file */

#define NONBE_FIX_856_TCX_LTP_SYNTH_FILTER                    /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/

#define NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA                 /* Nokia: issue 944: fix FEC error in OMASA */

#define NONBE_FIX_949_MC_5MS_FRAMING                          /* Dlb: issue 949: fix for issue 949, distorted output in MC mode with 5ms framing*/



#ifdef SPLIT_REND_WITH_HEAD_ROT

#define SPLIT_REND_HF_TUNING                                  /* Dlb: issue 950: split rendering MD tuning change at high frequencies*/

#define SPLIT_REND_MC_FIX_LFE                                 /* Dlb: issue 950: split rendering LFE fix for 7.1 and 5.1 MC mode*/

#define SPLIT_EXT_REND_FIX_LIMITER_POS                        /* Dlb: issue 950: fixing limiter position in split rendering mode in external renderer*/

#endif



/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_binRenderer_internal.c

+10 −0
Original line number Diff line number Diff line
@@ -1535,6 +1535,9 @@ void ivas_binaural_add_LFE( 
{

    int16_t render_lfe, idx_lfe;

    float gain;

#ifdef SPLIT_REND_MC_FIX_LFE

    float lfe_tc[L_FRAME48k];

#endif



    if ( st_ivas->hBinRenderer != NULL )

    {
@@ -1558,10 +1561,17 @@ void ivas_binaural_add_LFE( 


        for ( idx_lfe = 0; idx_lfe < st_ivas->hIntSetup.num_lfe; idx_lfe++ )

        {

#ifdef SPLIT_REND_MC_FIX_LFE

            v_multc( input_f[st_ivas->hIntSetup.index_lfe[idx_lfe]], gain, lfe_tc, output_frame );

            /* copy LFE to left and right channels */

            v_add( output_f[0], lfe_tc, output_f[0], output_frame );

            v_add( output_f[1], lfe_tc, output_f[1], output_frame );

#else

            v_multc( input_f[st_ivas->hIntSetup.index_lfe[idx_lfe]], gain, input_f[st_ivas->hIntSetup.index_lfe[idx_lfe]], output_frame );

            /* copy LFE to left and right channels */

            v_add( output_f[0], input_f[st_ivas->hIntSetup.index_lfe[idx_lfe]], output_f[0], output_frame );

            v_add( output_f[1], input_f[st_ivas->hIntSetup.index_lfe[idx_lfe]], output_f[1], output_frame );

#endif

        }

    }

lib_dec/ivas_jbm_dec.c

+6 −0
Original line number Diff line number Diff line
@@ -1260,6 +1260,12 @@ ivas_error ivas_jbm_dec_render( 
    }

    else if ( st_ivas->ivas_format == MC_FORMAT )

    {

#ifdef NONBE_FIX_949_MC_5MS_FRAMING

        for ( n = 0; n < st_ivas->hTcBuffer->nchan_buffer_full; n++ )

        {

            p_tc[n] = &st_ivas->hTcBuffer->tc[n][st_ivas->hTcBuffer->n_samples_rendered];

        }

#endif

        if ( st_ivas->mc_mode == MC_MODE_MCT )

        {

            int16_t crendInPlaceRotation = FALSE;

lib_dec/ivas_objectRenderer_internal.c

+12 −0
Original line number Diff line number Diff line
@@ -342,6 +342,18 @@ ivas_error ivas_td_binaural_renderer_sf_splitBinaural( 
        {

            return error;

        }



#ifdef SPLIT_REND_MC_FIX_LFE

        if ( st_ivas->ivas_format == MC_FORMAT )

        {

            float *p_tc[MAX_TRANSPORT_CHANNELS];

            for ( i = 0; i < st_ivas->nchan_transport; i++ )

            {

                p_tc[i] = st_ivas->hTcBuffer->tc[i] + st_ivas->hTcBuffer->n_samples_rendered;

            }

            ivas_binaural_add_LFE( st_ivas, nSamplesRendered, p_tc, p_bin_output );

        }

#endif

    }



    for ( i = 0; i < pMultiBinPoseData->num_poses * BINAURAL_CHANNELS; i++ )