diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2009-03-23 13:22:45 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2009-03-23 13:22:45 +0000 |
| commit | 3a21b42fc86a8281c6c9b8f4a47618d9f6a54abf (patch) | |
| tree | e5ddbbb5e0d4d9a37264d7cf4046d53c37ef08ce | |
| parent | 8d783944c28151c370d11fa15e001f2f4e8a3b6c (diff) | |
Ticket #721: back-porting ticket #720
git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/1.0@2543 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjmedia/src/pjmedia-codec/ipp_codecs.c | 4 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia-codec/l16.c | 2 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia/stream.c | 8 |
3 files changed, 3 insertions, 11 deletions
diff --git a/pjmedia/src/pjmedia-codec/ipp_codecs.c b/pjmedia/src/pjmedia-codec/ipp_codecs.c index cc1be0b7..bbc58b73 100644 --- a/pjmedia/src/pjmedia-codec/ipp_codecs.c +++ b/pjmedia/src/pjmedia-codec/ipp_codecs.c @@ -1047,12 +1047,12 @@ static pj_status_t ipp_codec_open( pjmedia_codec *codec, if (s->enc_mode < 0) goto on_error; - s->enc_setting.amr_nb = ippc->pt == PJMEDIA_RTP_PT_AMR; + s->enc_setting.amr_nb = (pj_uint8_t)(ippc->pt == PJMEDIA_RTP_PT_AMR); s->enc_setting.octet_aligned = octet_align; s->enc_setting.reorder = PJ_TRUE; s->enc_setting.cmr = 15; - s->dec_setting.amr_nb = ippc->pt == PJMEDIA_RTP_PT_AMR; + s->dec_setting.amr_nb = (pj_uint8_t)(ippc->pt == PJMEDIA_RTP_PT_AMR); s->dec_setting.octet_aligned = octet_align; s->dec_setting.reorder = PJ_TRUE; } diff --git a/pjmedia/src/pjmedia-codec/l16.c b/pjmedia/src/pjmedia-codec/l16.c index 18baf672..ca0c70f8 100644 --- a/pjmedia/src/pjmedia-codec/l16.c +++ b/pjmedia/src/pjmedia-codec/l16.c @@ -421,7 +421,7 @@ static pj_status_t l16_enum_codecs( pjmedia_codec_factory *factory, if (count < *max_count) { /* 48KHz stereo */ codecs[count].type = PJMEDIA_TYPE_AUDIO; - codecs[count].pt = PJMEDIA_RTP_PT_L16_48KHZ_MONO; + codecs[count].pt = PJMEDIA_RTP_PT_L16_48KHZ_STEREO; codecs[count].encoding_name = STR_L16; codecs[count].clock_rate = 48000; codecs[count].channel_cnt = 2; diff --git a/pjmedia/src/pjmedia/stream.c b/pjmedia/src/pjmedia/stream.c index 5177d3b2..51d5edb5 100644 --- a/pjmedia/src/pjmedia/stream.c +++ b/pjmedia/src/pjmedia/stream.c @@ -52,8 +52,6 @@ struct pjmedia_channel pjmedia_dir dir; /**< Channel direction. */ unsigned pt; /**< Payload type. */ pj_bool_t paused; /**< Paused?. */ - unsigned in_pkt_size; /**< Size of input buffer. */ - void *in_pkt; /**< Input buffer. */ unsigned out_pkt_size; /**< Size of output buffer. */ void *out_pkt; /**< Output buffer. */ pjmedia_rtp_session rtp; /**< RTP session. */ @@ -1394,12 +1392,6 @@ static pj_status_t create_channel( pj_pool_t *pool, channel->paused = 1; channel->pt = pt; - /* Allocate buffer for incoming packet. */ - - channel->in_pkt_size = PJMEDIA_MAX_MTU; - channel->in_pkt = pj_pool_alloc( pool, channel->in_pkt_size ); - PJ_ASSERT_RETURN(channel->in_pkt != NULL, PJ_ENOMEM); - /* Allocate buffer for outgoing packet. */ |