diff options
author | Benny Prijono <bennylp@teluu.com> | 2006-04-27 22:36:40 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2006-04-27 22:36:40 +0000 |
commit | 4bab78a009cbfc57426066ebb5070e7609d4be04 (patch) | |
tree | 016b6205dfafc5084da23be9467f2c092cea01a8 /pjmedia/src | |
parent | 76cf603ff005c45c996cbaf742913f418eb09910 (diff) |
Initial support for stereo codecs, and added L16 codecs. Also better handling for case remote media is restarted
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@411 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/src')
-rw-r--r-- | pjmedia/src/pjmedia-codec/gsm.c | 18 | ||||
-rw-r--r-- | pjmedia/src/pjmedia-codec/l16.c | 594 | ||||
-rw-r--r-- | pjmedia/src/pjmedia-codec/speex_codec.c | 66 | ||||
-rw-r--r-- | pjmedia/src/pjmedia/codec.c | 267 | ||||
-rw-r--r-- | pjmedia/src/pjmedia/conference.c | 20 | ||||
-rw-r--r-- | pjmedia/src/pjmedia/endpoint.c | 44 | ||||
-rw-r--r-- | pjmedia/src/pjmedia/g711.c | 73 | ||||
-rw-r--r-- | pjmedia/src/pjmedia/jbuf.c | 6 | ||||
-rw-r--r-- | pjmedia/src/pjmedia/master_port.c | 6 | ||||
-rw-r--r-- | pjmedia/src/pjmedia/null_port.c | 2 | ||||
-rw-r--r-- | pjmedia/src/pjmedia/resample_port.c | 2 | ||||
-rw-r--r-- | pjmedia/src/pjmedia/rtcp.c | 4 | ||||
-rw-r--r-- | pjmedia/src/pjmedia/session.c | 45 | ||||
-rw-r--r-- | pjmedia/src/pjmedia/sound_port.c | 2 | ||||
-rw-r--r-- | pjmedia/src/pjmedia/stream.c | 39 | ||||
-rw-r--r-- | pjmedia/src/pjmedia/wav_player.c (renamed from pjmedia/src/pjmedia/file_player.c) | 21 | ||||
-rw-r--r-- | pjmedia/src/pjmedia/wav_writer.c (renamed from pjmedia/src/pjmedia/file_writer.c) | 10 |
17 files changed, 1033 insertions, 186 deletions
diff --git a/pjmedia/src/pjmedia-codec/gsm.c b/pjmedia/src/pjmedia-codec/gsm.c index 55d207aa..ebb6d1be 100644 --- a/pjmedia/src/pjmedia-codec/gsm.c +++ b/pjmedia/src/pjmedia-codec/gsm.c @@ -49,8 +49,6 @@ static pj_status_t gsm_dealloc_codec( pjmedia_codec_factory *factory, pjmedia_codec *codec ); /* Prototypes for GSM implementation. */ -static pj_status_t gsm_codec_default_attr(pjmedia_codec *codec, - pjmedia_codec_param *attr); static pj_status_t gsm_codec_init( pjmedia_codec *codec, pj_pool_t *pool ); static pj_status_t gsm_codec_open( pjmedia_codec *codec, @@ -73,7 +71,6 @@ static pj_status_t gsm_codec_decode( pjmedia_codec *codec, /* Definition for GSM codec operations. */ static pjmedia_codec_op gsm_op = { - &gsm_codec_default_attr, &gsm_codec_init, &gsm_codec_open, &gsm_codec_close, @@ -233,7 +230,8 @@ static pj_status_t gsm_default_attr (pjmedia_codec_factory *factory, PJ_UNUSED_ARG(id); pj_memset(attr, 0, sizeof(pjmedia_codec_param)); - attr->sample_rate = 8000; + attr->clock_rate = 8000; + attr->channel_cnt = 1; attr->avg_bps = 13200; attr->pcm_bits_per_sample = 16; attr->ptime = 20; @@ -258,7 +256,8 @@ static pj_status_t gsm_enum_codecs(pjmedia_codec_factory *factory, codecs[0].encoding_name = pj_str("GSM"); codecs[0].pt = PJMEDIA_RTP_PT_GSM; codecs[0].type = PJMEDIA_TYPE_AUDIO; - codecs[0].sample_rate = 8000; + codecs[0].clock_rate = 8000; + codecs[0].channel_cnt = 1; *count = 1; @@ -328,15 +327,6 @@ static pj_status_t gsm_dealloc_codec( pjmedia_codec_factory *factory, } /* - * Get codec default attributes. - */ -static pj_status_t gsm_codec_default_attr( pjmedia_codec *codec, - pjmedia_codec_param *attr) -{ - return gsm_default_attr( codec->factory, NULL, attr); -} - -/* * Init codec. */ static pj_status_t gsm_codec_init( pjmedia_codec *codec, diff --git a/pjmedia/src/pjmedia-codec/l16.c b/pjmedia/src/pjmedia-codec/l16.c new file mode 100644 index 00000000..594aefc3 --- /dev/null +++ b/pjmedia/src/pjmedia-codec/l16.c @@ -0,0 +1,594 @@ +/* $Id$ */ +/* + * Copyright (C)2003-2006 Benny Prijono <benny@prijono.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#include <pjmedia-codec/l16.h> +#include <pjmedia/codec.h> +#include <pjmedia/errno.h> +#include <pjmedia/endpoint.h> +#include <pj/assert.h> +#include <pj/pool.h> +#include <pj/sock.h> +#include <pj/string.h> + + +/* + * Only build this file if PJMEDIA_HAS_L16_CODEC != 0 + */ +#if defined(PJMEDIA_HAS_L16_CODEC) && PJMEDIA_HAS_L16_CODEC != 0 + + +static const pj_str_t STR_L16 = { "L16", 3 }; + +/* To keep frame size below 1400 MTU, set ptime to 10ms for + * sampling rate > 35 KHz + */ +#define GET_PTIME(clock_rate) ((pj_uint16_t)(clock_rate > 35000 ? 10 : 20)) + + +/* Prototypes for L16 factory */ +static pj_status_t l16_test_alloc( pjmedia_codec_factory *factory, + const pjmedia_codec_info *id ); +static pj_status_t l16_default_attr( pjmedia_codec_factory *factory, + const pjmedia_codec_info *id, + pjmedia_codec_param *attr ); +static pj_status_t l16_enum_codecs (pjmedia_codec_factory *factory, + unsigned *count, + pjmedia_codec_info codecs[]); +static pj_status_t l16_alloc_codec( pjmedia_codec_factory *factory, + const pjmedia_codec_info *id, + pjmedia_codec **p_codec); +static pj_status_t l16_dealloc_codec( pjmedia_codec_factory *factory, + pjmedia_codec *codec ); + +/* Prototypes for L16 implementation. */ +static pj_status_t l16_init( pjmedia_codec *codec, + pj_pool_t *pool ); +static pj_status_t l16_open( pjmedia_codec *codec, + pjmedia_codec_param *attr ); +static pj_status_t l16_close( pjmedia_codec *codec ); +static pj_status_t l16_get_frames(pjmedia_codec *codec, + void *pkt, + pj_size_t pkt_size, + unsigned *frame_cnt, + pjmedia_frame frames[]); +static pj_status_t l16_encode( pjmedia_codec *codec, + const struct pjmedia_frame *input, + unsigned output_buf_len, + struct pjmedia_frame *output); +static pj_status_t l16_decode( pjmedia_codec *codec, + const struct pjmedia_frame *input, + unsigned output_buf_len, + struct pjmedia_frame *output); + +/* Definition for L16 codec operations. */ +static pjmedia_codec_op l16_op = +{ + &l16_init, + &l16_open, + &l16_close, + &l16_get_frames, + &l16_encode, + &l16_decode +}; + +/* Definition for L16 codec factory operations. */ +static pjmedia_codec_factory_op l16_factory_op = +{ + &l16_test_alloc, + &l16_default_attr, + &l16_enum_codecs, + &l16_alloc_codec, + &l16_dealloc_codec +}; + +/* L16 factory private data */ +static struct l16_factory +{ + pjmedia_codec_factory base; + pjmedia_endpt *endpt; + pj_pool_t *pool; + pj_mutex_t *mutex; + pjmedia_codec codec_list; +} l16_factory; + + +/* L16 codec private data. */ +struct l16_data +{ + unsigned frame_size; /* Frame size, in bytes */ +}; + + + +PJ_DEF(pj_status_t) pjmedia_codec_l16_init(pjmedia_endpt *endpt, + unsigned options) +{ + pjmedia_codec_mgr *codec_mgr; + pj_status_t status; + + + PJ_UNUSED_ARG(options); + + + if (l16_factory.endpt != NULL) { + /* Already initialized. */ + return PJ_SUCCESS; + } + + /* Init factory */ + l16_factory.base.op = &l16_factory_op; + l16_factory.base.factory_data = NULL; + l16_factory.endpt = endpt; + + pj_list_init(&l16_factory.codec_list); + + /* Create pool */ + l16_factory.pool = pjmedia_endpt_create_pool(endpt, "l16", 4000, 4000); + if (!l16_factory.pool) + return PJ_ENOMEM; + + /* Create mutex. */ + status = pj_mutex_create_simple(l16_factory.pool, "l16", + &l16_factory.mutex); + if (status != PJ_SUCCESS) + goto on_error; + + /* Get the codec manager. */ + codec_mgr = pjmedia_endpt_get_codec_mgr(endpt); + if (!codec_mgr) { + return PJ_EINVALIDOP; + } + + /* Register codec factory to endpoint. */ + status = pjmedia_codec_mgr_register_factory(codec_mgr, + &l16_factory.base); + if (status != PJ_SUCCESS) + return status; + + + return PJ_SUCCESS; + +on_error: + if (l16_factory.mutex) { + pj_mutex_destroy(l16_factory.mutex); + l16_factory.mutex = NULL; + } + if (l16_factory.pool) { + pj_pool_release(l16_factory.pool); + l16_factory.pool = NULL; + } + return status; +} + +PJ_DEF(pj_status_t) pjmedia_codec_l16_deinit(void) +{ + pjmedia_codec_mgr *codec_mgr; + pj_status_t status; + + if (l16_factory.endpt == NULL) { + /* Not registered. */ + return PJ_SUCCESS; + } + + /* Lock mutex. */ + pj_mutex_lock(l16_factory.mutex); + + /* Get the codec manager. */ + codec_mgr = pjmedia_endpt_get_codec_mgr(l16_factory.endpt); + if (!codec_mgr) { + l16_factory.endpt = NULL; + pj_mutex_unlock(l16_factory.mutex); + return PJ_EINVALIDOP; + } + + /* Unregister L16 codec factory. */ + status = pjmedia_codec_mgr_unregister_factory(codec_mgr, + &l16_factory.base); + l16_factory.endpt = NULL; + + /* Destroy mutex. */ + pj_mutex_destroy(l16_factory.mutex); + l16_factory.mutex = NULL; + + + /* Release pool. */ + pj_pool_release(l16_factory.pool); + l16_factory.pool = NULL; + + + return status; +} + +static pj_status_t l16_test_alloc(pjmedia_codec_factory *factory, + const pjmedia_codec_info *id ) +{ + PJ_UNUSED_ARG(factory); + + if (pj_stricmp(&id->encoding_name, &STR_L16)==0) { + /* Match! */ + return PJ_SUCCESS; + } + + return -1; +} + +static pj_status_t l16_default_attr( pjmedia_codec_factory *factory, + const pjmedia_codec_info *id, + pjmedia_codec_param *attr ) +{ + PJ_UNUSED_ARG(factory); + + pj_memset(attr, 0, sizeof(pjmedia_codec_param)); + attr->pt = id->pt; + attr->clock_rate = id->clock_rate; + attr->channel_cnt = id->channel_cnt; + attr->avg_bps = id->clock_rate * id->channel_cnt * 16; + attr->pcm_bits_per_sample = 16; + + /* To keep frame size below 1400 MTU, set ptime to 10ms for + * sampling rate > 35 KHz + */ + attr->ptime = GET_PTIME(id->clock_rate); + + /* Default all flag bits disabled. */ + + return PJ_SUCCESS; +} + +static pj_status_t l16_enum_codecs( pjmedia_codec_factory *factory, + unsigned *max_count, + pjmedia_codec_info codecs[]) +{ + unsigned count = 0; + + PJ_UNUSED_ARG(factory); + + if (count < *max_count) { + /* Register 44100Hz 1 channel L16 codec */ + codecs[count].type = PJMEDIA_TYPE_AUDIO; + codecs[count].pt = PJMEDIA_RTP_PT_L16_1; + codecs[count].encoding_name = STR_L16; + codecs[count].clock_rate = 44100; + codecs[count].channel_cnt = 1; + ++count; + } + + if (count < *max_count) { + /* Register 44100Hz 2 channels L16 codec */ + codecs[count].type = PJMEDIA_TYPE_AUDIO; + codecs[count].pt = PJMEDIA_RTP_PT_L16_2; + codecs[count].encoding_name = STR_L16; + codecs[count].clock_rate = 44100; + codecs[count].channel_cnt = 2; + ++count; + } + + if (count < *max_count) { + /* 8KHz mono */ + codecs[count].type = PJMEDIA_TYPE_AUDIO; + codecs[count].pt = PJMEDIA_RTP_PT_L16_8KHZ_MONO; + codecs[count].encoding_name = STR_L16; + codecs[count].clock_rate = 8000; + codecs[count].channel_cnt = 1; + ++count; + } + + if (count < *max_count) { + /* 8KHz stereo */ + codecs[count].type = PJMEDIA_TYPE_AUDIO; + codecs[count].pt = PJMEDIA_RTP_PT_L16_8KHZ_STEREO; + codecs[count].encoding_name = STR_L16; + codecs[count].clock_rate = 8000; + codecs[count].channel_cnt = 2; + ++count; + } + + if (count < *max_count) { + /* 11025 Hz mono */ + codecs[count].type = PJMEDIA_TYPE_AUDIO; + codecs[count].pt = PJMEDIA_RTP_PT_L16_11KHZ_MONO; + codecs[count].encoding_name = STR_L16; + codecs[count].clock_rate = 11025; + codecs[count].channel_cnt = 1; + ++count; + } + + if (count < *max_count) { + /* 11025 Hz stereo */ + codecs[count].type = PJMEDIA_TYPE_AUDIO; + codecs[count].pt = PJMEDIA_RTP_PT_L16_11KHZ_STEREO; + codecs[count].encoding_name = STR_L16; + codecs[count].clock_rate = 11025; + codecs[count].channel_cnt = 2; + ++count; + } + + if (count < *max_count) { + /* 16000 Hz mono */ + codecs[count].type = PJMEDIA_TYPE_AUDIO; + codecs[count].pt = PJMEDIA_RTP_PT_L16_16KHZ_MONO; + codecs[count].encoding_name = STR_L16; + codecs[count].clock_rate = 16000; + codecs[count].channel_cnt = 1; + ++count; + } + + + if (count < *max_count) { + /* 16000 Hz stereo */ + codecs[count].type = PJMEDIA_TYPE_AUDIO; + codecs[count].pt = PJMEDIA_RTP_PT_L16_16KHZ_STEREO; + codecs[count].encoding_name = STR_L16; + codecs[count].clock_rate = 16000; + codecs[count].channel_cnt = 2; + ++count; + } + + if (count < *max_count) { + /* 22050 Hz mono */ + codecs[count].type = PJMEDIA_TYPE_AUDIO; + codecs[count].pt = PJMEDIA_RTP_PT_L16_22KHZ_MONO; + codecs[count].encoding_name = STR_L16; + codecs[count].clock_rate = 22050; + codecs[count].channel_cnt = 1; + ++count; + } + + + if (count < *max_count) { + /* 22050 Hz stereo */ + codecs[count].type = PJMEDIA_TYPE_AUDIO; + codecs[count].pt = PJMEDIA_RTP_PT_L16_22KHZ_STEREO; + codecs[count].encoding_name = STR_L16; + codecs[count].clock_rate = 22050; + codecs[count].channel_cnt = 2; + ++count; + } + + if (count < *max_count) { + /* 32000 Hz mono */ + codecs[count].type = PJMEDIA_TYPE_AUDIO; + codecs[count].pt = PJMEDIA_RTP_PT_L16_32KHZ_MONO; + codecs[count].encoding_name = STR_L16; + codecs[count].clock_rate = 32000; + codecs[count].channel_cnt = 1; + ++count; + } + + if (count < *max_count) { + /* 32000 Hz stereo */ + codecs[count].type = PJMEDIA_TYPE_AUDIO; + codecs[count].pt = PJMEDIA_RTP_PT_L16_32KHZ_STEREO; + codecs[count].encoding_name = STR_L16; + codecs[count].clock_rate = 32000; + codecs[count].channel_cnt = 2; + ++count; + } + + if (count < *max_count) { + /* 48KHz mono */ + codecs[count].type = PJMEDIA_TYPE_AUDIO; + codecs[count].pt = PJMEDIA_RTP_PT_L16_48KHZ_MONO; + codecs[count].encoding_name = STR_L16; + codecs[count].clock_rate = 48000; + codecs[count].channel_cnt = 1; + ++count; + } + + if (count < *max_count) { + /* 48KHz stereo */ + codecs[count].type = PJMEDIA_TYPE_AUDIO; + codecs[count].pt = PJMEDIA_RTP_PT_L16_48KHZ_MONO; + codecs[count].encoding_name = STR_L16; + codecs[count].clock_rate = 48000; + codecs[count].channel_cnt = 2; + ++count; + } + + + *max_count = count; + + return PJ_SUCCESS; +} + +static pj_status_t l16_alloc_codec( pjmedia_codec_factory *factory, + const pjmedia_codec_info *id, + pjmedia_codec **p_codec) +{ + pjmedia_codec *codec = NULL; + struct l16_data *data; + unsigned ptime; + + PJ_ASSERT_RETURN(factory==&l16_factory.base, PJ_EINVAL); + + /* Lock mutex. */ + pj_mutex_lock(l16_factory.mutex); + + /* 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->codec_data = pj_pool_alloc(l16_factory.pool, + sizeof(struct l16_data)); + codec->factory = factory; + codec->op = &l16_op; + + } else { + codec = l16_factory.codec_list.next; + pj_list_erase(codec); + } + + /* Init private data */ + ptime = GET_PTIME(id->clock_rate); + 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 */ + codec->next = codec->prev = NULL; + + *p_codec = codec; + + /* Unlock mutex. */ + pj_mutex_unlock(l16_factory.mutex); + + return PJ_SUCCESS; +} + +static pj_status_t l16_dealloc_codec(pjmedia_codec_factory *factory, + pjmedia_codec *codec ) +{ + + PJ_ASSERT_RETURN(factory==&l16_factory.base, PJ_EINVAL); + + /* Check that this node has not been deallocated before */ + pj_assert (codec->next==NULL && codec->prev==NULL); + if (codec->next!=NULL || codec->prev!=NULL) { + return PJ_EINVALIDOP; + } + + /* Lock mutex. */ + pj_mutex_lock(l16_factory.mutex); + + /* Insert at the back of the list */ + pj_list_insert_before(&l16_factory.codec_list, codec); + + /* Unlock mutex. */ + pj_mutex_unlock(l16_factory.mutex); + + return PJ_SUCCESS; +} + +static pj_status_t l16_init( pjmedia_codec *codec, pj_pool_t *pool ) +{ + /* There's nothing to do here really */ + PJ_UNUSED_ARG(codec); + PJ_UNUSED_ARG(pool); + + return PJ_SUCCESS; +} + +static pj_status_t l16_open(pjmedia_codec *codec, + pjmedia_codec_param *attr ) +{ + /* Nothing to do.. */ + PJ_UNUSED_ARG(codec); + PJ_UNUSED_ARG(attr); + return PJ_SUCCESS; +} + +static pj_status_t l16_close( pjmedia_codec *codec ) +{ + PJ_UNUSED_ARG(codec); + /* Nothing to do */ + return PJ_SUCCESS; +} + +static pj_status_t l16_get_frames( pjmedia_codec *codec, + void *pkt, + pj_size_t pkt_size, + unsigned *frame_cnt, + pjmedia_frame frames[]) +{ + unsigned count = 0; + struct l16_data *data = (struct l16_data*) codec->codec_data; + + PJ_UNUSED_ARG(codec); + PJ_ASSERT_RETURN(frame_cnt, PJ_EINVAL); + + while (pkt_size >= data->frame_size && count < *frame_cnt) { + frames[0].type = PJMEDIA_FRAME_TYPE_AUDIO; + frames[0].buf = pkt; + frames[0].size = data->frame_size; + + pkt = ((char*)pkt) + data->frame_size; + pkt_size -= data->frame_size; + + ++count; + } + + *frame_cnt = count; + return PJ_SUCCESS; +} + +static pj_status_t l16_encode(pjmedia_codec *codec, + const struct pjmedia_frame *input, + unsigned output_buf_len, + struct pjmedia_frame *output) +{ + const pj_int16_t *samp = (const pj_int16_t*) input->buf; + const pj_int16_t *samp_end = samp + input->size/sizeof(pj_int16_t); + pj_int16_t *samp_out = (pj_int16_t*) output->buf; + + + PJ_UNUSED_ARG(codec); + + + /* Check output buffer length */ + if (output_buf_len < input->size) + return PJMEDIA_CODEC_EFRMTOOSHORT; + + + /* Encode */ +#if defined(PJ_IS_LITTLE_ENDIAN) && PJ_IS_LITTLE_ENDIAN!=0 + while (samp!=samp_end) + *samp_out++ = pj_htons(*samp++); +#endif + + + /* Done */ + output->type = PJMEDIA_FRAME_TYPE_AUDIO; + output->size = input->size; + + return PJ_SUCCESS; +} + +static pj_status_t l16_decode(pjmedia_codec *codec, + const struct pjmedia_frame *input, + unsigned output_buf_len, + struct pjmedia_frame *output) +{ + const pj_int16_t *samp = (const pj_int16_t*) input->buf; + const pj_int16_t *samp_end = samp + input->size/sizeof(pj_int16_t); + pj_int16_t *samp_out = (pj_int16_t*) output->buf; + + + PJ_UNUSED_ARG(codec); + + + /* Check output buffer length */ + if (output_buf_len < input->size) + return PJMEDIA_CODEC_EPCMTOOSHORT; + + + /* Decode */ +#if defined(PJ_IS_LITTLE_ENDIAN) && PJ_IS_LITTLE_ENDIAN!=0 + while (samp!=samp_end) + *samp_out++ = pj_htons(*samp++); +#endif + + + output->type = PJMEDIA_FRAME_TYPE_AUDIO; + output->size = input->size; + + return PJ_SUCCESS; +} + + +#endif /* PJMEDIA_HAS_L16_CODEC */ + + diff --git a/pjmedia/src/pjmedia-codec/speex_codec.c b/pjmedia/src/pjmedia-codec/speex_codec.c index 840737ee..280cfbdd 100644 --- a/pjmedia/src/pjmedia-codec/speex_codec.c +++ b/pjmedia/src/pjmedia-codec/speex_codec.c @@ -56,8 +56,6 @@ static pj_status_t spx_dealloc_codec( pjmedia_codec_factory *factory, pjmedia_codec *codec ); /* Prototypes for Speex implementation. */ -static pj_status_t spx_codec_default_attr(pjmedia_codec *codec, - pjmedia_codec_param *attr); static pj_status_t spx_codec_init( pjmedia_codec *codec, pj_pool_t *pool ); static pj_status_t spx_codec_open( pjmedia_codec *codec, @@ -80,7 +78,6 @@ static pj_status_t spx_codec_decode( pjmedia_codec *codec, /* Definition for Speex codec operations. */ static pjmedia_codec_op spx_op = { - &spx_codec_default_attr, &spx_codec_init, &spx_codec_open, &spx_codec_close, @@ -230,7 +227,7 @@ PJ_DEF(pj_status_t) pjmedia_codec_speex_init( pjmedia_endpt *endpt, /* Initialize default Speex parameter. */ spx_factory.speex_param[PARAM_NB].enabled = ((options & PJMEDIA_SPEEX_NO_NB) == 0); - spx_factory.speex_param[PARAM_NB].pt = 102; + spx_factory.speex_param[PARAM_NB].pt = PJMEDIA_RTP_PT_SPEEX_NB; spx_factory.speex_param[PARAM_NB].mode = &speex_nb_mode; spx_factory.speex_param[PARAM_NB].clock_rate = 8000; spx_factory.speex_param[PARAM_NB].quality = quality; @@ -238,7 +235,7 @@ PJ_DEF(pj_status_t) pjmedia_codec_speex_init( pjmedia_endpt *endpt, spx_factory.speex_param[PARAM_WB].enabled = ((options & PJMEDIA_SPEEX_NO_WB) == 0); - spx_factory.speex_param[PARAM_WB].pt = 103; + spx_factory.speex_param[PARAM_WB].pt = PJMEDIA_RTP_PT_SPEEX_WB; spx_factory.speex_param[PARAM_WB].mode = &speex_wb_mode; spx_factory.speex_param[PARAM_WB].clock_rate = 16000; spx_factory.speex_param[PARAM_WB].quality = quality; @@ -246,7 +243,7 @@ PJ_DEF(pj_status_t) pjmedia_codec_speex_init( pjmedia_endpt *endpt, spx_factory.speex_param[PARAM_UWB].enabled = ((options & PJMEDIA_SPEEX_NO_UWB) == 0); - spx_factory.speex_param[PARAM_UWB].pt = 104; + spx_factory.speex_param[PARAM_UWB].pt = PJMEDIA_RTP_PT_SPEEX_UWB; spx_factory.speex_param[PARAM_UWB].mode = &speex_uwb_mode; spx_factory.speex_param[PARAM_UWB].clock_rate = 32000; spx_factory.speex_param[PARAM_UWB].quality = quality; @@ -358,7 +355,7 @@ static pj_status_t spx_test_alloc( pjmedia_codec_factory *factory, /* Check clock-rate */ for (i=0; i<PJ_ARRAY_SIZE(spx_factory.speex_param); ++i) { - if (info->sample_rate == spx_factory.speex_param[i].clock_rate) { + if (info->clock_rate == spx_factory.speex_param[i].clock_rate) { /* Okay, let's Speex! */ return PJ_SUCCESS; } @@ -381,18 +378,19 @@ static pj_status_t spx_default_attr (pjmedia_codec_factory *factory, pj_memset(attr, 0, sizeof(pjmedia_codec_param)); attr->pt = id->pt; + attr->channel_cnt = 1; - if (id->sample_rate <= 8000) { - attr->sample_rate = spx_factory.speex_param[PARAM_NB].clock_rate; + if (id->clock_rate <= 8000) { + attr->clock_rate = spx_factory.speex_param[PARAM_NB].clock_rate; attr->avg_bps = spx_factory.speex_param[PARAM_NB].bitrate; - } else if (id->sample_rate <= 16000) { - attr->sample_rate = spx_factory.speex_param[PARAM_WB].clock_rate; + } else if (id->clock_rate <= 16000) { + attr->clock_rate = spx_factory.speex_param[PARAM_WB].clock_rate; attr->avg_bps = spx_factory.speex_param[PARAM_WB].bitrate; } else { /* Wow.. somebody is doing ultra-wideband. Cool...! */ - attr->sample_rate = spx_factory.speex_param[PARAM_UWB].clock_rate; + attr->clock_rate = spx_factory.speex_param[PARAM_UWB].clock_rate; attr->avg_bps = spx_factory.speex_param[PARAM_UWB].bitrate; } @@ -401,14 +399,14 @@ static pj_status_t spx_default_attr (pjmedia_codec_factory *factory, attr->pt = id->pt; /* Default flags. */ - attr->cng_enabled = 1; - attr->concl_enabled = 1; - attr->hpf_enabled = 1; - attr->lpf_enabled =1 ; - attr->penh_enabled =1 ; + attr->cng = 1; + attr->concl = 1; + attr->hpf = 1; + attr->lpf =1 ; + attr->penh =1 ; /* Default, set VAD off as it caused voice chip off */ - attr->vad_enabled = 0; + attr->vad = 0; return PJ_SUCCESS; } @@ -442,7 +440,8 @@ static pj_status_t spx_enum_codecs(pjmedia_codec_factory *factory, codecs[*count].encoding_name = pj_str("speex"); codecs[*count].pt = spx_factory.speex_param[i].pt; codecs[*count].type = PJMEDIA_TYPE_AUDIO; - codecs[*count].sample_rate = spx_factory.speex_param[i].clock_rate; + codecs[*count].clock_rate = spx_factory.speex_param[i].clock_rate; + codecs[*count].channel_cnt = 1; ++*count; } @@ -486,9 +485,9 @@ static pj_status_t spx_alloc_codec( pjmedia_codec_factory *factory, spx->enc = NULL; spx->dec = NULL; - if (id->sample_rate <= 8000) + if (id->clock_rate <= 8000) spx->param_id = PARAM_NB; - else if (id->sample_rate <= 16000) + else if (id->clock_rate <= 16000) spx->param_id = PARAM_WB; else spx->param_id = PARAM_UWB; @@ -523,25 +522,6 @@ static pj_status_t spx_dealloc_codec( pjmedia_codec_factory *factory, } /* - * Get codec default attributes. - */ -static pj_status_t spx_codec_default_attr( pjmedia_codec *codec, - pjmedia_codec_param *attr) -{ - struct spx_private *spx; - pjmedia_codec_info info; - - spx = (struct spx_private*) codec->codec_data; - - info.encoding_name = pj_str("speex"); - info.pt = 200; /* Don't care */ - info.sample_rate = spx_factory.speex_param[spx->param_id].clock_rate; - info.type = PJMEDIA_TYPE_AUDIO; - - return spx_default_attr( codec->factory, &info, attr); -} - -/* * Init codec. */ static pj_status_t spx_codec_init( pjmedia_codec *codec, @@ -579,12 +559,12 @@ static pj_status_t spx_codec_open( pjmedia_codec *codec, } /* Sampling rate. */ - tmp = attr->sample_rate; + tmp = attr->clock_rate; speex_encoder_ctl(spx->enc, SPEEX_SET_SAMPLING_RATE, &spx_factory.speex_param[id].clock_rate); /* VAD */ - tmp = attr->vad_enabled; + tmp = attr->vad; speex_encoder_ctl(spx->enc, SPEEX_SET_VAD, &tmp); /* Complexity */ @@ -608,7 +588,7 @@ static pj_status_t spx_codec_open( pjmedia_codec *codec, &spx_factory.speex_param[id].clock_rate); /* PENH */ - tmp = attr->penh_enabled; + tmp = attr->penh; speex_decoder_ctl(spx->dec, SPEEX_SET_ENH, &tmp); return PJ_SUCCESS; diff --git a/pjmedia/src/pjmedia/codec.c b/pjmedia/src/pjmedia/codec.c index 6431a58e..bcfa6d8b 100644 --- a/pjmedia/src/pjmedia/codec.c +++ b/pjmedia/src/pjmedia/codec.c @@ -18,36 +18,20 @@ */ #include <pjmedia/codec.h> #include <pjmedia/errno.h> -#include <pj/pool.h> -#include <pj/string.h> +#include <pj/array.h> #include <pj/assert.h> #include <pj/log.h> +#include <pj/pool.h> +#include <pj/string.h> #define THIS_FILE "codec.c" -/* - * Reinitialize array of supported codecs. - */ -static void enum_all_codecs (pjmedia_codec_mgr *mgr) -{ - pjmedia_codec_factory *factory; - mgr->codec_cnt = 0; - factory = mgr->factory_list.next; - while (factory != &mgr->factory_list) { - unsigned count; - pj_status_t status; - count = PJ_ARRAY_SIZE(mgr->codecs) - mgr->codec_cnt; - status = factory->op->enum_info(factory, &count, - mgr->codecs+mgr->codec_cnt); - if (status == PJ_SUCCESS) - mgr->codec_cnt += count; +/* Sort codecs in codec manager based on priorities */ +static void sort_codecs(pjmedia_codec_mgr *mgr); - factory = factory->next; - } -} /* * Initialize codec manager. @@ -62,6 +46,7 @@ PJ_DEF(pj_status_t) pjmedia_codec_mgr_init (pjmedia_codec_mgr *mgr) return PJ_SUCCESS; } + /* * Register a codec factory. */ @@ -69,14 +54,49 @@ PJ_DEF(pj_status_t) pjmedia_codec_mgr_register_factory( pjmedia_codec_mgr *mgr, pjmedia_codec_factory *factory) { + pjmedia_codec_info info[PJMEDIA_CODEC_MGR_MAX_CODECS]; + unsigned i, count; + pj_status_t status; + PJ_ASSERT_RETURN(mgr && factory, PJ_EINVAL); + /* Enum codecs */ + count = PJ_ARRAY_SIZE(info); + status = factory->op->enum_info(factory, &count, info); + if (status != PJ_SUCCESS) + return status; + + + /* Check codec count */ + if (count + mgr->codec_cnt > PJ_ARRAY_SIZE(mgr->codec_desc)) + return PJ_ETOOMANY; + + + /* Save the codecs */ + for (i=0; i<count; ++i) { + pj_memcpy( &mgr->codec_desc[mgr->codec_cnt+i], + &info[i], sizeof(pjmedia_codec_info)); + mgr->codec_desc[mgr->codec_cnt+i].prio = PJMEDIA_CODEC_PRIO_NORMAL; + mgr->codec_desc[mgr->codec_cnt+i].factory = factory; + pjmedia_codec_info_to_id( &info[i], + mgr->codec_desc[mgr->codec_cnt+i].id, + sizeof(pjmedia_codec_id)); + } + + /* Update count */ + mgr->codec_cnt += count; + + /* Re-sort codec based on priorities */ + sort_codecs(mgr); + + /* Add factory to the list */ pj_list_push_back(&mgr->factory_list, factory); - enum_all_codecs (mgr); + return PJ_SUCCESS; } + /* * Unregister a codec factory. */ @@ -84,52 +104,84 @@ PJ_DEF(pj_status_t) pjmedia_codec_mgr_unregister_factory(pjmedia_codec_mgr *mgr, pjmedia_codec_factory *factory) { - + unsigned i; PJ_ASSERT_RETURN(mgr && factory, PJ_EINVAL); /* Factory must be registered. */ PJ_ASSERT_RETURN(pj_list_find_node(&mgr->factory_list, factory)==factory, PJ_ENOTFOUND); - + /* Erase factory from the factory list */ pj_list_erase(factory); - enum_all_codecs (mgr); + + + /* Remove all supported codecs from the codec manager that were created + * by the specified factory. + */ + for (i=0; i<mgr->codec_cnt; ) { + + if (mgr->codec_desc[i].factory == factory) { + + pj_array_erase(mgr->codec_desc, sizeof(mgr->codec_desc[0]), + mgr->codec_cnt, i); + --mgr->codec_cnt; + + } else { + ++i; + } + } + return PJ_SUCCESS; } + /* * Enum all codecs. */ PJ_DEF(pj_status_t) pjmedia_codec_mgr_enum_codecs(pjmedia_codec_mgr *mgr, unsigned *count, - pjmedia_codec_info codecs[]) + pjmedia_codec_info codecs[], + unsigned *prio) { + unsigned i; + PJ_ASSERT_RETURN(mgr && count && codecs, PJ_EINVAL); if (*count > mgr->codec_cnt) *count = mgr->codec_cnt; - pj_memcpy(codecs, mgr->codecs, *count * sizeof(pjmedia_codec_info)); + for (i=0; i<*count; ++i) { + pj_memcpy(&codecs[i], + &mgr->codec_desc[i].info, + sizeof(pjmedia_codec_info)); + } + + if (prio) { + for (i=0; i < *count; ++i) + prio[i] = mgr->codec_desc[i].prio; + } return PJ_SUCCESS; } + /* * Get codec info for static payload type. */ -PJ_DEF(pj_status_t) pjmedia_codec_mgr_get_codec_info(pjmedia_codec_mgr *mgr, - unsigned pt, - pjmedia_codec_info *inf) +PJ_DEF(pj_status_t) +pjmedia_codec_mgr_get_codec_info( pjmedia_codec_mgr *mgr, + unsigned pt, + const pjmedia_codec_info **p_info) { unsigned i; - PJ_ASSERT_RETURN(mgr && inf && pt>=0 && pt < 96, PJ_EINVAL); + PJ_ASSERT_RETURN(mgr && p_info && pt>=0 && pt < 96, PJ_EINVAL); for (i=0; i<mgr->codec_cnt; ++i) { - if (mgr->codecs[i].pt == pt) { - pj_memcpy(inf, &mgr->codecs[i], sizeof(pjmedia_codec_info)); + if (mgr->codec_desc[i].info.pt == pt) { + *p_info = &mgr->codec_desc[i].info; return PJ_SUCCESS; } } @@ -137,6 +189,155 @@ PJ_DEF(pj_status_t) pjmedia_codec_mgr_get_codec_info(pjmedia_codec_mgr *mgr, return PJMEDIA_CODEC_EUNSUP; } + +/* + * Convert codec info struct into a unique codec identifier. + * A codec identifier looks something like "L16/44100/2". + */ +PJ_DEF(char*) pjmedia_codec_info_to_id( const pjmedia_codec_info *info, + char *id, unsigned max_len ) +{ + int len; + + PJ_ASSERT_RETURN(info && id && max_len, NULL); + + len = pj_ansi_snprintf(id, max_len, "%.*s/%u/%u", + (int)info->encoding_name.slen, + info->encoding_name.ptr, + info->clock_rate, + info->channel_cnt); + + if (len < 1 || len >= (int)max_len) { + id[0] = '\0'; + return NULL; + } + + return id; +} + + +/* + * Find codecs by the unique codec identifier. This function will find + * all codecs that match the codec identifier prefix. For example, if + * "L16" is specified, then it will find "L16/8000/1", "L16/16000/1", + * and so on, up to the maximum count specified in the argument. + */ +PJ_DEF(pj_status_t) +pjmedia_codec_mgr_find_codecs_by_id( pjmedia_codec_mgr *mgr, + const pj_str_t *codec_id, + unsigned *count, + const pjmedia_codec_info *p_info[], + unsigned prio[]) +{ + unsigned i, found = 0; + + PJ_ASSERT_RETURN(mgr && codec_id && count && *count, PJ_EINVAL); + + for (i=0; i<mgr->codec_cnt; ++i) { + + if (pj_strnicmp2(codec_id, mgr->codec_desc[i].id, + codec_id->slen) == 0) + { + + if (p_info) + p_info[found] = &mgr->codec_desc[i].info; + if (prio) + prio[found] = mgr->codec_desc[i].prio; + + ++found; + + if (found >= *count) + break; + } + + } + + *count = found; + + return found ? PJ_SUCCESS : PJ_ENOTFOUND; +} + + +/* Swap two codecs positions in codec manager */ +static void swap_codec(pjmedia_codec_mgr *mgr, unsigned i, unsigned j) +{ + struct pjmedia_codec_desc tmp; + + pj_memcpy(&tmp, &mgr->codec_desc[i], sizeof(struct pjmedia_codec_desc)); + + pj_memcpy(&mgr->codec_desc[i], &mgr->codec_desc[j], + sizeof(struct pjmedia_codec_desc)); + + pj_memcpy(&mgr->codec_desc[j], &tmp, sizeof(struct pjmedia_codec_desc)); +} + + +/* Sort codecs in codec manager based on priorities */ +static void sort_codecs(pjmedia_codec_mgr *mgr) +{ + unsigned i; + + /* Re-sort */ + for (i=0; i<mgr->codec_cnt; ++i) { + unsigned j, max; + + for (max=i, j=i+1; j<mgr->codec_cnt; ++j) { + if (mgr->codec_desc[j].prio > mgr->codec_desc[max].prio) + max = j; + } + + if (max != i) + swap_codec(mgr, i, max); + } + + /* Change PJMEDIA_CODEC_PRIO_HIGHEST codecs to NEXT_HIGHER */ + for (i=0; i<mgr->codec_cnt; ++i) { + if (mgr->codec_desc[i].prio == PJMEDIA_CODEC_PRIO_HIGHEST) + mgr->codec_desc[i].prio = PJMEDIA_CODEC_PRIO_NEXT_HIGHER; + else + break; + } +} + + +/** + * Set codec priority. The codec priority determines the order of + * the codec in the SDP created by the endpoint. If more than one codecs + * are found with the same codec_id prefix, then the function sets the + * priorities of all those codecs. + */ +PJ_DEF(pj_status_t) +pjmedia_codec_mgr_set_codec_priority(pjmedia_codec_mgr *mgr, + const pj_str_t *codec_id, + pjmedia_codec_priority prio) +{ + unsigned i, found = 0; + + PJ_ASSERT_RETURN(mgr && codec_id, PJ_EINVAL); + + /* Update the priorities of affected codecs */ + for (i=0; i<mgr->codec_cnt; ++i) + { + if (codec_id->slen == 0 || + pj_strnicmp2(codec_id, mgr->codec_desc[i].id, + codec_id->slen) == 0) + { + mgr->codec_desc[i].prio = prio; + ++found; + } + } + + if (!found) + return PJ_ENOTFOUND; + + /* Re-sort codecs */ + sort_codecs(mgr); + + + return PJ_SUCCESS; +} + + /* * Allocate one codec. */ diff --git a/pjmedia/src/pjmedia/conference.c b/pjmedia/src/pjmedia/conference.c index dfbe567c..daa0529d 100644 --- a/pjmedia/src/pjmedia/conference.c +++ b/pjmedia/src/pjmedia/conference.c @@ -237,7 +237,7 @@ static pj_status_t create_conf_port( pj_pool_t *pool, /* Save some port's infos, for convenience. */ if (port) { conf_port->port = port; - conf_port->clock_rate = port->info.sample_rate; + conf_port->clock_rate = port->info.clock_rate; conf_port->samples_per_frame = port->info.samples_per_frame; } else { conf_port->port = NULL; @@ -442,7 +442,7 @@ PJ_DEF(pj_status_t) pjmedia_conf_create( pj_pool_t *pool, conf->master_port->info.name = pj_str("sound-dev"); conf->master_port->info.need_info = 0; conf->master_port->info.pt = 0xFF; - conf->master_port->info.sample_rate = clock_rate; + conf->master_port->info.clock_rate = clock_rate; conf->master_port->info.samples_per_frame = samples_per_frame; conf->master_port->info.signature = 0; conf->master_port->info.type = PJMEDIA_TYPE_AUDIO; @@ -1090,6 +1090,7 @@ static pj_status_t write_port(pjmedia_conf *conf, struct conf_port *cport, { pj_int16_t *buf; unsigned j; + pj_status_t status; /* If port is muted or nobody is transmitting to this port, * transmit NULL frame. @@ -1180,7 +1181,7 @@ static pj_status_t write_port(pjmedia_conf *conf, struct conf_port *cport, cport->tx_level = 0; } - /* If port has the same clock_date and samples_per_frame settings as + /* If port has the same clock_rate and samples_per_frame settings as * the conference bridge, transmit the frame as is. */ if (cport->clock_rate == conf->clock_rate && @@ -1224,11 +1225,12 @@ static pj_status_t write_port(pjmedia_conf *conf, struct conf_port *cport, cport->tx_buf_count += conf->samples_per_frame; } - /* Transmit once we have enough frame in the tx_buf. */ - if (cport->tx_buf_count >= cport->samples_per_frame) { + /* Transmit while we have enough frame in the tx_buf. */ + status = PJ_SUCCESS; + while (cport->tx_buf_count >= cport->samples_per_frame && + status == PJ_SUCCESS) + { - pj_status_t status; - TRACE_((THIS_FILE, "write_port %.*s: count=%d", (int)cport->name.slen, cport->name.ptr, cport->samples_per_frame)); @@ -1259,11 +1261,9 @@ static pj_status_t write_port(pjmedia_conf *conf, struct conf_port *cport, TRACE_((THIS_FILE, " tx_buf count now is %d", cport->tx_buf_count)); - - return status; } - return PJ_SUCCESS; + return status; } diff --git a/pjmedia/src/pjmedia/endpoint.c b/pjmedia/src/pjmedia/endpoint.c index f4c22756..0c14ac65 100644 --- a/pjmedia/src/pjmedia/endpoint.c +++ b/pjmedia/src/pjmedia/endpoint.c @@ -329,18 +329,43 @@ PJ_DEF(pj_status_t) pjmedia_endpt_create_sdp( pjmedia_endpt *endpt, for (i=0; i<endpt->codec_mgr.codec_cnt; ++i) { - pjmedia_codec_info *codec_info = &endpt->codec_mgr.codecs[i]; + pjmedia_codec_info *codec_info; pjmedia_sdp_rtpmap rtpmap; + char tmp_param[3]; pjmedia_sdp_attr *attr; - pj_str_t *fmt = &m->desc.fmt[m->desc.fmt_count++]; + pj_str_t *fmt; + + if (endpt->codec_mgr.codec_desc[i].prio == PJMEDIA_CODEC_PRIO_DISABLED) + break; + + codec_info = &endpt->codec_mgr.codec_desc[i].info; + fmt = &m->desc.fmt[m->desc.fmt_count++]; fmt->ptr = pj_pool_alloc(pool, 8); fmt->slen = pj_utoa(codec_info->pt, fmt->ptr); rtpmap.pt = *fmt; - rtpmap.clock_rate = codec_info->sample_rate; + rtpmap.clock_rate = codec_info->clock_rate; rtpmap.enc_name = codec_info->encoding_name; - rtpmap.param.slen = 0; + + /* For audio codecs, rtpmap parameters denotes the number + * of channels, which can be omited if the value is 1. + */ + if (codec_info->type == PJMEDIA_TYPE_AUDIO && + codec_info->channel_cnt > 1) + { + /* Can only support one digit channel count */ + pj_assert(codec_info->channel_cnt < 10); + + tmp_param[0] = '/'; + tmp_param[1] = (char)('0' + codec_info->channel_cnt); + + rtpmap.param.ptr = tmp_param; + rtpmap.param.slen = 2; + + } else { + rtpmap.param.slen = 0; + } pjmedia_sdp_rtpmap_to_attr(pool, &rtpmap, &attr); m->attr[m->attr_count++] = attr; @@ -388,7 +413,7 @@ PJ_DEF(pj_status_t) pjmedia_endpt_dump(pjmedia_endpt *endpt) count = PJ_ARRAY_SIZE(codec_info); if (pjmedia_codec_mgr_enum_codecs(&endpt->codec_mgr, - &count, codec_info) != PJ_SUCCESS) + &count, codec_info, NULL) != PJ_SUCCESS) { PJ_LOG(3,(THIS_FILE, " -error: failed to enum codecs")); return PJ_SUCCESS; @@ -416,14 +441,15 @@ PJ_DEF(pj_status_t) pjmedia_endpt_dump(pjmedia_endpt *endpt) } PJ_LOG(3,(THIS_FILE, - " %s codec #%2d: pt=%d (%.*s @%dKHz, %d bps, ptime=%d ms, vad=%d, cng=%d)", + " %s codec #%2d: pt=%d (%.*s @%dKHz/%d, %d bps, ptime=%d ms, vad=%d, cng=%d)", type, i, codec_info[i].pt, (int)codec_info[i].encoding_name.slen, codec_info[i].encoding_name.ptr, - codec_info[i].sample_rate/1000, + codec_info[i].clock_rate/1000, + codec_info[i].channel_cnt, param.avg_bps, param.ptime, - param.vad_enabled, - param.cng_enabled)); + param.vad, + param.cng)); } #endif diff --git a/pjmedia/src/pjmedia/g711.c b/pjmedia/src/pjmedia/g711.c index d921bddf..634ead5e 100644 --- a/pjmedia/src/pjmedia/g711.c +++ b/pjmedia/src/pjmedia/g711.c @@ -35,7 +35,6 @@ /* These are the only public functions exported to applications */ PJ_DECL(pj_status_t) g711_init_factory (pjmedia_codec_factory *factory, pj_pool_t *pool); -PJ_DECL(pj_status_t) g711_deinit_factory (pjmedia_codec_factory *factory); /* Algorithm prototypes. */ unsigned char linear2alaw(int pcm_val); /* 2's complement (16-bit range) */ @@ -59,8 +58,6 @@ static pj_status_t g711_dealloc_codec( pjmedia_codec_factory *factory, pjmedia_codec *codec ); /* Prototypes for G711 implementation. */ -static pj_status_t g711_codec_default_attr (pjmedia_codec *codec, - pjmedia_codec_param *attr); static pj_status_t g711_init( pjmedia_codec *codec, pj_pool_t *pool ); static pj_status_t g711_open( pjmedia_codec *codec, @@ -83,7 +80,6 @@ static pj_status_t g711_decode( pjmedia_codec *codec, /* Definition for G711 codec operations. */ static pjmedia_codec_op g711_op = { - &g711_codec_default_attr , &g711_init, &g711_open, &g711_close, @@ -119,15 +115,6 @@ struct g711_private }; -PJ_DEF(pj_status_t) g711_deinit_factory (pjmedia_codec_factory *factory) -{ - PJ_ASSERT_RETURN(factory==&g711_factory.base, PJ_EINVAL); - - /* Invalidate member to help detect errors */ - g711_factory.codec_list.next = g711_factory.codec_list.prev = NULL; - return 0; -} - PJ_DEF(pj_status_t) pjmedia_codec_g711_init(pjmedia_endpt *endpt) { pjmedia_codec_mgr *codec_mgr; @@ -222,7 +209,8 @@ PJ_DEF(pj_status_t) pjmedia_codec_g711_deinit(void) return status; } -static pj_status_t g711_test_alloc( pjmedia_codec_factory *factory, const pjmedia_codec_info *id ) +static pj_status_t g711_test_alloc(pjmedia_codec_factory *factory, + const pjmedia_codec_info *id ) { PJ_UNUSED_ARG(factory); @@ -237,7 +225,8 @@ static pj_status_t g711_default_attr (pjmedia_codec_factory *factory, PJ_UNUSED_ARG(factory); pj_memset(attr, 0, sizeof(pjmedia_codec_param)); - attr->sample_rate = 8000; + attr->clock_rate = 8000; + attr->channel_cnt = 1; attr->avg_bps = G711_BPS; attr->pcm_bits_per_sample = 16; attr->ptime = 20; @@ -260,14 +249,16 @@ static pj_status_t g711_enum_codecs(pjmedia_codec_factory *factory, codecs[count].type = PJMEDIA_TYPE_AUDIO; codecs[count].pt = PJMEDIA_RTP_PT_PCMU; codecs[count].encoding_name = pj_str("PCMU"); - codecs[count].sample_rate = 8000; + codecs[count].clock_rate = 8000; + codecs[count].channel_cnt = 1; ++count; } if (count < *max_count) { - codecs[1].type = PJMEDIA_TYPE_AUDIO; - codecs[1].pt = PJMEDIA_RTP_PT_PCMA; - codecs[1].encoding_name = pj_str("PCMA"); - codecs[1].sample_rate = 8000; + codecs[count].type = PJMEDIA_TYPE_AUDIO; + codecs[count].pt = PJMEDIA_RTP_PT_PCMA; + codecs[count].encoding_name = pj_str("PCMA"); + codecs[count].clock_rate = 8000; + codecs[count].channel_cnt = 1; ++count; } @@ -292,7 +283,8 @@ static pj_status_t g711_alloc_codec( pjmedia_codec_factory *factory, struct g711_private *codec_priv; codec = pj_pool_alloc(g711_factory.pool, sizeof(pjmedia_codec)); - codec_priv = pj_pool_alloc(g711_factory.pool, sizeof(struct g711_private)); + codec_priv = pj_pool_alloc(g711_factory.pool, + sizeof(struct g711_private)); if (!codec || !codec_priv) { pj_mutex_unlock(g711_factory.mutex); return PJ_ENOMEM; @@ -319,7 +311,8 @@ static pj_status_t g711_alloc_codec( pjmedia_codec_factory *factory, return PJ_SUCCESS; } -static pj_status_t g711_dealloc_codec( pjmedia_codec_factory *factory, pjmedia_codec *codec ) +static pj_status_t g711_dealloc_codec(pjmedia_codec_factory *factory, + pjmedia_codec *codec ) { PJ_ASSERT_RETURN(factory==&g711_factory.base, PJ_EINVAL); @@ -342,15 +335,6 @@ static pj_status_t g711_dealloc_codec( pjmedia_codec_factory *factory, pjmedia_c return PJ_SUCCESS; } -static pj_status_t g711_codec_default_attr (pjmedia_codec *codec, pjmedia_codec_param *attr) -{ - struct g711_private *priv = codec->codec_data; - pjmedia_codec_info id; - - id.pt = priv->pt; - return g711_default_attr (NULL, &id, attr); -} - static pj_status_t g711_init( pjmedia_codec *codec, pj_pool_t *pool ) { /* There's nothing to do here really */ @@ -360,7 +344,8 @@ static pj_status_t g711_init( pjmedia_codec *codec, pj_pool_t *pool ) return PJ_SUCCESS; } -static pj_status_t g711_open( pjmedia_codec *codec, pjmedia_codec_param *attr ) +static pj_status_t g711_open(pjmedia_codec *codec, + pjmedia_codec_param *attr ) { struct g711_private *priv = codec->codec_data; priv->pt = attr->pt; @@ -400,15 +385,17 @@ static pj_status_t g711_get_frames(pjmedia_codec *codec, return PJ_SUCCESS; } -static pj_status_t g711_encode( pjmedia_codec *codec, const struct pjmedia_frame *input, - unsigned output_buf_len, struct pjmedia_frame *output) +static pj_status_t g711_encode(pjmedia_codec *codec, + const struct pjmedia_frame *input, + unsigned output_buf_len, + struct pjmedia_frame *output) { pj_int16_t *samples = (pj_int16_t*) input->buf; struct g711_private *priv = codec->codec_data; /* Check output buffer length */ if (output_buf_len < input->size / 2) - return -1; + return PJMEDIA_CODEC_EFRMTOOSHORT; /* Encode */ if (priv->pt == PJMEDIA_RTP_PT_PCMA) { @@ -427,23 +414,25 @@ static pj_status_t g711_encode( pjmedia_codec *codec, const struct pjmedia_fram } } else { - return -1; + return PJMEDIA_EINVALIDPT; } output->type = PJMEDIA_FRAME_TYPE_AUDIO; output->size = input->size / 2; - return 0; + return PJ_SUCCESS; } -static pj_status_t g711_decode( pjmedia_codec *codec, const struct pjmedia_frame *input, - unsigned output_buf_len, struct pjmedia_frame *output) +static pj_status_t g711_decode(pjmedia_codec *codec, + const struct pjmedia_frame *input, + unsigned output_buf_len, + struct pjmedia_frame *output) { struct g711_private *priv = codec->codec_data; /* Check output buffer length */ if (output_buf_len < input->size * 2) - return -1; + return PJMEDIA_CODEC_EPCMTOOSHORT; /* Decode */ if (priv->pt == PJMEDIA_RTP_PT_PCMA) { @@ -464,13 +453,13 @@ static pj_status_t g711_decode( pjmedia_codec *codec, const struct pjmedia_fram } } else { - return -1; + return PJMEDIA_EINVALIDPT; } output->type = PJMEDIA_FRAME_TYPE_AUDIO; output->size = input->size * 2; - return 0; + return PJ_SUCCESS; } diff --git a/pjmedia/src/pjmedia/jbuf.c b/pjmedia/src/pjmedia/jbuf.c index 32f4739b..4392e855 100644 --- a/pjmedia/src/pjmedia/jbuf.c +++ b/pjmedia/src/pjmedia/jbuf.c @@ -322,7 +322,7 @@ PJ_DEF(pj_status_t) pjmedia_jbuf_destroy(pjmedia_jbuf *jb) static void jbuf_calculate_jitter(pjmedia_jbuf *jb) { - enum { STABLE_HISTORY_LIMIT = (500/20) }; + enum { STABLE_HISTORY_LIMIT = (100*2) }; jb->jb_last_jitter = PJ_ABS(jb->jb_level-jb->jb_last_level); jb->jb_last_level = jb->jb_level; @@ -341,7 +341,7 @@ static void jbuf_calculate_jitter(pjmedia_jbuf *jb) jb->jb_stable_hist = 0; jb->jb_max_hist_jitter = 0; - if (jb->jb_op_count >= 100 && + if (jb->jb_op_count >= STABLE_HISTORY_LIMIT*2 && (int)jb_framelist_size(&jb->jb_framelist) > jb->jb_prefetch+2) { jb_framelist_remove_head(&jb->jb_framelist,1); @@ -360,7 +360,7 @@ static void jbuf_calculate_jitter(pjmedia_jbuf *jb) jb->jb_stable_hist = 0; jb->jb_max_hist_jitter = 0; - if (jb->jb_op_count >= 100) { + if (jb->jb_op_count >= STABLE_HISTORY_LIMIT * 2) { if ((int)jb_framelist_size(&jb->jb_framelist) > jb->jb_prefetch+2) { jb_framelist_remove_head(&jb->jb_framelist,1); diff --git a/pjmedia/src/pjmedia/master_port.c b/pjmedia/src/pjmedia/master_port.c index 0e67b846..42edd96e 100644 --- a/pjmedia/src/pjmedia/master_port.c +++ b/pjmedia/src/pjmedia/master_port.c @@ -59,13 +59,13 @@ PJ_DEF(pj_status_t) pjmedia_master_port_create( pj_pool_t *pool, /* Both ports MUST have the equal ptime */ - PJ_ASSERT_RETURN(u_port->info.sample_rate/u_port->info.samples_per_frame== - d_port->info.sample_rate/d_port->info.samples_per_frame, + PJ_ASSERT_RETURN(u_port->info.clock_rate/u_port->info.samples_per_frame== + d_port->info.clock_rate/d_port->info.samples_per_frame, PJMEDIA_ENCSAMPLESPFRAME); /* Get clock_rate and samples_per_frame from one of the port. */ - clock_rate = u_port->info.sample_rate; + clock_rate = u_port->info.clock_rate; samples_per_frame = u_port->info.samples_per_frame; diff --git a/pjmedia/src/pjmedia/null_port.c b/pjmedia/src/pjmedia/null_port.c index c97b606f..1608abc2 100644 --- a/pjmedia/src/pjmedia/null_port.c +++ b/pjmedia/src/pjmedia/null_port.c @@ -51,7 +51,7 @@ PJ_DEF(pj_status_t) pjmedia_null_port_create( pj_pool_t *pool, port->info.name = pj_str("null-port"); port->info.need_info = 0; port->info.pt = 0xFF; - port->info.sample_rate = sampling_rate; + port->info.clock_rate = sampling_rate; port->info.samples_per_frame = samples_per_frame; port->info.channel_count = channel_count; port->info.signature = 0x2411; diff --git a/pjmedia/src/pjmedia/resample_port.c b/pjmedia/src/pjmedia/resample_port.c index d8ec7087..8dad6430 100644 --- a/pjmedia/src/pjmedia/resample_port.c +++ b/pjmedia/src/pjmedia/resample_port.c @@ -75,7 +75,7 @@ PJ_DEF(pj_status_t) pjmedia_resample_port_create( pj_pool_t *pool, rport->base.info.name = pj_str("resample"); rport->base.info.need_info = 0; rport->base.info.pt = 0xFF; - rport->base.info.sample_rate = upstream_rate; + rport->base.info.clock_rate = upstream_rate; rport->base.info.samples_per_frame = upstream_samples_per_frame; rport->base.info.signature = 0; rport->base.info.type = PJMEDIA_TYPE_AUDIO; diff --git a/pjmedia/src/pjmedia/rtcp.c b/pjmedia/src/pjmedia/rtcp.c index 8d548ccf..01369992 100644 --- a/pjmedia/src/pjmedia/rtcp.c +++ b/pjmedia/src/pjmedia/rtcp.c @@ -133,8 +133,12 @@ PJ_DEF(void) pjmedia_rtcp_init(pjmedia_rtcp_session *sess, pjmedia_rtcp_pkt *rtcp_pkt = &sess->rtcp_pkt; pj_time_val now; + /* Reset packet */ pj_memset(rtcp_pkt, 0, sizeof(pjmedia_rtcp_pkt)); + /* Reset statistics */ + pj_memset(&sess->stat, 0, sizeof(pjmedia_rtcp_stat)); + /* Name */ sess->name = name ? name : THIS_FILE, diff --git a/pjmedia/src/pjmedia/session.c b/pjmedia/src/pjmedia/session.c index 2b50485e..fa62136f 100644 --- a/pjmedia/src/pjmedia/session.c +++ b/pjmedia/src/pjmedia/session.c @@ -194,16 +194,37 @@ PJ_DEF(pj_status_t) pjmedia_stream_info_from_sdp( si->fmt.type = si->type; si->fmt.pt = pj_strtoul(&local_m->desc.fmt[0]); pj_strdup(pool, &si->fmt.encoding_name, &rtpmap->enc_name); - si->fmt.sample_rate = rtpmap->clock_rate; + si->fmt.clock_rate = rtpmap->clock_rate; + + /* For audio codecs, rtpmap parameters denotes the number of + * channels. + */ + if (si->type == PJMEDIA_TYPE_AUDIO && rtpmap->param.slen) { + + if (rtpmap->param.slen == 2) { + si->fmt.channel_cnt = rtpmap->param.ptr[1] - '0'; + } else { + pj_str_t cnt; + cnt.ptr = rtpmap->param.ptr + 1; + cnt.slen = rtpmap->param.slen - 1; + si->fmt.channel_cnt = (unsigned) pj_strtoul(&cnt); + } + + } else { + si->fmt.channel_cnt = 1; + } } else { pjmedia_codec_mgr *mgr; + pjmedia_codec_info *p_info; mgr = pjmedia_endpt_get_codec_mgr(endpt); - status = pjmedia_codec_mgr_get_codec_info( mgr, pt, &si->fmt); + status = pjmedia_codec_mgr_get_codec_info( mgr, pt, &p_info); if (status != PJ_SUCCESS) return status; + + pj_memcpy(&si->fmt, p_info, sizeof(pjmedia_codec_info)); } /* For static payload type, pt's are symetric */ @@ -224,7 +245,25 @@ PJ_DEF(pj_status_t) pjmedia_stream_info_from_sdp( si->fmt.type = si->type; si->fmt.pt = pj_strtoul(&local_m->desc.fmt[0]); pj_strdup(pool, &si->fmt.encoding_name, &rtpmap->enc_name); - si->fmt.sample_rate = rtpmap->clock_rate; + si->fmt.clock_rate = rtpmap->clock_rate; + + /* For audio codecs, rtpmap parameters denotes the number of + * channels. + */ + if (si->type == PJMEDIA_TYPE_AUDIO && rtpmap->param.slen) { + + if (rtpmap->param.slen == 2) { + si->fmt.channel_cnt = rtpmap->param.ptr[1] - '0'; + } else { + pj_str_t cnt; + cnt.ptr = rtpmap->param.ptr + 1; + cnt.slen = rtpmap->param.slen - 1; + si->fmt.channel_cnt = (unsigned) pj_strtoul(&cnt); + } + + } else { + si->fmt.channel_cnt = 1; + } /* Determine payload type for outgoing channel, by finding * dynamic payload type in remote SDP that matches the answer. diff --git a/pjmedia/src/pjmedia/sound_port.c b/pjmedia/src/pjmedia/sound_port.c index b4e66845..bfd89bbc 100644 --- a/pjmedia/src/pjmedia/sound_port.c +++ b/pjmedia/src/pjmedia/sound_port.c @@ -344,7 +344,7 @@ PJ_DEF(pj_status_t) pjmedia_snd_port_connect( pjmedia_snd_port *snd_port, * port. */ pinfo = &port->info; - if (pinfo->sample_rate != snd_port->clock_rate) + if (pinfo->clock_rate != snd_port->clock_rate) return PJMEDIA_ENCCLOCKRATE; if (pinfo->samples_per_frame != snd_port->samples_per_frame) diff --git a/pjmedia/src/pjmedia/stream.c b/pjmedia/src/pjmedia/stream.c index fb0bfb5a..a3b79e5f 100644 --- a/pjmedia/src/pjmedia/stream.c +++ b/pjmedia/src/pjmedia/stream.c @@ -158,6 +158,12 @@ static pj_status_t get_frame( pjmedia_port *port, pjmedia_frame *frame) pj_status_t status; struct pjmedia_frame frame_in, frame_out; + /* Return no frame is channel is paused */ + if (channel->paused) { + frame->type = PJMEDIA_FRAME_TYPE_NONE; + return PJ_SUCCESS; + } + /* Lock jitter buffer mutex */ pj_mutex_lock( stream->jb_mutex ); @@ -175,7 +181,6 @@ static pj_status_t get_frame( pjmedia_port *port, pjmedia_frame *frame) return PJ_SUCCESS; } - /* Decode */ frame_in.buf = channel->out_pkt; frame_in.size = stream->frame_size; @@ -321,6 +326,12 @@ static pj_status_t put_frame( pjmedia_port *port, int rtphdrlen; pj_ssize_t sent; + + /* Don't do anything if stream is paused */ + if (channel->paused) + return PJ_SUCCESS; + + /* Number of samples in the frame */ ts_len = frame->size / 2; @@ -757,7 +768,8 @@ static pj_status_t create_channel( pj_pool_t *pool, /* Allocate buffer for decoding to PCM: */ - channel->pcm_buf_size = codec_param->sample_rate * + channel->pcm_buf_size = codec_param->clock_rate * + codec_param->channel_cnt * codec_param->pcm_bits_per_sample / 8 * PJMEDIA_MAX_FRAME_DURATION_MS / 1000; channel->pcm_buf = pj_pool_alloc (pool, channel->pcm_buf_size); @@ -790,6 +802,7 @@ PJ_DEF(pj_status_t) pjmedia_stream_create( pjmedia_endpt *endpt, pjmedia_codec_param codec_param; pj_ioqueue_callback ioqueue_cb; pj_uint16_t rtcp_port; + unsigned jbuf_init, jbuf_max; pj_status_t status; PJ_ASSERT_RETURN(pool && info && p_stream, PJ_EINVAL); @@ -813,8 +826,8 @@ PJ_DEF(pj_status_t) pjmedia_stream_create( pjmedia_endpt *endpt, stream->port.info.need_info = 0; stream->port.info.pt = info->fmt.pt; pj_strdup(pool, &stream->port.info.encoding_name, &info->fmt.encoding_name); - stream->port.info.channel_count = 1; - stream->port.info.sample_rate = info->fmt.sample_rate; + stream->port.info.clock_rate = info->fmt.clock_rate; + stream->port.info.channel_count = info->fmt.channel_cnt; stream->port.user_data = stream; stream->port.put_frame = &put_frame; stream->port.get_frame = &get_frame; @@ -831,7 +844,7 @@ PJ_DEF(pj_status_t) pjmedia_stream_create( pjmedia_endpt *endpt, stream->rem_rtcp_addr = stream->rem_rtp_addr; stream->rem_rtcp_addr.sin_port = pj_htons(rtcp_port); stream->rtcp_interval = (PJMEDIA_RTCP_INTERVAL + (pj_rand() % 8000)) * - info->fmt.sample_rate / 1000; + info->fmt.clock_rate / 1000; stream->tx_event_pt = info->tx_event_pt ? info->tx_event_pt : -1; stream->rx_event_pt = info->rx_event_pt ? info->rx_event_pt : -1; @@ -855,13 +868,15 @@ PJ_DEF(pj_status_t) pjmedia_stream_create( pjmedia_endpt *endpt, /* Get default codec param: */ - status = stream->codec->op->default_attr(stream->codec, &codec_param); + //status = stream->codec->op->default_attr(stream->codec, &codec_param); + status = pjmedia_codec_mgr_get_default_param( stream->codec_mgr, + &info->fmt, &codec_param); if (status != PJ_SUCCESS) goto err_cleanup; /* Set additional info. */ stream->port.info.bits_per_sample = 16; - stream->port.info.samples_per_frame = info->fmt.sample_rate*codec_param.ptime/1000; + stream->port.info.samples_per_frame = info->fmt.clock_rate*codec_param.ptime/1000; stream->port.info.bytes_per_frame = codec_param.avg_bps/8 * codec_param.ptime/1000; @@ -880,15 +895,19 @@ PJ_DEF(pj_status_t) pjmedia_stream_create( pjmedia_endpt *endpt, /* Init RTCP session: */ pjmedia_rtcp_init(&stream->rtcp, stream->port.info.name.ptr, - info->fmt.sample_rate, + info->fmt.clock_rate, stream->port.info.samples_per_frame, info->ssrc); /* Create jitter buffer: */ - + jbuf_init = 100 / (stream->port.info.samples_per_frame * 1000 / + info->fmt.clock_rate); + jbuf_max = 600 / (stream->port.info.samples_per_frame * 1000 / + info->fmt.clock_rate); status = pjmedia_jbuf_create(pool, &stream->port.info.name, - stream->frame_size, 15, 100, + stream->frame_size, + jbuf_init, jbuf_max, &stream->jb); if (status != PJ_SUCCESS) goto err_cleanup; diff --git a/pjmedia/src/pjmedia/file_player.c b/pjmedia/src/pjmedia/wav_player.c index ca5a3e1e..bcdda8bd 100644 --- a/pjmedia/src/pjmedia/file_player.c +++ b/pjmedia/src/pjmedia/wav_player.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <pjmedia/file_port.h> +#include <pjmedia/wav_port.h> #include <pjmedia/errno.h> #include <pjmedia/wave.h> #include <pj/assert.h> @@ -27,7 +27,7 @@ #include <pj/string.h> -#define THIS_FILE "file_port.c" +#define THIS_FILE "wav_player.c" #define SIGNATURE ('F'<<24|'P'<<16|'L'<<8|'Y') @@ -96,7 +96,7 @@ static struct file_port *create_file_port(pj_pool_t *pool) /* Put in default values. * These will be overriden once the file is read. */ - port->base.info.sample_rate = 8000; + port->base.info.clock_rate = 8000; port->base.info.bits_per_sample = 16; port->base.info.samples_per_frame = 160; port->base.info.bytes_per_frame = 320; @@ -153,8 +153,9 @@ static pj_status_t fill_buffer(struct file_port *fport) /* * Create WAVE player port. */ -PJ_DEF(pj_status_t) pjmedia_file_player_port_create( pj_pool_t *pool, +PJ_DEF(pj_status_t) pjmedia_wav_player_port_create( pj_pool_t *pool, const char *filename, + unsigned ptime, unsigned flags, pj_ssize_t buff_size, void *user_data, @@ -176,6 +177,10 @@ PJ_DEF(pj_status_t) pjmedia_file_player_port_create( pj_pool_t *pool, return PJ_ENOTFOUND; } + /* Normalize ptime */ + if (ptime == 0) + ptime = 20; + /* Create fport instance. */ fport = create_file_port(pool); if (!fport) { @@ -258,11 +263,11 @@ PJ_DEF(pj_status_t) pjmedia_file_player_port_create( pj_pool_t *pool, /* Update port info. */ fport->base.info.channel_count = wave_hdr.fmt_hdr.nchan; - fport->base.info.sample_rate = wave_hdr.fmt_hdr.sample_rate; + fport->base.info.clock_rate = wave_hdr.fmt_hdr.sample_rate; fport->base.info.bits_per_sample = wave_hdr.fmt_hdr.bits_per_sample; - fport->base.info.samples_per_frame = fport->base.info.sample_rate * + fport->base.info.samples_per_frame = fport->base.info.clock_rate * wave_hdr.fmt_hdr.nchan * - 20 / 1000; + ptime / 1000; fport->base.info.bytes_per_frame = fport->base.info.samples_per_frame * fport->base.info.bits_per_sample / 8; @@ -304,7 +309,7 @@ PJ_DEF(pj_status_t) pjmedia_file_player_port_create( pj_pool_t *pool, "filesize=%luKB", (int)fport->base.info.name.slen, fport->base.info.name.ptr, - fport->base.info.sample_rate, + fport->base.info.clock_rate, fport->base.info.channel_count, fport->bufsize / 1000, (unsigned long)(fport->fsize / 1000))); diff --git a/pjmedia/src/pjmedia/file_writer.c b/pjmedia/src/pjmedia/wav_writer.c index 8471ba48..24816b27 100644 --- a/pjmedia/src/pjmedia/file_writer.c +++ b/pjmedia/src/pjmedia/wav_writer.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <pjmedia/file_port.h> +#include <pjmedia/wav_port.h> #include <pjmedia/errno.h> #include <pjmedia/wave.h> #include <pj/assert.h> @@ -27,7 +27,7 @@ #include <pj/string.h> -#define THIS_FILE "file_writer.c" +#define THIS_FILE "wav_writer.c" #define SIGNATURE ('F'<<24|'W'<<16|'R'<<8|'T') #define BYTES_PER_SAMPLE 2 @@ -52,7 +52,7 @@ static pj_status_t file_on_destroy(pjmedia_port *this_port); /* * Create file writer port. */ -PJ_DEF(pj_status_t) pjmedia_file_writer_port_create( pj_pool_t *pool, +PJ_DEF(pj_status_t) pjmedia_wav_writer_port_create( pj_pool_t *pool, const char *filename, unsigned sampling_rate, unsigned channel_count, @@ -93,7 +93,7 @@ PJ_DEF(pj_status_t) pjmedia_file_writer_port_create( pj_pool_t *pool, pj_strdup2(pool, &fport->base.info.name, filename); fport->base.info.need_info = 0; fport->base.info.pt = 0xFF; - fport->base.info.sample_rate = sampling_rate; + fport->base.info.clock_rate = sampling_rate; fport->base.info.samples_per_frame = samples_per_frame; fport->base.info.signature = SIGNATURE; fport->base.info.type = PJMEDIA_TYPE_AUDIO; @@ -169,7 +169,7 @@ PJ_DEF(pj_status_t) pjmedia_file_writer_port_create( pj_pool_t *pool, "File writer '%.*s' created: samp.rate=%d, bufsize=%uKB", (int)fport->base.info.name.slen, fport->base.info.name.ptr, - fport->base.info.sample_rate, + fport->base.info.clock_rate, fport->bufsize / 1000)); |