summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Jordan <mjordan@digium.com>2014-07-15 23:29:29 +0000
committerMatthew Jordan <mjordan@digium.com>2014-07-15 23:29:29 +0000
commitfee789dddbe0fe5791d42773e2293b693624e961 (patch)
tree741f16a00e91bfb0725bb2637006c4f599f7b04b
parent96cbaa187a36a767872997a664040278d61007c8 (diff)
codec_adpcm: Change description of codec "ADPCM" to "Dialogic ADPCM"
Technically, ADPCM is a method that can be applied to several codecs. Asterisk's ADPCM codec is the Dialogic ADPCM or VOX codec. See http://en.wikipedia.org/wiki/Dialogic_ADPCM for more information about said codec. Review: https://reviewboard.asterisk.org/r/3744 patches: rb3744.patch uploaded by dennis.guse (License 6513) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@418738 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--codecs/codec_adpcm.c2
-rw-r--r--main/format.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/codecs/codec_adpcm.c b/codecs/codec_adpcm.c
index 96e19f0d3..c48eb1ab2 100644
--- a/codecs/codec_adpcm.c
+++ b/codecs/codec_adpcm.c
@@ -154,7 +154,7 @@ static inline short decode(int encoded, struct adpcm_state *state)
/*
* Adpcm
* Takes a signed linear signal and encodes it as ADPCM
- * For more information see http://support.dialogic.com/appnotes/adpcm.pdf
+ * For more information see http://en.wikipedia.org/wiki/Dialogic_ADPCM
*
* Results:
* Foo.
diff --git a/main/format.c b/main/format.c
index d24e1c386..c4ad45b7f 100644
--- a/main/format.c
+++ b/main/format.c
@@ -1045,7 +1045,7 @@ static int format_list_init(void)
format_list_add_static(ast_format_set(&tmpfmt, AST_FORMAT_ULAW, 0), "ulaw", 8000, "G.711 u-law", 80, 10, 150, 10, 20, 0, 0); /*!< codec_ulaw.c */
format_list_add_static(ast_format_set(&tmpfmt, AST_FORMAT_ALAW, 0), "alaw", 8000, "G.711 A-law", 80, 10, 150, 10, 20, 0, 0); /*!< codec_alaw.c */
format_list_add_static(ast_format_set(&tmpfmt, AST_FORMAT_G726, 0), "g726", 8000, "G.726 RFC3551", 40, 10, 300, 10, 20, 0, 0); /*!< codec_g726.c */
- format_list_add_static(ast_format_set(&tmpfmt, AST_FORMAT_ADPCM, 0), "adpcm" , 8000, "ADPCM", 40, 10, 300, 10, 20, 0, 0); /*!< codec_adpcm.c */
+ format_list_add_static(ast_format_set(&tmpfmt, AST_FORMAT_ADPCM, 0), "adpcm" , 8000, "Dialogic ADPCM", 40, 10, 300, 10, 20, 0, 0); /*!< codec_adpcm.c */
format_list_add_static(ast_format_set(&tmpfmt, AST_FORMAT_SLINEAR, 0), "slin", 8000, "16 bit Signed Linear PCM", 160, 10, 70, 10, 20, AST_SMOOTHER_FLAG_BE, 0); /*!< Signed linear */
format_list_add_static(ast_format_set(&tmpfmt, AST_FORMAT_LPC10, 0), "lpc10", 8000, "LPC10", 7, 20, 20, 20, 20, 0, 0); /*!< codec_lpc10.c */
format_list_add_static(ast_format_set(&tmpfmt, AST_FORMAT_G729A, 0), "g729", 8000, "G.729A", 10, 10, 230, 10, 20, AST_SMOOTHER_FLAG_G729, 0); /*!< Binary commercial distribution */