ref: 8531c0b02ad2456af83f7ef6cec149875c7c219f
parent: 5164b5505f256c06eb3a84f4d8a8a93055af9d41
author: robs <robs>
date: Sun Feb 25 15:45:36 EST 2007
Some warnings clean-ups
--- a/amr-wb/bits.c
+++ b/amr-wb/bits.c
@@ -57,10 +57,10 @@
st->prev_ft = TX_SPEECH;
}
-void Write_serial(FILE * fp, Word16 prms[], Word16 coding_mode, Word16 mode, TX_State *st, Word16 bitstreamformat)
+void Write_serial(FILE * fp, Word16 prms[], int coding_mode, int mode, TX_State *st, int bitstreamformat)
{Word16 i, frame_type;
- Word16 stream[SIZE_MAX];
+ Word16 stream[AMR_WB_SIZE_MAX];
UWord8 temp;
UWord8 *stream_ptr;
@@ -260,7 +260,7 @@
}
-Word16 Read_serial(FILE * fp, Word16 prms[], Word16 * frame_type, Word16 * mode, RX_State *st, Word16 bitstreamformat)
+Word16 Read_serial(FILE * fp, Word16 prms[], Word16 * frame_type, Word16 * mode, RX_State *st, int bitstreamformat)
{Word16 n, n1, type_of_frame_type, coding_mode, datalen, i;
UWord8 toc, q, temp, *packet_ptr, packet[64];
--- a/amr-wb/bits.h
+++ b/amr-wb/bits.h
@@ -26,7 +26,7 @@
#define BIT_0_ITU (Word16)0x007F
#define BIT_1_ITU (Word16)0x0081
-#define SIZE_MAX (3+NB_BITS_MAX) /* serial size max */
+#define AMR_WB_SIZE_MAX (3+NB_BITS_MAX) /* serial size max */
#define TX_FRAME_TYPE (Word16)0x6b21
#define RX_FRAME_TYPE (Word16)0x6b20
@@ -63,8 +63,8 @@
Word16 Init_read_serial(RX_State ** st);
Word16 Close_read_serial(RX_State *st);
void Reset_read_serial(RX_State * st);
-void Write_serial(FILE * fp, Word16 prms[], Word16 coding_mode, Word16 mode, TX_State *st, Word16 bitstreamformat);
-Word16 Read_serial(FILE * fp, Word16 prms[], Word16 * frame_type, Word16 * mode, RX_State *st, Word16 bitstreamformat);
+void Write_serial(FILE * fp, Word16 prms[], int coding_mode, int mode, TX_State *st, int bitstreamformat);
+Word16 Read_serial(FILE * fp, Word16 prms[], Word16 * frame_type, Word16 * mode, RX_State *st, int bitstreamformat);
void Parm_serial(
Word16 value, /* input : parameter value */
--- a/amr-wb/cod_main.c
+++ b/amr-wb/cod_main.c
@@ -93,7 +93,7 @@
}
-void Reset_encoder(void *st, Word16 reset_all)
+void Reset_encoder(void *st, int reset_all)
{Word16 i;
@@ -203,7 +203,7 @@
Word16 prms[], /* output: output parameters */
Word16 * ser_size, /* output: bit rate of the used mode */
void *spe_state, /* i/o : State structure */
- Word16 allow_dtx /* input : DTX ON/OFF */
+ int allow_dtx /* input : DTX ON/OFF */
)
{--- a/amr-wb/dec_main.c
+++ b/amr-wb/dec_main.c
@@ -97,7 +97,7 @@
return;
}
-void Reset_decoder(void *st, Word16 reset_all)
+void Reset_decoder(void *st, int reset_all)
{Word16 i;
@@ -180,12 +180,12 @@
*-----------------------------------------------------------------*/
void decoder(
- Word16 mode, /* input : used mode */
+ int mode, /* input : used mode */
Word16 prms[], /* input : parameter vector */
Word16 synth16k[], /* output: synthesis speech */
Word16 * frame_length, /* output: lenght of the frame */
void *spd_state, /* i/o : State structure */
- Word16 frame_type /* input : received frame type */
+ int frame_type /* input : received frame type */
)
{--- a/amr-wb/homing.c
+++ b/amr-wb/homing.c
@@ -107,7 +107,7 @@
}
-Word16 decoder_homing_frame_test(Word16 input_frame[], Word16 mode)
+Word16 decoder_homing_frame_test(Word16 input_frame[], int mode)
{/* perform test for COMPLETE parameter frame */
return dhf_test(input_frame, mode, nb_of_bits[mode]);
@@ -114,7 +114,7 @@
}
-Word16 decoder_homing_frame_test_first(Word16 input_frame[], Word16 mode)
+Word16 decoder_homing_frame_test_first(Word16 input_frame[], int mode)
{/* perform test for FIRST SUBFRAME of parameter frame ONLY */
return dhf_test(input_frame, mode, prmnofsf[mode]);
--- a/amr-wb/main.h
+++ b/amr-wb/main.h
@@ -13,7 +13,7 @@
Word16 prms[], /* output: output parameters */
Word16 * ser_size, /* output: bit rate of the used mode */
void *spe_state, /* i/o : State structure */
- Word16 allow_dtx /* input : DTX ON/OFF */
+ int allow_dtx /* input : DTX ON/OFF */
);
void Init_decoder(void **spd_state);
@@ -20,20 +20,20 @@
void Close_decoder(void *spd_state);
void decoder(
- Word16 mode, /* input : used mode */
+ int mode, /* input : used mode */
Word16 prms[], /* input : parameter vector */
Word16 synth16k[], /* output: synthesis speech */
Word16 * frame_length, /* output: lenght of the frame */
void *spd_state, /* i/o : State structure */
- Word16 frame_type /* input : received frame type */
+ int frame_type /* input : received frame type */
);
-void Reset_encoder(void *st, Word16 reset_all);
+void Reset_encoder(void *st, int reset_all);
-void Reset_decoder(void *st, Word16 reset_all);
+void Reset_decoder(void *st, int reset_all);
Word16 encoder_homing_frame_test(Word16 input_frame[]);
-Word16 decoder_homing_frame_test(Word16 input_frame[], Word16 mode);
+Word16 decoder_homing_frame_test(Word16 input_frame[], int mode);
-Word16 decoder_homing_frame_test_first(Word16 input_frame[], Word16 mode);
+Word16 decoder_homing_frame_test_first(Word16 input_frame[], int mode);