[asterisk-commits] Remove SILK payload mappings from Asterisk core. (asterisk[master])

[SVN commits to the Asterisk project]

Joshua Colp has submitted this change and it was merged.

Change subject: Remove SILK payload mappings from Asterisk core.
......................................................................


Remove SILK payload mappings from Asterisk core.

SILK is a bit of a hog when it comes to using up our limited number of
dynamic payload types in the RTP engine. By freeing up four slots, it
allows for other codecs to potentially take the place.

Now, codec_silk.so will dynamically use the payload slots in the RTP
engine when it loads.

A better fix would be make RTP dynamic payload types actually
dynamic. However, at this stage of Asterisk 14 development, this is a
risky move that would be imprudent.

Change-Id: I5774e09408f9a203db189529eabdc0d3f4c1e612
---
M main/rtp_engine.c
1 file changed, 0 insertions(+), 10 deletions(-)

Approvals:
  Kevin Harwell: Looks good to me, but someone else must approve
  Joshua Colp: Looks good to me, approved; Verified



diff --git a/main/rtp_engine.c b/main/rtp_engine.c
index 66b80e5..c2b1c8c 100644
--- a/main/rtp_engine.c
+++ b/main/rtp_engine.c
@@ -2692,11 +2692,6 @@
 	/* Opus and VP8 */
 	set_next_mime_type(ast_format_opus, 0,  "audio", "opus", 48000);
 	set_next_mime_type(ast_format_vp8, 0,  "video", "VP8", 90000);
-	/* DA SILK */
-	set_next_mime_type(ast_format_silk8, 0, "audio", "silk", 8000);
-	set_next_mime_type(ast_format_silk12, 0, "audio", "silk", 12000);
-	set_next_mime_type(ast_format_silk16, 0, "audio", "silk", 16000);
-	set_next_mime_type(ast_format_silk24, 0, "audio", "silk", 24000);
 
 	/* Define the static rtp payload mappings */
 	add_static_payload(0, ast_format_ulaw, 0);
@@ -2749,11 +2744,6 @@
 	/* Opus and VP8 */
 	add_static_payload(100, ast_format_vp8, 0);
 	add_static_payload(107, ast_format_opus, 0);
-
-	add_static_payload(108, ast_format_silk8, 0);
-	add_static_payload(109, ast_format_silk12, 0);
-	add_static_payload(113, ast_format_silk16, 0);
-	add_static_payload(114, ast_format_silk24, 0);
 
 	return 0;
 }

-- 
To view, visit https://gerrit.asterisk.org/3377
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5774e09408f9a203db189529eabdc0d3f4c1e612
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Mark Michelson <mmichelson at digium.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>