Commit 338cc091 authored by vaclav's avatar vaclav
Browse files

- improve comments 

- output_fs -> output_Fs
parent cf46c019

lib_com/ivas_cnst.h

+9 −12
Original line number Diff line number Diff line
@@ -1418,19 +1418,9 @@ typedef enum 




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

 * Crend constants

 * Orientation tracking constants

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



#define IVAS_REV_MAX_NR_BRANCHES                8                           /* setup is for maximum                */



#define IVAS_REV_MAX_IIR_FILTER_LENGTH          4                           /* maximum nr of taps - MUST BE EVEN! */



#define RV_FILTER_MAX_FFT_SIZE                  ( 512 )

#define RV_FILTER_MAX_HISTORY                   ( 512 - 160 )               /* for longest history */



#define RV_LENGTH_NR_FC                         ( RV_FILTER_MAX_FFT_SIZE / 2 ) + 1





/* Orientation tracking types */

#define IVAS_ORIENT_TRK_REF                     0

#define IVAS_ORIENT_TRK_AVG                     1
@@ -1440,14 +1430,21 @@ typedef enum 
    OTR_TRACKING_NONE = IVAS_ORIENT_TRK_REF-1, /* track orientation relative to external reference orientation (default: yaw=pitch=roll=0) */

    OTR_TRACKING_REF_ORIENT = IVAS_ORIENT_TRK_REF, /* track orientation relative to external reference orientation (default: yaw=pitch=roll=0) */

    OTR_TRACKING_AVG_ORIENT = IVAS_ORIENT_TRK_AVG  /* track orientation relative to average orientation */

} OTR_TRACKING_T;



} OTR_TRACKING_T;





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

 * Reverberator constants

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



#define IVAS_REV_MAX_NR_BRANCHES                8                           /* setup is for maximum                */

#define IVAS_REV_MAX_IIR_FILTER_LENGTH          4                           /* maximum nr of taps - MUST BE EVEN! */



#define RV_FILTER_MAX_FFT_SIZE                  ( 512 )

#define RV_FILTER_MAX_HISTORY                   ( 512 - 160 )               /* for longest history */

#define RV_LENGTH_NR_FC                         ( RV_FILTER_MAX_FFT_SIZE / 2 ) + 1



#define IVAS_REVERB_DEFAULT_N_BANDS             31

#define IVAS_REVERB_DEFAULT_PRE_DELAY           0.016f

#define IVAS_REVERB_DEFAULT_INPUT_DELAY         0.1f

lib_com/ivas_prot.h

+2 −2
Original line number Diff line number Diff line
@@ -4578,7 +4578,7 @@ ivas_error ivas_headTrack_open( 
void rotateFrame_shd(

    HEAD_TRACK_DATA_HANDLE hHeadTrackData,                      /* i  : head track handle                                       */

    float output[][L_FRAME48k],                                 /* i/o: unrotated HOA3 signal buffer in TD                      */

    const int32_t output_fs,                                    /* i  : output sampling frequency                               */

    const int32_t output_Fs,                                    /* i  : output sampling frequency                               */

    const int16_t subframe_len,                                 /* i  : subframe length per channel                             */

    const IVAS_OUTPUT_SETUP hTransSetup,                        /* i  : format for rotation                                     */

    const int16_t subframe_idx                                  /* i  : subframe index                                          */
@@ -4587,7 +4587,7 @@ void rotateFrame_shd( 
void rotateFrame_sd(

    HEAD_TRACK_DATA_HANDLE hHeadTrackData,                      /* i  : head track handle                                       */

    float output[][L_FRAME48k],                                 /* i/o: unrotated SD signal buffer in TD                        */

    const int32_t output_fs,                                    /* i  : output sampling frequency                               */

    const int32_t output_Fs,                                    /* i  : output sampling frequency                               */

    const int16_t subframe_len,                                 /* i  : subframe length per channel                             */

    const IVAS_OUTPUT_SETUP hTransSetup,                        /* i  : format for rotation                                     */

    const EFAP_HANDLE hEFAPdata,                                /* i  : EFAP structure                                          */

lib_dec/ivas_rotation.c

+2 −2
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ void rotateAziEle_DirAC( 
void rotateFrame_shd(

    HEAD_TRACK_DATA_HANDLE hHeadTrackData, /* i  : head track handle                  */

    float output[][L_FRAME48k],            /* i/o: unrotated HOA3 signal buffer in TD */

    const int32_t output_fs,               /* i  : output sampling frequency          */

    const int32_t output_Fs,               /* i  : output sampling frequency          */

    const int16_t subframe_len,            /* i  : subframe length per channel        */

    const IVAS_OUTPUT_SETUP hTransSetup,   /* i  : format for rotation                */

    const int16_t subframe_idx             /* i  : subframe index                     */
@@ -321,7 +321,7 @@ void rotateFrame_shd( 
    shd_rot_max_order = hTransSetup.ambisonics_order;



    /* 1ms linear crossfade */

    fade_len_smp = NS2SA( output_fs, 1000000 );

    fade_len_smp = NS2SA( output_Fs, 1000000 );

    tmp = 1.0f / fade_len_smp;

    for ( i = 0; i < fade_len_smp; i++ )

    {