Commit 0fe36b45 authored by norvell's avatar norvell
Browse files

Merge with main

parents d19bce3e 88c50ea6

apps/decoder.c

100644 → 100755
+5 −0
Original line number Diff line number Diff line
@@ -1062,6 +1062,11 @@ static void usage_dec( void ) 
    fprintf( stdout, "                      left or l or 1->left, right or r or -1->right, center or c or  0->middle\n" );

    fprintf( stdout, "-q                  : Quiet mode, no frame counter\n" );

    fprintf( stdout, "                      default is deactivated\n" );

#ifdef DEBUG_MODE_INFO

#ifdef DEBUG_MODE_INFO_TWEAK

    fprintf( stdout, "-info <folder>      : specify subfolder name for debug output\n" );

#endif

#endif

    fprintf( stdout, "\n" );



    return;

lib_com/ivas_cnst.h

100644 → 100755
+4 −0
Original line number Diff line number Diff line
@@ -520,6 +520,10 @@ typedef enum 


#define STEREO_DFT_XCORR_LB_MAX                 24



#ifdef STABILIZE_GIPD

#define STEREO_DFT_IPD_BUF_LEN                  5

#endif



#define STEREO_DFT_N_COH_PRED                   4                           /* Number of intra-frame predictors for coherence vector */

#define STEREO_DFT_COH_PRED_COEFFS              15                          /* Number of coefficients per predictor */

#define STEREO_DFT_PRED_NBITS                   2                           /* Bits to signal predictor (log_2(4) = 2) */

lib_com/ivas_prot.h

100644 → 100755
+0 −0

File mode changed from 100644 to 100755.

View file

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ 
#define FIX_272_COV                                     /* Issue 272: Cleanup for code coverage related to calls to ivas_binaural_cldfb() */

#define FIX_235                                         /* Issue 235: Deallocation of HR filter memory separately for lib_rend (ROM) and lib_util (from file) */

/*#define ENV_STAB_FIX*/                                    /* Contribution 23: HQ envelope stability memory fix */

#define STABILIZE_GIPD                                  /* FhG: Contribution 22: gIPD stabilization */



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

/* clang-format on */

lib_enc/ivas_stat_enc.h

100644 → 100755
+6 −0
Original line number Diff line number Diff line
@@ -210,6 +210,12 @@ typedef struct stereo_dft_enc_data_struct 
    float sfm;

    float sum_dot_prod_real;

    float sum_dot_prod_img;

#ifdef STABILIZE_GIPD

    float dot_prod_real_smooth[STEREO_DFT_BAND_MAX];

    float dot_prod_img_smooth[STEREO_DFT_BAND_MAX];

    float ipd_buf[STEREO_DFT_BAND_MAX][STEREO_DFT_IPD_BUF_LEN];

    float prev_gipd;

#endif



    /*ITD*/

    ITD_DATA_HANDLE hItd;