<p>Joshua Colp <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/15206">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, approved; Approved for Submit
Kevin Harwell: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">codecs: Remove test-law.<br><br>This was dead code, test code introduced with Asterisk 13. This was<br>found while analyzing ASTERISK_28416 and ASTERISK_29185. This change<br>partly fixes, not closes those two issues.<br><br>Change-Id: I42d0daa37f6f334c7d86672f06f085858a3f3940<br>---<br>M channels/iax2/codec_pref.c<br>M channels/iax2/format_compatibility.c<br>M codecs/codec_ulaw.c<br>M include/asterisk/format_cache.h<br>M include/asterisk/format_compatibility.h<br>M main/codec_builtin.c<br>M main/format_cache.c<br>M main/format_compatibility.c<br>8 files changed, 2 insertions(+), 80 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/channels/iax2/codec_pref.c b/channels/iax2/codec_pref.c</span><br><span>index 7811ca8..684f921 100644</span><br><span>--- a/channels/iax2/codec_pref.c</span><br><span>+++ b/channels/iax2/codec_pref.c</span><br><span>@@ -348,7 +348,7 @@</span><br><span> AST_FORMAT_T140,</span><br><span> AST_FORMAT_SIREN7,</span><br><span> AST_FORMAT_SIREN14,</span><br><span style="color: hsl(0, 100%, 40%);">- AST_FORMAT_TESTLAW,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0, /* reserved; was AST_FORMAT_TESTLAW */</span><br><span> AST_FORMAT_G719,</span><br><span> 0, /* Place holder */</span><br><span> 0, /* Place holder */</span><br><span>diff --git a/channels/iax2/format_compatibility.c b/channels/iax2/format_compatibility.c</span><br><span>index 1543792..2325dd8 100644</span><br><span>--- a/channels/iax2/format_compatibility.c</span><br><span>+++ b/channels/iax2/format_compatibility.c</span><br><span>@@ -91,7 +91,6 @@</span><br><span> AST_FORMAT_G719,</span><br><span> AST_FORMAT_SIREN14,</span><br><span> AST_FORMAT_SIREN7,</span><br><span style="color: hsl(0, 100%, 40%);">- AST_FORMAT_TESTLAW,</span><br><span> /*! G.722 is better then all below, but not as common as the above... so give ulaw and alaw priority */</span><br><span> AST_FORMAT_G722,</span><br><span> /*! Okay, well, signed linear is easy to translate into other stuff */</span><br><span>diff --git a/codecs/codec_ulaw.c b/codecs/codec_ulaw.c</span><br><span>index 609d06d..00a0916 100644</span><br><span>--- a/codecs/codec_ulaw.c</span><br><span>+++ b/codecs/codec_ulaw.c</span><br><span>@@ -97,25 +97,6 @@</span><br><span> .buf_size = BUFFER_SAMPLES * 2,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct ast_translator testlawtolin = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "testlawtolin",</span><br><span style="color: hsl(0, 100%, 40%);">- .src_codec = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "testlaw",</span><br><span style="color: hsl(0, 100%, 40%);">- .type = AST_MEDIA_TYPE_AUDIO,</span><br><span style="color: hsl(0, 100%, 40%);">- .sample_rate = 8000,</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- .dst_codec = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "slin",</span><br><span style="color: hsl(0, 100%, 40%);">- .type = AST_MEDIA_TYPE_AUDIO,</span><br><span style="color: hsl(0, 100%, 40%);">- .sample_rate = 8000,</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- .format = "slin",</span><br><span style="color: hsl(0, 100%, 40%);">- .framein = ulawtolin_framein,</span><br><span style="color: hsl(0, 100%, 40%);">- .sample = ulaw_sample,</span><br><span style="color: hsl(0, 100%, 40%);">- .buffer_samples = BUFFER_SAMPLES,</span><br><span style="color: hsl(0, 100%, 40%);">- .buf_size = BUFFER_SAMPLES * 2,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /*!</span><br><span> * \brief The complete translator for LinToulaw.</span><br><span> */</span><br><span>@@ -139,33 +120,12 @@</span><br><span> .buffer_samples = BUFFER_SAMPLES,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct ast_translator lintotestlaw = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "lintotestlaw",</span><br><span style="color: hsl(0, 100%, 40%);">- .src_codec = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "slin",</span><br><span style="color: hsl(0, 100%, 40%);">- .type = AST_MEDIA_TYPE_AUDIO,</span><br><span style="color: hsl(0, 100%, 40%);">- .sample_rate = 8000,</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- .dst_codec = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "testlaw",</span><br><span style="color: hsl(0, 100%, 40%);">- .type = AST_MEDIA_TYPE_AUDIO,</span><br><span style="color: hsl(0, 100%, 40%);">- .sample_rate = 8000,</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- .format = "testlaw",</span><br><span style="color: hsl(0, 100%, 40%);">- .framein = lintoulaw_framein,</span><br><span style="color: hsl(0, 100%, 40%);">- .sample = slin8_sample,</span><br><span style="color: hsl(0, 100%, 40%);">- .buf_size = BUFFER_SAMPLES,</span><br><span style="color: hsl(0, 100%, 40%);">- .buffer_samples = BUFFER_SAMPLES,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static int unload_module(void)</span><br><span> {</span><br><span> int res;</span><br><span> </span><br><span> res = ast_unregister_translator(&lintoulaw);</span><br><span> res |= ast_unregister_translator(&ulawtolin);</span><br><span style="color: hsl(0, 100%, 40%);">- res |= ast_unregister_translator(&testlawtolin);</span><br><span style="color: hsl(0, 100%, 40%);">- res |= ast_unregister_translator(&lintotestlaw);</span><br><span> </span><br><span> return res;</span><br><span> }</span><br><span>@@ -176,8 +136,6 @@</span><br><span> </span><br><span> res = ast_register_translator(&ulawtolin);</span><br><span> res |= ast_register_translator(&lintoulaw);</span><br><span style="color: hsl(0, 100%, 40%);">- res |= ast_register_translator(&lintotestlaw);</span><br><span style="color: hsl(0, 100%, 40%);">- res |= ast_register_translator(&testlawtolin);</span><br><span> </span><br><span> if (res) {</span><br><span> unload_module();</span><br><span>diff --git a/include/asterisk/format_cache.h b/include/asterisk/format_cache.h</span><br><span>index 7dc0276..33033da 100644</span><br><span>--- a/include/asterisk/format_cache.h</span><br><span>+++ b/include/asterisk/format_cache.h</span><br><span>@@ -84,11 +84,6 @@</span><br><span> extern struct ast_format *ast_format_alaw;</span><br><span> </span><br><span> /*!</span><br><span style="color: hsl(0, 100%, 40%);">- * \brief Built-in cached testlaw format.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-extern struct ast_format *ast_format_testlaw;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/*!</span><br><span> * \brief Built-in cached gsm format.</span><br><span> */</span><br><span> extern struct ast_format *ast_format_gsm;</span><br><span>diff --git a/include/asterisk/format_compatibility.h b/include/asterisk/format_compatibility.h</span><br><span>index 0420ec6..e6a99b3 100644</span><br><span>--- a/include/asterisk/format_compatibility.h</span><br><span>+++ b/include/asterisk/format_compatibility.h</span><br><span>@@ -72,7 +72,7 @@</span><br><span> /*! Opus audio (8kHz, 16kHz, 24kHz, 48Khz) */</span><br><span> #define AST_FORMAT_OPUS (1ULL << 34)</span><br><span> /*! Raw testing-law data (G.711) */</span><br><span style="color: hsl(0, 100%, 40%);">-#define AST_FORMAT_TESTLAW (1ULL << 47)</span><br><span style="color: hsl(120, 100%, 40%);">+/* #define AST_FORMAT_TESTLAW (1ULL << 47) */</span><br><span> /*! H.261 Video */</span><br><span> #define AST_FORMAT_H261 (1ULL << 18)</span><br><span> /*! H.263 Video */</span><br><span>diff --git a/main/codec_builtin.c b/main/codec_builtin.c</span><br><span>index ce65754..c1ae685 100644</span><br><span>--- a/main/codec_builtin.c</span><br><span>+++ b/main/codec_builtin.c</span><br><span>@@ -702,20 +702,6 @@</span><br><span> .get_length = siren14_length,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct ast_codec testlaw = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "testlaw",</span><br><span style="color: hsl(0, 100%, 40%);">- .description = "G.711 test-law",</span><br><span style="color: hsl(0, 100%, 40%);">- .type = AST_MEDIA_TYPE_AUDIO,</span><br><span style="color: hsl(0, 100%, 40%);">- .sample_rate = 8000,</span><br><span style="color: hsl(0, 100%, 40%);">- .minimum_ms = 10,</span><br><span style="color: hsl(0, 100%, 40%);">- .maximum_ms = 150,</span><br><span style="color: hsl(0, 100%, 40%);">- .default_ms = 20,</span><br><span style="color: hsl(0, 100%, 40%);">- .minimum_bytes = 80,</span><br><span style="color: hsl(0, 100%, 40%);">- .samples_count = ulaw_samples,</span><br><span style="color: hsl(0, 100%, 40%);">- .get_length = ulaw_length,</span><br><span style="color: hsl(0, 100%, 40%);">- .smooth = 1,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static int g719_samples(struct ast_frame *frame)</span><br><span> {</span><br><span> return (int) frame->datalen * ((float) 48000 / 8000);</span><br><span>@@ -969,7 +955,6 @@</span><br><span> res |= CODEC_REGISTER_AND_CACHE(g722);</span><br><span> res |= CODEC_REGISTER_AND_CACHE(siren7);</span><br><span> res |= CODEC_REGISTER_AND_CACHE(siren14);</span><br><span style="color: hsl(0, 100%, 40%);">- res |= CODEC_REGISTER_AND_CACHE(testlaw);</span><br><span> res |= CODEC_REGISTER_AND_CACHE(g719);</span><br><span> res |= CODEC_REGISTER_AND_CACHE(opus);</span><br><span> res |= CODEC_REGISTER_AND_CACHE(jpeg);</span><br><span>diff --git a/main/format_cache.c b/main/format_cache.c</span><br><span>index 3ce8ee0..f1a7fda 100644</span><br><span>--- a/main/format_cache.c</span><br><span>+++ b/main/format_cache.c</span><br><span>@@ -91,11 +91,6 @@</span><br><span> struct ast_format *ast_format_alaw;</span><br><span> </span><br><span> /*!</span><br><span style="color: hsl(0, 100%, 40%);">- * \brief Built-in cached testlaw format.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-struct ast_format *ast_format_testlaw;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/*!</span><br><span> * \brief Built-in cached gsm format.</span><br><span> */</span><br><span> struct ast_format *ast_format_gsm;</span><br><span>@@ -343,7 +338,6 @@</span><br><span> ao2_replace(ast_format_g722, NULL);</span><br><span> ao2_replace(ast_format_siren7, NULL);</span><br><span> ao2_replace(ast_format_siren14, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- ao2_replace(ast_format_testlaw, NULL);</span><br><span> ao2_replace(ast_format_g719, NULL);</span><br><span> ao2_replace(ast_format_opus, NULL);</span><br><span> ao2_replace(ast_format_codec2, NULL);</span><br><span>@@ -434,8 +428,6 @@</span><br><span> ao2_replace(ast_format_siren7, format);</span><br><span> } else if (!strcmp(name, "siren14")) {</span><br><span> ao2_replace(ast_format_siren14, format);</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (!strcmp(name, "testlaw")) {</span><br><span style="color: hsl(0, 100%, 40%);">- ao2_replace(ast_format_testlaw, format);</span><br><span> } else if (!strcmp(name, "g719")) {</span><br><span> ao2_replace(ast_format_g719, format);</span><br><span> } else if (!strcmp(name, "opus")) {</span><br><span>diff --git a/main/format_compatibility.c b/main/format_compatibility.c</span><br><span>index 706e1b2..7f2faa7 100644</span><br><span>--- a/main/format_compatibility.c</span><br><span>+++ b/main/format_compatibility.c</span><br><span>@@ -76,8 +76,6 @@</span><br><span> return AST_FORMAT_SPEEX16;</span><br><span> } else if (ast_format_cmp(format, ast_format_opus) == AST_FORMAT_CMP_EQUAL) {</span><br><span> return AST_FORMAT_OPUS;</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (ast_format_cmp(format, ast_format_testlaw) == AST_FORMAT_CMP_EQUAL) {</span><br><span style="color: hsl(0, 100%, 40%);">- return AST_FORMAT_TESTLAW;</span><br><span> } else if (ast_format_cmp(format, ast_format_h261) == AST_FORMAT_CMP_EQUAL) {</span><br><span> return AST_FORMAT_H261;</span><br><span> } else if (ast_format_cmp(format, ast_format_h263) == AST_FORMAT_CMP_EQUAL) {</span><br><span>@@ -143,8 +141,6 @@</span><br><span> return AST_FORMAT_SPEEX16;</span><br><span> } else if (codec->id == ast_format_get_codec_id(ast_format_opus)) {</span><br><span> return AST_FORMAT_OPUS;</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (codec->id == ast_format_get_codec_id(ast_format_testlaw)) {</span><br><span style="color: hsl(0, 100%, 40%);">- return AST_FORMAT_TESTLAW;</span><br><span> } else if (codec->id == ast_format_get_codec_id(ast_format_h261)) {</span><br><span> return AST_FORMAT_H261;</span><br><span> } else if (codec->id == ast_format_get_codec_id(ast_format_h263)) {</span><br><span>@@ -230,9 +226,6 @@</span><br><span> /*! Opus audio (8kHz, 16kHz, 24kHz, 48Khz) */</span><br><span> case AST_FORMAT_OPUS:</span><br><span> return ast_format_opus;</span><br><span style="color: hsl(0, 100%, 40%);">- /*! Raw mu-law data (G.711) */</span><br><span style="color: hsl(0, 100%, 40%);">- case AST_FORMAT_TESTLAW:</span><br><span style="color: hsl(0, 100%, 40%);">- return ast_format_testlaw;</span><br><span> </span><br><span> /*! H.261 Video */</span><br><span> case AST_FORMAT_H261:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/15206">change 15206</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/15206"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I42d0daa37f6f334c7d86672f06f085858a3f3940 </div>
<div style="display:none"> Gerrit-Change-Number: 15206 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Alexander Traud <pabstraud@compuserve.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-CC: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>