diff options
| author | Benny Prijono <bennylp@teluu.com> | 2008-06-14 16:52:04 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2008-06-14 16:52:04 +0000 |
| commit | e90196a46553e346d1dafeab1b1239b6f40ccd70 (patch) | |
| tree | 3b33c83286b54c44aa759f3829229987bf464c77 /pjmedia/src/pjmedia-codec | |
| parent | 5a7fe8a7f6e92869075baea0384059cc46816cde (diff) | |
Implement ticket #546 and revisit ticket #439:
- ticket #546 implements RTCP SDES and CNAME
- re-enable periodic RTP TX which was disabled by #439
- fixed bug in RTCP TX interval
- changed PJMEDIA_CODEC_MAX_SILENCE_PERIOD value from ts to msec
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2020 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/src/pjmedia-codec')
| -rw-r--r-- | pjmedia/src/pjmedia-codec/g722.c | 2 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia-codec/gsm.c | 2 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia-codec/ilbc.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pjmedia/src/pjmedia-codec/g722.c b/pjmedia/src/pjmedia-codec/g722.c index cc1afa1f..38eceaca 100644 --- a/pjmedia/src/pjmedia-codec/g722.c +++ b/pjmedia/src/pjmedia-codec/g722.c @@ -552,7 +552,7 @@ static pj_status_t g722_codec_encode(pjmedia_codec *codec, NULL); if (is_silence && PJMEDIA_CODEC_MAX_SILENCE_PERIOD != -1 && - silence_duration < PJMEDIA_CODEC_MAX_SILENCE_PERIOD) + silence_duration < PJMEDIA_CODEC_MAX_SILENCE_PERIOD*16000/1000) { output->type = PJMEDIA_FRAME_TYPE_NONE; output->buf = NULL; diff --git a/pjmedia/src/pjmedia-codec/gsm.c b/pjmedia/src/pjmedia-codec/gsm.c index 7bb4d729..b4c98db8 100644 --- a/pjmedia/src/pjmedia-codec/gsm.c +++ b/pjmedia/src/pjmedia-codec/gsm.c @@ -542,7 +542,7 @@ static pj_status_t gsm_codec_encode( pjmedia_codec *codec, NULL); if (is_silence && PJMEDIA_CODEC_MAX_SILENCE_PERIOD != -1 && - silence_duration < PJMEDIA_CODEC_MAX_SILENCE_PERIOD) + silence_duration < PJMEDIA_CODEC_MAX_SILENCE_PERIOD*8000/1000) { output->type = PJMEDIA_FRAME_TYPE_NONE; output->buf = NULL; diff --git a/pjmedia/src/pjmedia-codec/ilbc.c b/pjmedia/src/pjmedia-codec/ilbc.c index e14647ec..92b78310 100644 --- a/pjmedia/src/pjmedia-codec/ilbc.c +++ b/pjmedia/src/pjmedia-codec/ilbc.c @@ -539,7 +539,7 @@ static pj_status_t ilbc_codec_encode(pjmedia_codec *codec, NULL); if (is_silence && PJMEDIA_CODEC_MAX_SILENCE_PERIOD != -1 && - silence_period < PJMEDIA_CODEC_MAX_SILENCE_PERIOD) + silence_period < PJMEDIA_CODEC_MAX_SILENCE_PERIOD*8000/1000) { output->type = PJMEDIA_FRAME_TYPE_NONE; output->buf = NULL; |