diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-20 17:52:57 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-20 17:52:57 +0000 |
| commit | 210df127ccadd53094a8c584bd51abd685705979 (patch) | |
| tree | c4dce5eb2e58d25b2178cee3843f70deae79251e /main | |
| parent | 5816dc54726bd3d281bbce720e6184e66aaf9a8f (diff) | |
Put the speex packetization values back in but disable it when setting up the smoother.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@70360 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/frame.c | 2 | ||||
| -rw-r--r-- | main/rtp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/main/frame.c b/main/frame.c index 8472419e4..0cd0b03fb 100644 --- a/main/frame.c +++ b/main/frame.c @@ -113,7 +113,7 @@ static struct ast_format_list AST_FORMAT_LIST[] = { /*!< Bit number: comment { 1, AST_FORMAT_SLINEAR, "slin", "16 bit Signed Linear PCM", 160, 10, 70, 10, 20, AST_SMOOTHER_FLAG_BE }, /*!< 7 */ { 1, AST_FORMAT_LPC10, "lpc10", "LPC10", 7, 20, 20, 20, 20 }, /*!< 8: codec_lpc10.c */ { 1, AST_FORMAT_G729A, "g729", "G.729A", 10, 10, 230, 10, 20, AST_SMOOTHER_FLAG_G729 }, /*!< 9: Binary commercial distribution */ - { 1, AST_FORMAT_SPEEX, "speex", "SpeeX"}, /*!< 10: codec_speex.c */ + { 1, AST_FORMAT_SPEEX, "speex", "SpeeX", 10, 10, 60, 10, 20 }, /*!< 10: codec_speex.c */ { 1, AST_FORMAT_ILBC, "ilbc", "iLBC", 50, 30, 30, 30, 30 }, /*!< 11: codec_ilbc.c */ /* inc=30ms - workaround */ { 1, AST_FORMAT_G726_AAL2, "g726aal2", "G.726 AAL2", 40, 10, 300, 10, 20 }, /*!< 12: codec_g726.c */ { 1, AST_FORMAT_G722, "g722", "G722"}, /*!< 13 */ diff --git a/main/rtp.c b/main/rtp.c index 41e231707..04b5c0d0c 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -2728,7 +2728,7 @@ int ast_rtp_write(struct ast_rtp *rtp, struct ast_frame *_f) rtp->smoother = NULL; } - if (!rtp->smoother) { + if (!rtp->smoother && subclass != AST_FORMAT_SPEEX) { struct ast_format_list fmt = ast_codec_pref_getsize(&rtp->pref, subclass); if (fmt.inc_ms) { /* if codec parameters is set / avoid division by zero */ if (!(rtp->smoother = ast_smoother_new((fmt.cur_ms * fmt.fr_len) / fmt.inc_ms))) { |