Commit 7880e045 authored by vaclav's avatar vaclav Committed by Manuel Jander
Browse files

remove forgotten float/intX_t datatypes

parent cdfcb067
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -1786,12 +1786,11 @@ static void usage_dec( void )
    fprintf( stdout, "                      ID and duration pairs, where duration is specified in frames\n" );
    fprintf( stdout, "                      for BINAURAL_ROOM_REVERB output configuration.\n" );
    fprintf( stdout, "-obj_edit File      : Object editing instructions file or NULL for built-in example\n" );

    fprintf( stdout, "-level level        : Complexity level, level = (1, 2, 3), will be defined after characterisation. \n" );
    fprintf( stdout, "                      Currently, all values default to level 3 (full functionality).\n" );
#ifdef FIX_1318_ROOM_SIZE_CMD_LINE
    fprintf( stdout, "-room_size (S|M|L)  : Selects default reverb based on a room size (S - small | M - medium | L - large)\n" );
    fprintf( stdout, "                      for BINAURAL_ROOM_REVERB output configuration,\n" );
    fprintf( stdout, "                      for BINAURAL_ROOM_REVERB output configuration\n" );
#endif
    fprintf( stdout, "-q                  : Quiet mode, no frame counter\n" );
    fprintf( stdout, "                      default is deactivated\n" );
+0 −4
Original line number Diff line number Diff line
@@ -43,10 +43,6 @@
#include "basop_util.h"


/* tcx_lpc_cdk.h */
#define LSF_GAP_VAL( x ) ( Word16 )( (x) *2.0f * 1.28f )
#define LSFM( x )        FL2WORD16_SCALE( x * 1.28, 15 - 1 ) /* 14Q1*1.28 */

/* cnst.h */
#define GAMMA1_INV   17809 /* weighting factor (numerator) default:0.92 (1Q14format)     */
#define GAMMA16k_INV 17430 /* weighting factor (numerator) default:0.94 (1Q14format)     */
+3 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@
 * Local function prototypes
 *-------------------------------------------------------------------*/
static void getmidbands( const Word16 *part, const Word16 npart, Word16 *midband, Word16 *psize, Word16 *psize_norm, Word16 *psize_norm_exp, Word16 *psize_inv );

static void mhvals( const Word16 d, Word16 *m );

/*-------------------------------------------------------------------
 * createFdCngCom()
@@ -2823,7 +2823,8 @@ void SynthesisSTFT_ivas_fx(
/**************************************************************************************
 * Compute some values used in the bias correction of the minimum statistics algorithm *
 **************************************************************************************/
void mhvals(

static void mhvals(
    const Word16 d,
    Word16 *m /*, Word16 * h*/
)
+2 −2
Original line number Diff line number Diff line
@@ -3720,8 +3720,8 @@ void ivas_init_binaural_hrtf_fx(

ivas_error ivas_allocate_binaural_hrtf_fx(
    HRTFS_FASTCONV *HrtfFastConv,                               /* i/o: FASTCONV HRTF structure                         */
    const int16_t n_channels,                                   /* i : number of input channels                         */
    const int16_t allocate_init_flag                            /* i  : Memory allocation flag                          */
    const Word16 n_channels,                                    /* i : number of input channels                         */
    const Word16 allocate_init_flag                             /* i  : Memory allocation flag                          */
);

void ivas_binRenderer_fx(
+4 −4
Original line number Diff line number Diff line
@@ -117,8 +117,8 @@ void mvc2c(

/*! r: number of clipped samples */
UWord32 ivas_syn_output_fx(
    Word32 *synth[], /* i/o: float synthesis signal              q_synth*/
    const Word16 q_synth,
    Word32 *synth[],           /* i/o:  synthesis signal              q_synth*/
    const Word16 q_synth,      /* i  : Q factor                              */
    const Word16 output_frame, /* i  : output frame length (one channel)   Q0*/
    const Word16 n_channels,   /* i  : number of output channels           Q0*/
    Word16 *synth_out          /* o  : integer 16 bits synthesis signal    Q0*/
@@ -131,7 +131,7 @@ UWord32 ivas_syn_output_fx(
    move32();

    /*-----------------------------------------------------------------*
     * float to integer conversion with saturation control
     * Word32 to Word16 conversion with saturation control
     *-----------------------------------------------------------------*/

    FOR( n = 0; n < n_channels; n++ )
@@ -2094,7 +2094,7 @@ void panning_wrap_angles_fx(
/*-------------------------------------------------------------------------*
 * v_sort_ind_fixed()
 *
 * Sort a float array
 * Sort a Word32 array
 * (modified version of v_sort() to return an index array)
 *-------------------------------------------------------------------------*/

Loading