From cbc744627a3d9be79cbe79538a5ed60bb6052760 Mon Sep 17 00:00:00 2001
From: Emil Ivov <emcho@jitsi.org>
Date: Tue, 30 Oct 2012 14:27:51 +0000
Subject: [PATCH] Moves Constants to the serivce package so that it would be
accessible for other packages that need to access a PT name
---
.../neomedia/codec/audio/g722/JNIDecoder.java | 1 +
.../impl/neomedia/AudioMediaStreamImpl.java | 2 +-
src/org/jitsi/impl/neomedia/MediaUtils.java | 1 +
.../codec/audio/alaw/DePacketizer.java | 3 +-
.../neomedia/codec/audio/alaw/Packetizer.java | 2 +-
.../codec/audio/ilbc/JavaDecoder.java | 1 +
.../codec/audio/ilbc/JavaEncoder.java | 1 +
.../neomedia/codec/audio/opus/JNIDecoder.java | 1 +
.../neomedia/codec/audio/opus/JNIEncoder.java | 1 +
.../codec/audio/silk/JavaEncoder.java | 1 +
.../codec/audio/speex/JNIDecoder.java | 1 +
.../codec/audio/speex/JNIEncoder.java | 1 +
.../codec/audio/speex/JavaDecoder.java | 1 +
.../codec/audio/speex/JavaEncoder.java | 1 +
.../codec/video/h263p/DePacketizer.java | 1 +
.../codec/video/h263p/JNIDecoder.java | 1 +
.../codec/video/h263p/JNIEncoder.java | 1 +
.../codec/video/h263p/Packetizer.java | 1 +
.../codec/video/h264/DePacketizer.java | 1 +
.../neomedia/codec/video/h264/JNIDecoder.java | 1 +
.../neomedia/codec/video/h264/JNIEncoder.java | 1 +
.../neomedia/codec/video/h264/Packetizer.java | 1 +
.../neomedia/device/DeviceConfiguration.java | 2 +-
.../neomedia/device/MediaDeviceSession.java | 2 +-
.../transform/dtmf/DtmfTransformEngine.java | 2 +-
.../service/neomedia/codec/Constants.java | 133 ++++++++++++++++++
26 files changed, 158 insertions(+), 7 deletions(-)
create mode 100644 src/org/jitsi/service/neomedia/codec/Constants.java
diff --git a/src/net/java/sip/communicator/impl/neomedia/codec/audio/g722/JNIDecoder.java b/src/net/java/sip/communicator/impl/neomedia/codec/audio/g722/JNIDecoder.java
index a0c9067a..e4e3e5a4 100644
--- a/src/net/java/sip/communicator/impl/neomedia/codec/audio/g722/JNIDecoder.java
+++ b/src/net/java/sip/communicator/impl/neomedia/codec/audio/g722/JNIDecoder.java
@@ -10,6 +10,7 @@
import javax.media.format.*;
import org.jitsi.impl.neomedia.codec.*;
+import org.jitsi.service.neomedia.codec.*;
/**
*
diff --git a/src/org/jitsi/impl/neomedia/AudioMediaStreamImpl.java b/src/org/jitsi/impl/neomedia/AudioMediaStreamImpl.java
index ad50819b..b6bef4cf 100644
--- a/src/org/jitsi/impl/neomedia/AudioMediaStreamImpl.java
+++ b/src/org/jitsi/impl/neomedia/AudioMediaStreamImpl.java
@@ -12,12 +12,12 @@
import javax.media.control.*;
import javax.media.format.*;
-import org.jitsi.impl.neomedia.codec.*;
import org.jitsi.impl.neomedia.device.*;
import org.jitsi.impl.neomedia.transform.dtmf.*;
import org.jitsi.service.configuration.*;
import org.jitsi.service.libjitsi.*;
import org.jitsi.service.neomedia.*;
+import org.jitsi.service.neomedia.codec.*;
import org.jitsi.service.neomedia.device.*;
import org.jitsi.service.neomedia.event.*;
import org.jitsi.service.protocol.*;
diff --git a/src/org/jitsi/impl/neomedia/MediaUtils.java b/src/org/jitsi/impl/neomedia/MediaUtils.java
index 1bd431b0..3b539b9b 100644
--- a/src/org/jitsi/impl/neomedia/MediaUtils.java
+++ b/src/org/jitsi/impl/neomedia/MediaUtils.java
@@ -19,6 +19,7 @@
import org.jitsi.service.configuration.*;
import org.jitsi.service.libjitsi.*;
import org.jitsi.service.neomedia.*;
+import org.jitsi.service.neomedia.codec.*;
import org.jitsi.service.neomedia.device.*;
import org.jitsi.service.neomedia.format.*;
import org.jitsi.util.*;
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/alaw/DePacketizer.java b/src/org/jitsi/impl/neomedia/codec/audio/alaw/DePacketizer.java
index df03ddac..e9c5cd35 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/alaw/DePacketizer.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/alaw/DePacketizer.java
@@ -9,9 +9,8 @@
import javax.media.*;
import javax.media.format.*;
-import org.jitsi.impl.neomedia.codec.*;
-
import com.sun.media.codec.audio.*;
+import org.jitsi.service.neomedia.codec.*;
/**
* DePacketizer for ALAW codec
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/alaw/Packetizer.java b/src/org/jitsi/impl/neomedia/codec/audio/alaw/Packetizer.java
index d725e7d1..540e3273 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/alaw/Packetizer.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/alaw/Packetizer.java
@@ -9,7 +9,7 @@
import javax.media.*;
import javax.media.format.*;
-import org.jitsi.impl.neomedia.codec.*;
+import org.jitsi.service.neomedia.codec.*;
/**
* Implements an RTP packetizer for the A-law codec.
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/ilbc/JavaDecoder.java b/src/org/jitsi/impl/neomedia/codec/audio/ilbc/JavaDecoder.java
index 7809b825..c53e8c05 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/ilbc/JavaDecoder.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/ilbc/JavaDecoder.java
@@ -12,6 +12,7 @@
import javax.media.format.*;
import org.jitsi.impl.neomedia.codec.*;
+import org.jitsi.service.neomedia.codec.*;
/**
* Implements an iLBC decoder and RTP depacketizer as a {@link Codec}.
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/ilbc/JavaEncoder.java b/src/org/jitsi/impl/neomedia/codec/audio/ilbc/JavaEncoder.java
index d5fbfb53..d0db7069 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/ilbc/JavaEncoder.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/ilbc/JavaEncoder.java
@@ -10,6 +10,7 @@
import javax.media.format.*;
import org.jitsi.impl.neomedia.codec.*;
+import org.jitsi.service.neomedia.codec.*;
/**
* Implements an iLBC encoder and RTP packetizer as a {@link Codec}.
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/opus/JNIDecoder.java b/src/org/jitsi/impl/neomedia/codec/audio/opus/JNIDecoder.java
index 9f156a30..1af80796 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/opus/JNIDecoder.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/opus/JNIDecoder.java
@@ -11,6 +11,7 @@
import net.sf.fmj.media.*;
import org.jitsi.impl.neomedia.codec.*;
+import org.jitsi.service.neomedia.codec.*;
/**
* Implements an Opus decoder.
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/opus/JNIEncoder.java b/src/org/jitsi/impl/neomedia/codec/audio/opus/JNIEncoder.java
index db790ec2..9006edd4 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/opus/JNIEncoder.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/opus/JNIEncoder.java
@@ -10,6 +10,7 @@
import javax.media.format.*;
import net.sf.fmj.media.*;
import org.jitsi.impl.neomedia.codec.*;
+import org.jitsi.service.neomedia.codec.*;
/**
* Implements an opus encoder.
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/silk/JavaEncoder.java b/src/org/jitsi/impl/neomedia/codec/audio/silk/JavaEncoder.java
index 0cd38b22..3343af07 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/silk/JavaEncoder.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/silk/JavaEncoder.java
@@ -12,6 +12,7 @@
import org.jitsi.impl.neomedia.codec.*;
import org.jitsi.service.configuration.*;
import org.jitsi.service.libjitsi.*;
+import org.jitsi.service.neomedia.codec.*;
/**
* Implements the SILK encoder as an FMJ/JMF <tt>Codec</tt>.
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/speex/JNIDecoder.java b/src/org/jitsi/impl/neomedia/codec/audio/speex/JNIDecoder.java
index c43bfa66..3eb1df20 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/speex/JNIDecoder.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/speex/JNIDecoder.java
@@ -13,6 +13,7 @@
import net.sf.fmj.media.*;
import org.jitsi.impl.neomedia.codec.*;
+import org.jitsi.service.neomedia.codec.*;
/**
* Implements a Speex decoder and RTP depacketizer using the native Speex
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/speex/JNIEncoder.java b/src/org/jitsi/impl/neomedia/codec/audio/speex/JNIEncoder.java
index c9ae3b6d..cde62c40 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/speex/JNIEncoder.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/speex/JNIEncoder.java
@@ -13,6 +13,7 @@
import net.sf.fmj.media.*;
import org.jitsi.impl.neomedia.codec.*;
+import org.jitsi.service.neomedia.codec.*;
/**
* Implements a Speex encoder and RTP packetizer using the native Speex library.
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/speex/JavaDecoder.java b/src/org/jitsi/impl/neomedia/codec/audio/speex/JavaDecoder.java
index 3d9883ee..79bd1a73 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/speex/JavaDecoder.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/speex/JavaDecoder.java
@@ -14,6 +14,7 @@
import net.sf.fmj.media.*;
import org.jitsi.impl.neomedia.codec.*;
+import org.jitsi.service.neomedia.codec.*;
import org.xiph.speex.*;
/**
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/speex/JavaEncoder.java b/src/org/jitsi/impl/neomedia/codec/audio/speex/JavaEncoder.java
index 220f969a..a87323a0 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/speex/JavaEncoder.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/speex/JavaEncoder.java
@@ -12,6 +12,7 @@
import net.sf.fmj.media.*;
import org.jitsi.impl.neomedia.codec.*;
+import org.jitsi.service.neomedia.codec.*;
import org.xiph.speex.*;
/**
diff --git a/src/org/jitsi/impl/neomedia/codec/video/h263p/DePacketizer.java b/src/org/jitsi/impl/neomedia/codec/video/h263p/DePacketizer.java
index 3929e763..b120b39c 100644
--- a/src/org/jitsi/impl/neomedia/codec/video/h263p/DePacketizer.java
+++ b/src/org/jitsi/impl/neomedia/codec/video/h263p/DePacketizer.java
@@ -15,6 +15,7 @@
import net.sf.fmj.media.*;
import org.jitsi.impl.neomedia.codec.*;
+import org.jitsi.service.neomedia.codec.*;
import org.jitsi.util.*;
/**
diff --git a/src/org/jitsi/impl/neomedia/codec/video/h263p/JNIDecoder.java b/src/org/jitsi/impl/neomedia/codec/video/h263p/JNIDecoder.java
index cd773f4e..37e92f91 100644
--- a/src/org/jitsi/impl/neomedia/codec/video/h263p/JNIDecoder.java
+++ b/src/org/jitsi/impl/neomedia/codec/video/h263p/JNIDecoder.java
@@ -16,6 +16,7 @@
import org.jitsi.impl.neomedia.codec.*;
import org.jitsi.impl.neomedia.codec.video.*;
+import org.jitsi.service.neomedia.codec.*;
/**
* Implements a H.263+ decoder.
diff --git a/src/org/jitsi/impl/neomedia/codec/video/h263p/JNIEncoder.java b/src/org/jitsi/impl/neomedia/codec/video/h263p/JNIEncoder.java
index 2cad668d..2c89773f 100644
--- a/src/org/jitsi/impl/neomedia/codec/video/h263p/JNIEncoder.java
+++ b/src/org/jitsi/impl/neomedia/codec/video/h263p/JNIEncoder.java
@@ -15,6 +15,7 @@
import net.sf.fmj.media.*;
import org.jitsi.impl.neomedia.codec.*;
+import org.jitsi.service.neomedia.codec.*;
/**
* Implements a H.263+ encoder.
diff --git a/src/org/jitsi/impl/neomedia/codec/video/h263p/Packetizer.java b/src/org/jitsi/impl/neomedia/codec/video/h263p/Packetizer.java
index 31260b43..6f490cce 100644
--- a/src/org/jitsi/impl/neomedia/codec/video/h263p/Packetizer.java
+++ b/src/org/jitsi/impl/neomedia/codec/video/h263p/Packetizer.java
@@ -16,6 +16,7 @@
import net.sf.fmj.media.*;
import org.jitsi.impl.neomedia.codec.*;
+import org.jitsi.service.neomedia.codec.*;
// disambiguation
/**
diff --git a/src/org/jitsi/impl/neomedia/codec/video/h264/DePacketizer.java b/src/org/jitsi/impl/neomedia/codec/video/h264/DePacketizer.java
index 6458283d..b00e1543 100644
--- a/src/org/jitsi/impl/neomedia/codec/video/h264/DePacketizer.java
+++ b/src/org/jitsi/impl/neomedia/codec/video/h264/DePacketizer.java
@@ -15,6 +15,7 @@
import net.sf.fmj.media.*;
import org.jitsi.impl.neomedia.codec.*;
+import org.jitsi.service.neomedia.codec.*;
import org.jitsi.service.neomedia.control.*;
import org.jitsi.util.*;
diff --git a/src/org/jitsi/impl/neomedia/codec/video/h264/JNIDecoder.java b/src/org/jitsi/impl/neomedia/codec/video/h264/JNIDecoder.java
index 0a1e3f90..8df25096 100644
--- a/src/org/jitsi/impl/neomedia/codec/video/h264/JNIDecoder.java
+++ b/src/org/jitsi/impl/neomedia/codec/video/h264/JNIDecoder.java
@@ -16,6 +16,7 @@
import org.jitsi.impl.neomedia.codec.*;
import org.jitsi.impl.neomedia.codec.video.*;
+import org.jitsi.service.neomedia.codec.*;
import org.jitsi.service.neomedia.control.*;
/**
diff --git a/src/org/jitsi/impl/neomedia/codec/video/h264/JNIEncoder.java b/src/org/jitsi/impl/neomedia/codec/video/h264/JNIEncoder.java
index 4062191f..f71b1cda 100644
--- a/src/org/jitsi/impl/neomedia/codec/video/h264/JNIEncoder.java
+++ b/src/org/jitsi/impl/neomedia/codec/video/h264/JNIEncoder.java
@@ -19,6 +19,7 @@
import org.jitsi.impl.neomedia.format.*;
import org.jitsi.service.configuration.*;
import org.jitsi.service.libjitsi.*;
+import org.jitsi.service.neomedia.codec.*;
import org.jitsi.service.neomedia.control.*;
import org.jitsi.service.neomedia.event.*;
import org.jitsi.util.*;
diff --git a/src/org/jitsi/impl/neomedia/codec/video/h264/Packetizer.java b/src/org/jitsi/impl/neomedia/codec/video/h264/Packetizer.java
index 5c5978c9..0c914511 100644
--- a/src/org/jitsi/impl/neomedia/codec/video/h264/Packetizer.java
+++ b/src/org/jitsi/impl/neomedia/codec/video/h264/Packetizer.java
@@ -17,6 +17,7 @@
import org.jitsi.impl.neomedia.codec.*;
import org.jitsi.impl.neomedia.format.*;
+import org.jitsi.service.neomedia.codec.*;
// disambiguation
/**
diff --git a/src/org/jitsi/impl/neomedia/device/DeviceConfiguration.java b/src/org/jitsi/impl/neomedia/device/DeviceConfiguration.java
index 5affd454..bba9a8a5 100644
--- a/src/org/jitsi/impl/neomedia/device/DeviceConfiguration.java
+++ b/src/org/jitsi/impl/neomedia/device/DeviceConfiguration.java
@@ -16,11 +16,11 @@
import javax.media.format.*;
import org.jitsi.impl.neomedia.*;
-import org.jitsi.impl.neomedia.codec.*;
import org.jitsi.impl.neomedia.codec.video.*;
import org.jitsi.service.configuration.*;
import org.jitsi.service.libjitsi.*;
import org.jitsi.service.neomedia.*;
+import org.jitsi.service.neomedia.codec.*;
import org.jitsi.util.*;
import org.jitsi.util.event.*;
diff --git a/src/org/jitsi/impl/neomedia/device/MediaDeviceSession.java b/src/org/jitsi/impl/neomedia/device/MediaDeviceSession.java
index c9dccff8..3189bad1 100644
--- a/src/org/jitsi/impl/neomedia/device/MediaDeviceSession.java
+++ b/src/org/jitsi/impl/neomedia/device/MediaDeviceSession.java
@@ -18,10 +18,10 @@
import javax.media.rtp.*;
import org.jitsi.impl.neomedia.*;
-import org.jitsi.impl.neomedia.codec.*;
import org.jitsi.impl.neomedia.format.*;
import org.jitsi.impl.neomedia.protocol.*;
import org.jitsi.service.neomedia.*;
+import org.jitsi.service.neomedia.codec.*;
import org.jitsi.service.neomedia.device.*;
import org.jitsi.service.neomedia.format.*;
import org.jitsi.util.*;
diff --git a/src/org/jitsi/impl/neomedia/transform/dtmf/DtmfTransformEngine.java b/src/org/jitsi/impl/neomedia/transform/dtmf/DtmfTransformEngine.java
index 59bd3df6..1abf3ec0 100644
--- a/src/org/jitsi/impl/neomedia/transform/dtmf/DtmfTransformEngine.java
+++ b/src/org/jitsi/impl/neomedia/transform/dtmf/DtmfTransformEngine.java
@@ -11,9 +11,9 @@
import javax.media.*;
import org.jitsi.impl.neomedia.*;
-import org.jitsi.impl.neomedia.codec.*;
import org.jitsi.impl.neomedia.transform.*;
import org.jitsi.service.neomedia.*;
+import org.jitsi.service.neomedia.codec.*;
import org.jitsi.service.neomedia.format.*;
/**
diff --git a/src/org/jitsi/service/neomedia/codec/Constants.java b/src/org/jitsi/service/neomedia/codec/Constants.java
new file mode 100644
index 00000000..7a842fe4
--- /dev/null
+++ b/src/org/jitsi/service/neomedia/codec/Constants.java
@@ -0,0 +1,133 @@
+/*
+ * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jitsi.service.neomedia.codec;
+
+import org.jitsi.util.*;
+
+/**
+ * Allows start import of <tt>org.jitsi.impl.neomedia.codec</tt>
+ * in order to get the constants define in
+ * <tt>org.jitsi.service.neomedia.codec.Constants</tt> without star
+ * import of <tt>org.jitsi.impl.neomedia.codec</tt>.
+ *
+ * @author Lubomir Marinov
+ */
+public class Constants
+{
+ /**
+ * The ALAW/RTP constant.
+ */
+ public static final String ALAW_RTP = "ALAW/rtp";
+
+ /**
+ * The G722 constant.
+ */
+ public static final String G722 = "g722";
+
+ /**
+ * The G722/RTP constant.
+ */
+ public static final String G722_RTP = "g722/rtp";
+
+ /**
+ * The iLBC constant.
+ */
+ public static final String ILBC = "ilbc";
+
+ /**
+ * The iLBC/RTP constant.
+ */
+ public static final String ILBC_RTP = "ilbc/rtp";
+
+ /**
+ * The SILK constant.
+ */
+ public static final String SILK = "SILK";
+
+ /**
+ * The SILK/RTP constant.
+ */
+ public static final String SILK_RTP = "SILK/rtp";
+
+ /**
+ * The SPEEX constant.
+ */
+ public static final String SPEEX = "speex";
+
+ /**
+ * The SPEEX/RTP constant.
+ */
+ public static final String SPEEX_RTP = "speex/rtp";
+
+ /**
+ * The OPUS/RTP constant.
+ */
+ public static final String OPUS_RTP = "opus/rtp";
+
+ /**
+ * The H264 constant.
+ */
+ public static final String H264 = "h264";
+
+ /**
+ * The H264/RTP constant.
+ */
+ public static final String H264_RTP = "h264/rtp";
+
+ /**
+ * The H263+ constant.
+ */
+ public static final String H263P = "H263-1998";
+
+ /**
+ * The H263+/RTP constant.
+ */
+ public static final String H263P_RTP = "h263-1998/rtp";
+
+ /**
+ * Pseudo format representing DTMF tones sent over RTP.
+ */
+ public static final String TELEPHONE_EVENT = "telephone-event";
+
+ /**
+ * mode : Frame size for the encoding/decoding
+ * 20 - 20 ms
+ * 30 - 30 ms
+ */
+ public static int ILBC_MODE = 30;
+
+ /**
+ * Default video width.
+ */
+ public static final int VIDEO_WIDTH;
+
+ /**
+ * Default video height.
+ */
+ public static final int VIDEO_HEIGHT;
+
+ static
+ {
+
+ /*
+ * On Mac OS X, the Apple iSight camera reports two sizes 640x480 and
+ * 320x240 if we use the default size 352x288 we must use source format
+ * 640x480 in this situation we suffer from high cpu usage as every
+ * frame is scaled, so we use the non-standard format 320x240.
+ */
+ if (OSUtils.IS_MAC)
+ {
+ VIDEO_WIDTH = 320;
+ VIDEO_HEIGHT = 240;
+ }
+ else
+ {
+ VIDEO_WIDTH = 352;
+ VIDEO_HEIGHT = 288;
+ }
+ }
+}
--
GitLab