diff options
| -rw-r--r-- | doc/rtp-packetization.txt | 12 | ||||
| -rw-r--r-- | main/frame.c | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/doc/rtp-packetization.txt b/doc/rtp-packetization.txt index b38acf8e4..647375a98 100644 --- a/doc/rtp-packetization.txt +++ b/doc/rtp-packetization.txt @@ -48,17 +48,17 @@ maximums, and should not exceed the RTP MTU. Name Min Max Default Increment g723 30 300 30 30 -gsm 20 60 20 20 -ulaw 10 30 20 10 -alaw 10 30 20 10 -g726 10 50 20 10 -ADPCM 10 30 20 10 +gsm 20 300 20 20 +ulaw 10 150 20 10 +alaw 10 150 20 10 +g726 10 300 20 10 +ADPCM 10 300 20 10 SLIN 10 70 20 10 lpc10 20 20 20 20 g729 10 230 20 10 speex 10 60 20 10 ilbc 30 30 30 30 -g726_aal2 10 50 20 10 +g726_aal2 10 300 20 10 Invalid framing options are handled based on the following rules: 1. If the specified framing is less than the codec's minimum, then diff --git a/main/frame.c b/main/frame.c index d1d872751..c5ddad8d1 100644 --- a/main/frame.c +++ b/main/frame.c @@ -103,17 +103,17 @@ struct ast_smoother { /*! \brief Definition of supported media formats (codecs) */ static struct ast_format_list AST_FORMAT_LIST[] = { /*!< Bit number: comment - Bit numbers are hard coded in show_codec() */ { 1, AST_FORMAT_G723_1 , "g723" , "G.723.1", 24, 30, 300, 30, 30 }, /*!< 1 */ - { 1, AST_FORMAT_GSM, "gsm" , "GSM", 33, 20, 60, 20, 20 }, /*!< 2: codec_gsm.c */ - { 1, AST_FORMAT_ULAW, "ulaw", "G.711 u-law", 80, 10, 30, 10, 20 }, /*!< 3: codec_ulaw.c */ - { 1, AST_FORMAT_ALAW, "alaw", "G.711 A-law", 80, 10, 30, 10, 20 }, /*!< 4: codec_alaw.c */ - { 1, AST_FORMAT_G726, "g726", "G.726 RFC3551", 40, 10, 50, 10, 20 },/*!< 5: codec_g726.c */ - { 1, AST_FORMAT_ADPCM, "adpcm" , "ADPCM", 40, 10, 30, 10, 20 }, /*!< 6: codec_adpcm.c */ + { 1, AST_FORMAT_GSM, "gsm" , "GSM", 33, 20, 300, 20, 20 }, /*!< 2: codec_gsm.c */ + { 1, AST_FORMAT_ULAW, "ulaw", "G.711 u-law", 80, 10, 150, 10, 20 }, /*!< 3: codec_ulaw.c */ + { 1, AST_FORMAT_ALAW, "alaw", "G.711 A-law", 80, 10, 150, 10, 20 }, /*!< 4: codec_alaw.c */ + { 1, AST_FORMAT_G726, "g726", "G.726 RFC3551", 40, 10, 300, 10, 20 },/*!< 5: codec_g726.c */ + { 1, AST_FORMAT_ADPCM, "adpcm" , "ADPCM", 40, 10, 300, 10, 20 }, /*!< 6: codec_adpcm.c */ { 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, 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, 50, 10, 20 }, /*!< 12: codec_g726.c */ + { 1, AST_FORMAT_G726_AAL2, "g726aal2", "G.726 AAL2", 40, 10, 300, 10, 20 }, /*!< 12: codec_g726.c */ { 0, 0, "nothing", "undefined" }, { 0, 0, "nothing", "undefined" }, { 0, 0, "nothing", "undefined" }, |