From 208776ec0c5c77623637a28b88391067df24e682 Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Fri, 11 May 2007 15:14:34 +0000 Subject: HUGE changeset to make the rest of the libraries compile with C++ mode git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1266 74dad513-b988-da41-8d7b-12977e46ad98 --- pjmedia/src/pjmedia-codec/gsm.c | 24 +++++++++++------------- pjmedia/src/pjmedia-codec/ilbc.c | 6 +++--- pjmedia/src/pjmedia-codec/l16.c | 4 ++-- pjmedia/src/pjmedia-codec/speex_codec.c | 16 ++++++++-------- 4 files changed, 24 insertions(+), 26 deletions(-) (limited to 'pjmedia/src/pjmedia-codec') diff --git a/pjmedia/src/pjmedia-codec/gsm.c b/pjmedia/src/pjmedia-codec/gsm.c index d21956ae..c909339b 100644 --- a/pjmedia/src/pjmedia-codec/gsm.c +++ b/pjmedia/src/pjmedia-codec/gsm.c @@ -122,8 +122,8 @@ static struct gsm_codec_factory /* GSM codec private data. */ struct gsm_data { - void *encoder; - void *decoder; + gsm_state *encoder; + gsm_state *decoder; pj_bool_t plc_enabled; #if !PLC_DISABLED pjmedia_plc *plc; @@ -323,14 +323,12 @@ static pj_status_t gsm_alloc_codec( pjmedia_codec_factory *factory, codec = gsm_codec_factory.codec_list.next; pj_list_erase(codec); } else { - codec = pj_pool_zalloc(gsm_codec_factory.pool, - sizeof(pjmedia_codec)); + codec = PJ_POOL_ZALLOC_T(gsm_codec_factory.pool, pjmedia_codec); PJ_ASSERT_RETURN(codec != NULL, PJ_ENOMEM); codec->op = &gsm_op; codec->factory = factory; - gsm_data = pj_pool_zalloc(gsm_codec_factory.pool, - sizeof(struct gsm_data)); + gsm_data = PJ_POOL_ZALLOC_T(gsm_codec_factory.pool, struct gsm_data); codec->codec_data = gsm_data; #if !PLC_DISABLED @@ -371,7 +369,7 @@ static pj_status_t gsm_dealloc_codec( pjmedia_codec_factory *factory, PJ_ASSERT_RETURN(factory && codec, PJ_EINVAL); PJ_ASSERT_RETURN(factory == &gsm_codec_factory.base, PJ_EINVAL); - gsm_data = codec->codec_data; + gsm_data = (struct gsm_data*) codec->codec_data; /* Close codec, if it's not closed. */ gsm_codec_close(codec); @@ -417,7 +415,7 @@ static pj_status_t gsm_codec_init( pjmedia_codec *codec, static pj_status_t gsm_codec_open( pjmedia_codec *codec, pjmedia_codec_param *attr ) { - struct gsm_data *gsm_data = codec->codec_data; + struct gsm_data *gsm_data = (struct gsm_data*) codec->codec_data; pj_assert(gsm_data != NULL); pj_assert(gsm_data->encoder == NULL && gsm_data->decoder == NULL); @@ -441,7 +439,7 @@ static pj_status_t gsm_codec_open( pjmedia_codec *codec, */ static pj_status_t gsm_codec_close( pjmedia_codec *codec ) { - struct gsm_data *gsm_data = codec->codec_data; + struct gsm_data *gsm_data = (struct gsm_data*) codec->codec_data; pj_assert(gsm_data != NULL); @@ -464,7 +462,7 @@ static pj_status_t gsm_codec_close( pjmedia_codec *codec ) static pj_status_t gsm_codec_modify(pjmedia_codec *codec, const pjmedia_codec_param *attr ) { - struct gsm_data *gsm_data = codec->codec_data; + struct gsm_data *gsm_data = (struct gsm_data*) codec->codec_data; pj_assert(gsm_data != NULL); pj_assert(gsm_data->encoder != NULL && gsm_data->decoder != NULL); @@ -516,7 +514,7 @@ static pj_status_t gsm_codec_encode( pjmedia_codec *codec, unsigned output_buf_len, struct pjmedia_frame *output) { - struct gsm_data *gsm_data = codec->codec_data; + struct gsm_data *gsm_data = (struct gsm_data*) codec->codec_data; pj_assert(gsm_data != NULL); PJ_ASSERT_RETURN(input && output, PJ_EINVAL); @@ -535,7 +533,7 @@ static pj_status_t gsm_codec_encode( pjmedia_codec *codec, &input->timestamp); is_silence = pjmedia_silence_det_detect(gsm_data->vad, - input->buf, + (const pj_int16_t*) input->buf, (input->size >> 1), NULL); if (is_silence && @@ -570,7 +568,7 @@ static pj_status_t gsm_codec_decode( pjmedia_codec *codec, unsigned output_buf_len, struct pjmedia_frame *output) { - struct gsm_data *gsm_data = codec->codec_data; + struct gsm_data *gsm_data = (struct gsm_data*) codec->codec_data; pj_assert(gsm_data != NULL); PJ_ASSERT_RETURN(input && output, PJ_EINVAL); diff --git a/pjmedia/src/pjmedia-codec/ilbc.c b/pjmedia/src/pjmedia-codec/ilbc.c index 32e03833..7819867f 100644 --- a/pjmedia/src/pjmedia-codec/ilbc.c +++ b/pjmedia/src/pjmedia-codec/ilbc.c @@ -319,7 +319,7 @@ static pj_status_t ilbc_alloc_codec(pjmedia_codec_factory *factory, 2000, 2000); PJ_ASSERT_RETURN(pool != NULL, PJ_ENOMEM); - codec = pj_pool_zalloc(pool, sizeof(struct ilbc_codec)); + codec = PJ_POOL_ZALLOC_T(pool, struct ilbc_codec); codec->base.op = &ilbc_op; codec->base.factory = factory; codec->pool = pool; @@ -530,7 +530,7 @@ static pj_status_t ilbc_codec_encode(pjmedia_codec *codec, &input->timestamp); is_silence = pjmedia_silence_det_detect(ilbc_codec->vad, - input->buf, + (const pj_int16_t*)input->buf, (input->size >> 1), NULL); if (is_silence && @@ -585,7 +585,7 @@ static pj_status_t ilbc_codec_decode(pjmedia_codec *codec, return PJMEDIA_CODEC_EFRMINLEN; /* Decode to temporary buffer */ - iLBC_decode(ilbc_codec->dec_block, input->buf, + iLBC_decode(ilbc_codec->dec_block, (unsigned char*) input->buf, &ilbc_codec->dec, 1); /* Convert decodec samples from float to short */ diff --git a/pjmedia/src/pjmedia-codec/l16.c b/pjmedia/src/pjmedia-codec/l16.c index 629ea588..df456045 100644 --- a/pjmedia/src/pjmedia-codec/l16.c +++ b/pjmedia/src/pjmedia-codec/l16.c @@ -428,7 +428,7 @@ static pj_status_t l16_alloc_codec( pjmedia_codec_factory *factory, /* Allocate new codec if no more is available */ if (pj_list_empty(&l16_factory.codec_list)) { - codec = pj_pool_alloc(l16_factory.pool, sizeof(pjmedia_codec)); + codec = PJ_POOL_ALLOC_T(l16_factory.pool, pjmedia_codec); codec->codec_data = pj_pool_alloc(l16_factory.pool, sizeof(struct l16_data)); codec->factory = factory; @@ -441,7 +441,7 @@ static pj_status_t l16_alloc_codec( pjmedia_codec_factory *factory, /* Init private data */ ptime = GET_PTIME(id->clock_rate); - data = codec->codec_data; + data = (struct l16_data*) codec->codec_data; data->frame_size = ptime * id->clock_rate * id->channel_cnt * 2 / 1000; /* Zero the list, for error detection in l16_dealloc_codec */ diff --git a/pjmedia/src/pjmedia-codec/speex_codec.c b/pjmedia/src/pjmedia-codec/speex_codec.c index e79dc90c..955377bc 100644 --- a/pjmedia/src/pjmedia-codec/speex_codec.c +++ b/pjmedia/src/pjmedia-codec/speex_codec.c @@ -481,8 +481,7 @@ static pj_status_t spx_alloc_codec( pjmedia_codec_factory *factory, codec = spx_factory.codec_list.next; pj_list_erase(codec); } else { - codec = pj_pool_zalloc(spx_factory.pool, - sizeof(pjmedia_codec)); + codec = PJ_POOL_ZALLOC_T(spx_factory.pool, pjmedia_codec); PJ_ASSERT_RETURN(codec != NULL, PJ_ENOMEM); codec->op = &spx_op; codec->factory = factory; @@ -736,7 +735,8 @@ static pj_status_t spx_codec_encode( pjmedia_codec *codec, speex_bits_reset(&spx->enc_bits); /* Encode the frame */ - tx = speex_encode_int(spx->enc, input->buf, &spx->enc_bits); + tx = speex_encode_int(spx->enc, (spx_int16_t*)input->buf, + &spx->enc_bits); /* Check if we need not to transmit the frame (DTX) */ if (tx == 0) { @@ -753,7 +753,7 @@ static pj_status_t spx_codec_encode( pjmedia_codec *codec, /* Copy the bits to an array of char that can be written */ output->size = speex_bits_write(&spx->enc_bits, - output->buf, output_buf_len); + (char*)output->buf, output_buf_len); output->type = PJMEDIA_FRAME_TYPE_AUDIO; output->timestamp = input->timestamp; @@ -781,14 +781,14 @@ static pj_status_t spx_codec_decode( pjmedia_codec *codec, } /* Copy the data into the bit-stream struct */ - speex_bits_read_from(&spx->dec_bits, input->buf, input->size); + speex_bits_read_from(&spx->dec_bits, (char*)input->buf, input->size); /* Decode the data */ - speex_decode_int(spx->dec, &spx->dec_bits, output->buf); + speex_decode_int(spx->dec, &spx->dec_bits, (spx_int16_t*)output->buf); output->type = PJMEDIA_FRAME_TYPE_AUDIO; output->size = speex_bits_nbytes(&spx->dec_bits); - pj_assert(output->size <= (int)output_buf_len); + pj_assert(output->size <= (unsigned)output_buf_len); output->timestamp.u64 = input->timestamp.u64; @@ -814,7 +814,7 @@ static pj_status_t spx_codec_recover(pjmedia_codec *codec, pj_assert(count <= output_buf_len/2); /* Recover packet loss */ - speex_decode_int(spx->dec, NULL, output->buf); + speex_decode_int(spx->dec, NULL, (spx_int16_t*) output->buf); output->size = count * 2; -- cgit v1.2.3