From d2af4daf81ad1bef6725a2060a311da6c77cbb6e Mon Sep 17 00:00:00 2001
From: Boris Grozev <boris@jitsi.org>
Date: Sat, 24 Nov 2012 10:06:16 +0000
Subject: [PATCH] Changes the default priority of Opus in the configuration,
it's now on top. Removes the DVI4 codec formats, since they are not
supported.
---
src/org/jitsi/impl/neomedia/MediaUtils.java | 12 ------------
.../neomedia/codec/EncodingConfigurationImpl.java | 4 +---
2 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/src/org/jitsi/impl/neomedia/MediaUtils.java b/src/org/jitsi/impl/neomedia/MediaUtils.java
index 73118889..21dc409e 100644
--- a/src/org/jitsi/impl/neomedia/MediaUtils.java
+++ b/src/org/jitsi/impl/neomedia/MediaUtils.java
@@ -114,18 +114,6 @@ public class MediaUtils
MediaType.AUDIO,
AudioFormat.GSM_RTP,
8000);
- addMediaFormats(
- (byte) SdpConstants.DVI4_8000,
- "DVI4",
- MediaType.AUDIO,
- AudioFormat.DVI_RTP,
- 8000);
- addMediaFormats(
- (byte) SdpConstants.DVI4_16000,
- "DVI4",
- MediaType.AUDIO,
- AudioFormat.DVI_RTP,
- 16000);
addMediaFormats(
(byte) SdpConstants.PCMA,
"PCMA",
diff --git a/src/org/jitsi/impl/neomedia/codec/EncodingConfigurationImpl.java b/src/org/jitsi/impl/neomedia/codec/EncodingConfigurationImpl.java
index e274e984..48e8593d 100644
--- a/src/org/jitsi/impl/neomedia/codec/EncodingConfigurationImpl.java
+++ b/src/org/jitsi/impl/neomedia/codec/EncodingConfigurationImpl.java
@@ -72,6 +72,7 @@ private void initializeFormatPreferences()
800);
// audio
+ setEncodingPreference("opus", 48000, 750);
setEncodingPreference("G722", 8000 /* actually, 16 kHz */, 705);
setEncodingPreference("SILK", 24000, 704);
setEncodingPreference("SILK", 16000, 703);
@@ -82,14 +83,11 @@ private void initializeFormatPreferences()
setEncodingPreference("iLBC", 8000, 500);
setEncodingPreference("GSM", 8000, 450);
setEncodingPreference("speex", 8000, 352);
- setEncodingPreference("DVI4", 8000, 300);
- setEncodingPreference("DVI4", 16000, 250);
setEncodingPreference("G723", 8000, 150);
setEncodingPreference("SILK", 12000, 0);
setEncodingPreference("SILK", 8000, 0);
setEncodingPreference("G729", 8000, 0 /* proprietary */);
- setEncodingPreference("opus", 48000, 2);
// enables by default telephone event(DTMF rfc4733), with lowest
// priority as it is not needed to order it with audio codecs
--
GitLab