From b362cee1441b42d081d8b69d7bdaa6370979cd13 Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Thu, 18 Dec 2008 16:48:43 +0000 Subject: Fixed minor gcc compilation warnings git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2385 74dad513-b988-da41-8d7b-12977e46ad98 --- pjmedia/src/pjmedia-codec/g722.c | 6 +++--- pjmedia/src/pjmedia/echo_suppress.c | 6 +++--- pjmedia/src/test/main.c | 3 ++- pjmedia/src/test/mips_test.c | 3 ++- pjsip/src/pjsip-ua/sip_inv.c | 2 +- pjsip/src/pjsua-lib/pjsua_pres.c | 2 +- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/pjmedia/src/pjmedia-codec/g722.c b/pjmedia/src/pjmedia-codec/g722.c index 9f68eb9b..fc89fd66 100644 --- a/pjmedia/src/pjmedia-codec/g722.c +++ b/pjmedia/src/pjmedia-codec/g722.c @@ -626,7 +626,7 @@ static pj_status_t g722_codec_decode(pjmedia_codec *codec, #if !PLC_DISABLED if (g722_data->plc_enabled) - pjmedia_plc_save(g722_data->plc, output->buf); + pjmedia_plc_save(g722_data->plc, (pj_int16_t*)output->buf); #endif TRACE_((THIS_FILE, "G722 decode done")); @@ -642,14 +642,14 @@ static pj_status_t g722_codec_recover(pjmedia_codec *codec, unsigned output_buf_len, struct pjmedia_frame *output) { - struct g722_data *g722_data = codec->codec_data; + struct g722_data *g722_data = (struct g722_data*)codec->codec_data; PJ_ASSERT_RETURN(g722_data->plc_enabled, PJ_EINVALIDOP); PJ_ASSERT_RETURN(output_buf_len >= SAMPLES_PER_FRAME * 2, PJMEDIA_CODEC_EPCMTOOSHORT); - pjmedia_plc_generate(g722_data->plc, output->buf); + pjmedia_plc_generate(g722_data->plc, (pj_int16_t*)output->buf); output->size = SAMPLES_PER_FRAME * 2; output->type = PJMEDIA_FRAME_TYPE_AUDIO; diff --git a/pjmedia/src/pjmedia/echo_suppress.c b/pjmedia/src/pjmedia/echo_suppress.c index 0b2ab083..b0bbd830 100644 --- a/pjmedia/src/pjmedia/echo_suppress.c +++ b/pjmedia/src/pjmedia/echo_suppress.c @@ -121,7 +121,7 @@ typedef enum talk_state ST_REM_SILENT, ST_DOUBLETALK, ST_REM_TALK -} talk_state; +} talk_state_t; const char *state_names[] = { @@ -225,7 +225,7 @@ typedef struct echo_supp pj_uint16_t tail_samples; /* Tail length in samples. */ pj_bool_t learning; /* Are we still learning yet? */ - talk_state talk_state; /* Current talking state */ + talk_state_t talk_state; /* Current talking state */ int tail_index; /* Echo location, -1 if not found */ unsigned max_calc; /* # of calc before learning complete. @@ -391,7 +391,7 @@ PJ_DEF(void) echo_supp_soft_reset(void *state) /* Set state */ -static void echo_supp_set_state(echo_supp *ec, enum talk_state state, +static void echo_supp_set_state(echo_supp *ec, talk_state_t state, unsigned level) { PJ_UNUSED_ARG(level); diff --git a/pjmedia/src/test/main.c b/pjmedia/src/test/main.c index 99215768..8e016ec9 100644 --- a/pjmedia/src/test/main.c +++ b/pjmedia/src/test/main.c @@ -43,4 +43,5 @@ int main(int argc, char *argv[]) return rc; } - \ No newline at end of file + + diff --git a/pjmedia/src/test/mips_test.c b/pjmedia/src/test/mips_test.c index 4a4c4f5b..3054d7f1 100644 --- a/pjmedia/src/test/mips_test.c +++ b/pjmedia/src/test/mips_test.c @@ -419,7 +419,8 @@ static pjmedia_port* create_gen_port(pj_pool_t *pool, pj_int16_t *buf; unsigned c; - buf = pj_pool_alloc(pool, sizeof(ref_signal)*channel_count); + buf = (pj_int16_t*) + pj_pool_alloc(pool, sizeof(ref_signal)*channel_count); for (c=0; cmsg->line.req.uri = + tdata->msg->line.req.uri = (pjsip_uri*) pjsip_uri_clone(tdata->pool, inv->dlg->target_set.current->uri); /* Remove branch param in Via header. */ diff --git a/pjsip/src/pjsua-lib/pjsua_pres.c b/pjsip/src/pjsua-lib/pjsua_pres.c index 41af06a9..d9676594 100644 --- a/pjsip/src/pjsua-lib/pjsua_pres.c +++ b/pjsip/src/pjsua-lib/pjsua_pres.c @@ -137,7 +137,7 @@ PJ_DEF(pj_status_t) pjsua_enum_buddies( pjsua_buddy_id ids[], PJ_DEF(pj_status_t) pjsua_buddy_get_info( pjsua_buddy_id buddy_id, pjsua_buddy_info *info) { - int total=0; + unsigned total=0; pjsua_buddy *buddy; PJ_ASSERT_RETURN(buddy_id>=0 && -- cgit v1.2.3