Commit c998c189 authored by norvell's avatar norvell
Browse files

Merge branch 'main' into 423-add-ism-extended-metadata-to-ivas_modes-json-for-complexity-tests

parents c5a8c166 baad7c03

lib_com/ivas_cnst.h

+4 −0
Original line number Diff line number Diff line
@@ -1442,7 +1442,11 @@ typedef enum 
#define SFX_SPAT_BIN_NUM_SUBSAMPLES             64

#define ITD_MEM_LEN                             (MAX_ITD + SFX_SPAT_BIN_SINC_M)

#define L_SUBFRAME5MS_48k                       (L_FRAME48k/4)

#ifdef FIX_421_TD_INT_TUNE

#define MAX_ANGULAR_STEP                        (0.01f)

#else

#define MAX_ANGULAR_STEP                        (1.0f)

#endif

#define MAX_ANGULAR_STEP_INV                    ( 1.0f / MAX_ANGULAR_STEP )

#define MAX_INTERPOLATION_STEPS                 12

lib_com/options.h

+4 −0
Original line number Diff line number Diff line
@@ -167,7 +167,11 @@ 


#define FIX_401_DIRAC_RENDERER_META_READ_INDICES        /* Nokia: Issue 401: Fix metadata reading indices in DirAC renderer. */



#define FIX_406_IVAS_POSITION                           /* Eri: Issue 406: Unify IVAS_POSITION to use IVAS_VECTOR3 instead */

#define REND_DEBUGGING_REVISION                         /* VA: encapsulate rendering debugging options with DEBUGGING */

#define FIX_418_SID_BITRATE                             /* Eri: Issue 418: Using the correct bitrate for unified stereo SID */

#define PARAMMC_SHORT_ENC_MDFT                          /* FhG: Issue 410: complexity optimization for parametric Multichannel modes */

#define FIX_421_TD_INT_TUNE                             /* Eri: Issue 421: Increase use of interpolation in TD renderer filter transition */



#define FIX_422                                         /* FhG: Issue 422: re-introduce fix for noisy speech buffer in ParamISM */

/* ################## End DEVELOPMENT switches ######################### */

lib_dec/ivas_stereo_cng_dec.c

+6 −0
Original line number Diff line number Diff line
@@ -90,8 +90,12 @@ void stereo_dft_dec_sid_coh( 
    int16_t bits_tmp;

    int16_t b;



#ifdef FIX_418_SID_BITRATE

    nr_of_sid_stereo_bits = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS;

#else

    /* TODO: still use old number of bits to keep bitexactness in output */

    nr_of_sid_stereo_bits = ( 4400 /*IVAS_SID_5k2*/ - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS;

#endif



    /* If the coherence is not encoded due to lack of bits set alpha to zero which leads to that the coherence */

    /* from the previous frame is used. */
@@ -174,7 +178,9 @@ void stereo_dft_dec_sid_coh( 
        ( *nb_bits )++;

    }



#ifndef FIX_418_SID_BITRATE

    dtx_read_padding_bits( st, ( IVAS_SID_5k2 - 4400 ) / FRAMES_PER_SEC );

#endif



    return;

}

lib_enc/ivas_stereo_cng_enc.c

+6 −0
Original line number Diff line number Diff line
@@ -173,8 +173,12 @@ void stereo_dft_enc_sid_coh( 
    int16_t alpha_level;

    int16_t n;



#ifdef FIX_418_SID_BITRATE

    nr_of_sid_stereo_bits = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS;

#else

    /* TODO: still use old number of bits to keep bitexactness in output */

    nr_of_sid_stereo_bits = ( 4400 /*IVAS_SID_5k2*/ - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS;

#endif

    zeropad = 0;



    /* Encode coherence vector. Find best fixed predictor by minimizing prediction error on input vector.
@@ -329,7 +333,9 @@ void stereo_dft_enc_sid_coh( 
        ( *nb_bits )++;

    }



#ifndef FIX_418_SID_BITRATE

    push_next_indice( hBstr, zeropad, ( IVAS_SID_5k2 - 4400 ) / FRAMES_PER_SEC );

#endif



    return;

}