Revision: 16108
Author: oleg.kulikoff
Date: Wed Dec 29 12:11:16 2010
Log: Issue 1976: SignalDetector tests group
http://code.google.com/p/mobicents/source/detail?r=16108
Added:
/trunk/servers/media/core/server-impl/src/test/java/org/mobicents/media/server/impl/rtp/sdp/MediaDescriptorTest.java
Deleted:
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/ss7/MtpManagement.java
Modified:
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/clock/Scheduler.java
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/clock/Semaphore.java
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/dtmf/DtmfBuffer.java
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/mediaplayer/audio/AudioPlayerImpl.java
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/mediaplayer/audio/wav/WavTrackImpl.java
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/mediaplayer/video/VideoPlayerImpl.java
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/zap/MTPUser.java
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/rtp/JitterBuffer.java
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/rtp/Receiver.java
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/rtp/RtpSocketImpl.java
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/rtp/sdp/AudioFormatParser.java
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/rtp/sdp/MediaDescriptor.java
=======================================
--- /dev/null
+++
/trunk/servers/media/core/server-impl/src/test/java/org/mobicents/media/server/impl/rtp/sdp/MediaDescriptorTest.java
Wed Dec 29 12:11:16 2010
@@ -0,0 +1,96 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package org.mobicents.media.server.impl.rtp.sdp;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import static org.junit.Assert.*;
+import org.mobicents.media.Format;
+import org.mobicents.media.server.spi.MediaType;
+
+/**
+ *
+ * @author kulikov
+ */
+public class MediaDescriptorTest {
+
+ private String m = "m=audio 1234 RTP/AVP 0 101";
+ private MediaDescriptor md;
+
+ public MediaDescriptorTest() {
+ }
+
+ @BeforeClass
+ public static void setUpClass() throws Exception {
+ }
+
+ @AfterClass
+ public static void tearDownClass() throws Exception {
+ }
+
+ @Before
+ public void setUp() {
+ md = new MediaDescriptor(m);
+ }
+
+ @After
+ public void tearDown() {
+ }
+
+ /**
+ * Test of getMediaType method, of class MediaDescriptor.
+ */
+ @Test
+ public void testGetMediaType() {
+ assertEquals(MediaType.AUDIO, md.getMediaType());
+ }
+
+ /**
+ * Test of getPort method, of class MediaDescriptor.
+ */
+ @Test
+ public void testGetPort() {
+ assertEquals(1234, md.getPort());
+ }
+
+ /**
+ * Test of getProfle method, of class MediaDescriptor.
+ */
+ @Test
+ public void testGetProfle() {
+ assertEquals("RTP/AVP", md.getProfle());
+ }
+
+ /**
+ * Test of getMode method, of class MediaDescriptor.
+ */
+ @Test
+ public void testGetMode() {
+ assertEquals(null, md.getMode());
+ }
+
+ /**
+ * Test of getFormatCount method, of class MediaDescriptor.
+ */
+ @Test
+ public void testGetFormatCount() {
+ assertEquals(2, md.getFormatCount());
+ }
+
+ /**
+ * Test of getPyaloadType method, of class MediaDescriptor.
+ */
+ @Test
+ public void testGetPyaloadType() {
+ assertEquals(0, md.getPyaloadType(0));
+ assertEquals(101, md.getPyaloadType(1));
+ }
+
+
+}
=======================================
---
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/ss7/MtpManagement.java
Wed Dec 29 04:14:21 2010
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.mobicents.media.server.impl.resource.ss7;
-
-import java.io.IOException;
-
-import org.apache.log4j.Logger;
-import org.mobicents.media.Server;
-import org.mobicents.media.server.impl.clock.LocalTask;
-import org.mobicents.media.server.spi.clock.Task;
-
-/**
- *
- * @author amit bhayani
- *
- */
-public class MtpManagement implements Task {
-
- private static final Logger logger =
Logger.getLogger(MtpManagement.class);
-
- private ShellExecutor shellExecutor = null;
- private M3UALayer4 m3UALayer4 = null;
-
- private LocalTask task = null;
- private boolean isActive = false;
-
- public MtpManagement() {
-
- }
-
- public ShellExecutor getShellExecutor() {
- return shellExecutor;
- }
-
- public void setShellExecutor(ShellExecutor shellExecutor) {
- this.shellExecutor = shellExecutor;
- }
-
- public M3UALayer4 getM3UALayer4() {
- return m3UALayer4;
- }
-
- public void setM3UALayer4(M3UALayer4 layer4) {
- m3UALayer4 = layer4;
- }
-
- /**
- * Life Cycle methods
- */
- public void create() {
-
- }
-
- public void start() throws Exception {
- task = Server.scheduler.execute(this);
- }
-
- public void stop() {
- task.cancel();
- }
-
- public void destroy() {
-
- }
-
- /**
- * Task methods implementation
- */
- public void cancel() {
- this.isActive = false;
- }
-
- public boolean isActive() {
- return this.isActive;
- }
-
- public int perform() {
-
- try {
- this.shellExecutor.perform();
- this.m3UALayer4.perform();
- // Management
- } catch (IOException e) {
- logger.error("IOException ", e);
- }
-
- return 1;
- }
-
-}
=======================================
---
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/clock/Scheduler.java
Tue Nov 16 22:05:58 2010
+++
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/clock/Scheduler.java
Wed Dec 29 12:11:16 2010
@@ -35,6 +35,8 @@
private Timer timer;
private Semaphore semaphore;
+
+ private int time = 0;
public Scheduler() {
timer = new TimerImpl();
@@ -69,7 +71,16 @@
public LocalTask execute(Task task) {
//each new task is appended to the head
LocalTask localTask = new LocalTask(task);
- timeline[0].tasks[timeline[0].pos++] = localTask;
+// timeline[0].tasks[timeline[0].pos++] = localTask;
+
+ int p = time + 1;
+ if (p >= 1000) {
+ p -= 1000;
+ }
+
+ timeline[p].tasks[timeline[p].pos++] = localTask;
+ semaphore.ping();
+
if (blocked) {
blocked = false;
}
@@ -85,7 +96,7 @@
@SuppressWarnings("static-access")
public void run() {
- int time = 0;
+// int time = 0;
long start = 0;
long finish = 0;
=======================================
---
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/clock/Semaphore.java
Fri Nov 19 00:54:05 2010
+++
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/clock/Semaphore.java
Wed Dec 29 12:11:16 2010
@@ -39,6 +39,8 @@
private long now;
private long ems;
+
+ private volatile boolean nothingTodo = true;
/**
* Creates new instance of semaphore.
*
@@ -78,22 +80,32 @@
* @param amount the amount of time in milliseconds. must be positive.
*/
public void block(long amount) {
+ nothingTodo = true;
low = timer.getTimestamp() + amount * 1000000L - precision * 1000L;
//try sleep first
if (amount - ems > ems) {
- try {
- Thread.currentThread().sleep(amount - ems);
- } catch (InterruptedException e) {
+ synchronized(this) {
+ try {
+ wait(amount - ems);
+ } catch (InterruptedException e) {
+ }
}
}
now = timer.getTimestamp();
//poll timer in cycle till required time will be reached
- while ((now < low)) {
+ while ((now < low) && nothingTodo) {
now = timer.getTimestamp();
}
}
+
+ protected void ping() {
+ nothingTodo = false;
+ synchronized(this) {
+ notify();
+ }
+ }
public static void main(String[] args) {
Semaphore semaphore = new Semaphore(new TimerImpl(), 10);
=======================================
---
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/dtmf/DtmfBuffer.java
Tue May 4 23:31:18 2010
+++
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/dtmf/DtmfBuffer.java
Wed Dec 29 12:11:16 2010
@@ -128,7 +128,7 @@
logger.error("DTMF event " + symbol + " not
identified");
return;
}
-
+System.out.println("Send DTMF: " + symbol);
DtmfEvent dtmfEvent = new DtmfEvent(this, eventId, 0);
super.sendEvent(dtmfEvent);
=======================================
---
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/mediaplayer/audio/AudioPlayerImpl.java
Thu Jul 15 01:45:16 2010
+++
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/mediaplayer/audio/AudioPlayerImpl.java
Wed Dec 29 12:11:16 2010
@@ -67,28 +67,32 @@
static {
-// codecFactories.add(new
org.mobicents.media.server.impl.dsp.audio.g711.alaw.DecoderFactory());
-// codecFactories.add(new
org.mobicents.media.server.impl.dsp.audio.g711.alaw.EncoderFactory());
-//
-// codecFactories.add(new
org.mobicents.media.server.impl.dsp.audio.g711.ulaw.DecoderFactory());
-// codecFactories.add(new
org.mobicents.media.server.impl.dsp.audio.g711.ulaw.EncoderFactory());
-//
-// codecFactories.add(new
org.mobicents.media.server.impl.dsp.audio.gsm.DecoderFactory());
-// codecFactories.add(new
org.mobicents.media.server.impl.dsp.audio.gsm.EncoderFactory());
-//
-// codecFactories.add(new
org.mobicents.media.server.impl.dsp.audio.speex.DecoderFactory());
-// codecFactories.add(new
org.mobicents.media.server.impl.dsp.audio.speex.EncoderFactory());
-//
-// codecFactories.add(new
org.mobicents.media.server.impl.dsp.audio.g729.DecoderFactory());
-// codecFactories.add(new
org.mobicents.media.server.impl.dsp.audio.g729.EncoderFactory());
codecFactories = new CodecFactory[]{
- new
org.mobicents.media.server.impl.dsp.audio.g711.alaw.DecoderFactory(), new
org.mobicents.media.server.impl.dsp.audio.g711.alaw.EncoderFactory(), new
org.mobicents.media.server.impl.dsp.audio.g711.ulaw.DecoderFactory(), new
org.mobicents.media.server.impl.dsp.audio.g711.ulaw.EncoderFactory(), new
org.mobicents.media.server.impl.dsp.audio.gsm.DecoderFactory(), new
org.mobicents.media.server.impl.dsp.audio.gsm.EncoderFactory(), new
org.mobicents.media.server.impl.dsp.audio.speex.DecoderFactory(), new
org.mobicents.media.server.impl.dsp.audio.speex.EncoderFactory(), new
org.mobicents.media.server.impl.dsp.audio.g729.DecoderFactory(), new
org.mobicents.media.server.impl.dsp.audio.g729.EncoderFactory()
+ new
org.mobicents.media.server.impl.dsp.audio.g711.alaw.DecoderFactory(),
+ new
org.mobicents.media.server.impl.dsp.audio.g711.alaw.EncoderFactory(),
+ new
org.mobicents.media.server.impl.dsp.audio.g711.ulaw.DecoderFactory(),
+ new
org.mobicents.media.server.impl.dsp.audio.g711.ulaw.EncoderFactory(),
+ new
org.mobicents.media.server.impl.dsp.audio.gsm.DecoderFactory(),
+ new
org.mobicents.media.server.impl.dsp.audio.gsm.EncoderFactory(),
+ new
org.mobicents.media.server.impl.dsp.audio.speex.DecoderFactory(),
+ new
org.mobicents.media.server.impl.dsp.audio.speex.EncoderFactory(),
+ new
org.mobicents.media.server.impl.dsp.audio.g729.DecoderFactory(),
+ new
org.mobicents.media.server.impl.dsp.audio.g729.EncoderFactory()
};
}
+
+ private long maxDuration;
+ private long initialDelay;
+
private String voiceName = "kevin";
private int volume;
+ //This is a hack for JSR-309
+ private long drift;
+ private long s;
+ private boolean first = true;
+
private Codec selectCodec(Format f) {
for (CodecFactory factory : codecFactories) {
if (factory.getSupportedInputFormat().matches(f) &&
factory.getSupportedOutputFormat().matches(format)) {
@@ -119,6 +123,10 @@
return track.getDuration();
}
+ public void setMaxDuration(long maxDuration) {
+ this.maxDuration = maxDuration;
+ }
+
@Override
public void setMediaTime(long timestamp) {
track.setMediaTime(timestamp);
@@ -129,6 +137,10 @@
return track.getMediaTime();
}
+ public void setInitialDelay(long delay) {
+ this.initialDelay = delay;
+ }
+
/**
* (Non Java-doc.)
*
@@ -183,7 +195,6 @@
throw new ResourceUnavailableException("Format is not
supported: " + fileFormat);
}
}
-
}
@Override
@@ -191,6 +202,8 @@
if (track == null) {
throw new IllegalStateException("The media source is not
specified");
}
+
+ s = System.currentTimeMillis();
super.start();
}
@@ -206,6 +219,30 @@
@Override
public void evolve(Buffer buffer, long timestamp) {
try {
+ if (first) {
+ first = false;
+
+ drift = System.currentTimeMillis() - s;
+ if (this.maxDuration > 0) {
+ this.maxDuration = Math.max(800, maxDuration - drift);
+ } else {
+ this.maxDuration = Math.max(800, getDuration() -
drift);
+ }
+ System.out.println("==== drift=" + drift + " , dur=" +
maxDuration);
+ }
+
+ //generate initial silence
+ if (timestamp < initialDelay) {
+ System.out.println("silence " + timestamp);
+ buffer.setData(new byte[320]);
+ buffer.setOffset(0);
+ buffer.setLength(320);
+ buffer.setTimeStamp(timestamp);
+ buffer.setFormat(this.format);
+ buffer.setDuration(20);
+ return;
+ }
+
track.process(buffer);
buffer.setTimeStamp(timestamp);
@@ -213,6 +250,11 @@
codec.process(buffer);
}
+ //set End of Media if max duration exceeded
+ if (maxDuration > 0 && track.getMediaTime() > maxDuration) {
+ buffer.setEOM(true);
+ }
+
if (buffer.isEOM()) {
track.close();
}
=======================================
---
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/mediaplayer/audio/wav/WavTrackImpl.java
Fri Jun 25 05:30:54 2010
+++
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/mediaplayer/audio/wav/WavTrackImpl.java
Wed Dec 29 12:11:16 2010
@@ -20,6 +20,8 @@
import org.mobicents.media.Format;
import java.io.IOException;
import java.net.URL;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import javax.sound.sampled.AudioFormat.Encoding;
import javax.sound.sampled.AudioInputStream;
import javax.sound.sampled.AudioSystem;
@@ -45,6 +47,8 @@
private long timestamp;
private long duration;
+ private boolean first = true;
+ private SimpleDateFormat fmt = new SimpleDateFormat("HH:mm:ss,SSS");
public WavTrackImpl(URL url) throws UnsupportedAudioFileException,
IOException, UnsupportedFormatException {
stream = AudioSystem.getAudioInputStream(url);
duration =
(long)(stream.getFrameLength()/stream.getFormat().getFrameRate() * 1000);
@@ -78,10 +82,11 @@
public void setMediaTime(long timestamp) {
this.timestamp = timestamp;
try {
- stream.reset();
long offset = frameSize * (timestamp / period);
- stream.skip(offset);
+ byte[] skip = new byte[(int)offset];
+ stream.read(skip);
} catch (IOException e) {
+ e.printStackTrace();
}
}
@@ -136,6 +141,10 @@
}
public void process(Buffer buffer) throws IOException {
+ if (first) {
+ first = false;
+ System.out.println("start:" + fmt.format(new Date()));
+ }
byte[] data = buffer.getData();
if (data == null) {
data = new byte[frameSize];
@@ -145,6 +154,7 @@
int len = readPacket(data, 0, frameSize);
if (len == 0) {
eom = true;
+ System.out.println("stop: " + fmt.format(new Date()));
}
if (len < frameSize) {
=======================================
---
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/mediaplayer/video/VideoPlayerImpl.java
Wed Jun 30 02:26:17 2010
+++
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/mediaplayer/video/VideoPlayerImpl.java
Wed Dec 29 12:11:16 2010
@@ -95,6 +95,9 @@
//Format fileFormat = track.getFormat();
}
+ public void setMaxDuration(long maxDuration) {
+ }
+
@Override
public long getDuration() {
return track.getDuration();
@@ -155,4 +158,8 @@
return null;
}
}
-}
+
+ public void setInitialDelay(long delay) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+}
=======================================
---
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/zap/MTPUser.java
Wed Dec 29 04:14:21 2010
+++
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/zap/MTPUser.java
Wed Dec 29 12:11:16 2010
@@ -199,8 +199,8 @@
ArrayList<Mtp2> linkset = new ArrayList();
for (Mtp1 chann : channels) {
- Mtp2 link = new Mtp2(name + "-" + chann.getCode(), chann);
- linkset.add(link);
+// Mtp2 link = new Mtp2(name + "-" + chann.getCode(),
chann);
+// linkset.add(link);
}
// assigning physical channel
mtp3 = new Mtp3(name);
=======================================
---
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/rtp/JitterBuffer.java
Mon Nov 8 01:24:29 2010
+++
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/rtp/JitterBuffer.java
Wed Dec 29 12:11:16 2010
@@ -142,12 +142,12 @@
s = packet.getTime();
r = lastRtpPackReceivedTimeStamp;
- if (ready && readStarted && t <= timestamp) {
+// if (ready && readStarted && t < timestamp) {
//read process already started, buffer is full and packet is
outstanding
//packet should be discarded
- logger.warn("Packet " + packet + " is discarded by jitter
buffer( packet time=" + t + ", current time " + (timestamp));
- return;
- }
+// logger.warn("Packet " + packet + " is discarded by jitter
buffer( packet time=" + t + ", current time " + (timestamp));
+// return;
+// }
if (!writeStarted) {
//this is a first arrived packet
=======================================
---
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/rtp/Receiver.java
Thu Oct 14 20:19:46 2010
+++
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/rtp/Receiver.java
Wed Dec 29 12:11:16 2010
@@ -18,6 +18,7 @@
package org.mobicents.media.server.impl.rtp;
import java.io.IOException;
+import java.net.PortUnreachableException;
import java.nio.ByteBuffer;
import java.nio.channels.DatagramChannel;
import java.nio.channels.SelectionKey;
@@ -180,6 +181,7 @@
socket.receive(readBuffer);
readBuffer.clear();
+ } catch (PortUnreachableException e) {
} catch (IOException e) {
//TODO count error before failing
e.printStackTrace();
=======================================
---
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/rtp/RtpSocketImpl.java
Fri Nov 5 02:26:07 2010
+++
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/rtp/RtpSocketImpl.java
Wed Dec 29 12:11:16 2010
@@ -21,6 +21,7 @@
import java.net.DatagramSocket;
import java.net.InetAddress;
import java.net.InetSocketAddress;
+import java.net.PortUnreachableException;
import java.net.SocketException;
import java.nio.ByteBuffer;
import java.nio.channels.ClosedChannelException;
@@ -532,7 +533,9 @@
//
//Receiver will check this flag on selected channel and perform
actual close procedure.
this.isClosed = true;
- this.rtcpSenderWorker.cancel();
+ if (rtcpSenderWorker != null) {
+ this.rtcpSenderWorker.cancel();
+ }
}
public void close() {
@@ -680,6 +683,7 @@
sendBuffer.flip();
try {
rtpChannel.write(sendBuffer);
+ } catch (PortUnreachableException e) {
} catch (IOException e) {
this.notify(e);
}
=======================================
---
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/rtp/sdp/AudioFormatParser.java
Thu Jul 1 23:35:56 2010
+++
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/rtp/sdp/AudioFormatParser.java
Wed Dec 29 12:11:16 2010
@@ -37,7 +37,7 @@
int pos1 = rtpmap.indexOf(' ', pos);
//decode payload
- int payload = Integer.parseInt(rtpmap.substring(pos + 1, pos1));
+ int payload = Integer.parseInt(rtpmap.substring(pos + 1,
pos1).trim());
int index = 0;
while (index < count) {
@@ -47,16 +47,16 @@
//decoding encoding name
pos = rtpmap.indexOf('/', pos1);
- String encoding = rtpmap.substring(pos1 + 1, pos);
+ String encoding = rtpmap.substring(pos1 + 1, pos).trim();
//decoding clock rate
pos1 = rtpmap.indexOf('/', pos + 1);
double clockRate = pos1 > 0 ?
- Double.parseDouble(rtpmap.substring(pos + 1, pos1)) :
- Double.parseDouble(rtpmap.substring(pos + 1, rtpmap.length()));
+ Double.parseDouble(rtpmap.substring(pos + 1, pos1).trim()) :
+ Double.parseDouble(rtpmap.substring(pos + 1,
rtpmap.length()).trim());
int channels = pos1 > 0 ?
- Integer.parseInt(rtpmap.substring(pos1 + 1,
rtpmap.length())) : 1;
+ Integer.parseInt(rtpmap.substring(pos1 + 1,
rtpmap.length()).trim()) : 1;
if (encoding.equalsIgnoreCase("pcmu")) {
formats[index] = new AudioFormat(AudioFormat.ULAW, clockRate,
8, channels);
=======================================
---
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/rtp/sdp/MediaDescriptor.java
Wed Jun 30 11:21:15 2010
+++
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/rtp/sdp/MediaDescriptor.java
Wed Dec 29 12:11:16 2010
@@ -69,7 +69,7 @@
port = Integer.parseInt(m.substring(pos2 + 1, pos1));
pos2 = getNextSpace(pos1+1);
- profile = m.substring(pos1 + 1, pos2);
+ profile = m.substring(pos1 + 1, pos2).trim();
pos1 = pos2;
pos2 = getNextSpace(pos1+1);
@@ -101,27 +101,27 @@
}
- private int getNextSpace(int from){
- int next = 0;
-
- //If from is end of line there is no scope to check for space
- if(from >= length){
- return 0;
- }
-
- for(int i=from; i<length;i++){
- if(chars[i] == 32 ){
- next = i;
- break;
- }
- }
-
- //If we reach end of line where there is no space we return length
- if(next == 0){
- return length;
- }
-
- return next;
+ private int getNextSpace(int from) {
+ int next = 0;
+
+ //If from is end of line there is no scope to check for space
+ if (from >= length) {
+ return 0;
+ }
+
+ for (int i = from; i < length - 1; i++) {
+ if (chars[i] == 32 && chars[i + 1] != 32) {
+ next = i;
+ break;
+ }
+ }
+
+ //If we reach end of line where there is no space we return length
+ if (next == 0) {
+ return length;
+ }
+
+ return next;
}
public MediaDescriptor(MediaType mediaType, int port) {