Revision: 17292
Author: [email protected]
Date: Fri Mar 11 00:54:52 2011
Log: Issue 2415: Transcoding
http://code.google.com/p/mobicents/source/detail?r=17292
Modified:
/trunk/servers/media/codecs/g711/src/main/java/org/mobicents/media/server/impl/dsp/audio/g711/alaw/Decoder.java
/trunk/servers/media/codecs/g711/src/main/java/org/mobicents/media/server/impl/dsp/audio/g711/alaw/Encoder.java
/trunk/servers/media/codecs/g729/src/main/java/org/mobicents/media/server/impl/dsp/audio/g729/Decoder.java
/trunk/servers/media/codecs/g729/src/main/java/org/mobicents/media/server/impl/dsp/audio/g729/Encoder.java
/trunk/servers/media/codecs/gsm/src/main/java/org/mobicents/media/server/impl/dsp/audio/gsm/Decoder.java
/trunk/servers/media/codecs/gsm/src/main/java/org/mobicents/media/server/impl/dsp/audio/gsm/Encoder.java
/trunk/servers/media/codecs/speex/src/main/java/org/mobicents/media/server/impl/dsp/audio/speex/Decoder.java
/trunk/servers/media/codecs/speex/src/main/java/org/mobicents/media/server/impl/dsp/audio/speex/Encoder.java
/trunk/servers/media/component/src/main/java/org/mobicents/media/server/component/Splitter.java
/trunk/servers/media/component/src/main/java/org/mobicents/media/server/component/audio/AudioMixer.java
/trunk/servers/media/component/src/main/java/org/mobicents/media/server/component/audio/SpectraAnalyzer.java
/trunk/servers/media/component/src/main/java/org/mobicents/media/server/impl/AbstractSink.java
/trunk/servers/media/component/src/main/java/org/mobicents/media/server/impl/AbstractSource.java
/trunk/servers/media/component/src/test/java/org/mobicents/media/server/component/SplitterTest.java
/trunk/servers/media/component/src/test/java/org/mobicents/media/server/component/audio/AudioMixerTest.java
/trunk/servers/media/component/src/test/java/org/mobicents/media/server/component/audio/SineTest.java
/trunk/servers/media/component/src/test/java/org/mobicents/media/server/component/audio/TranscodingTest.java
/trunk/servers/media/component/src/test/java/org/mobicents/media/server/impl/AbstractComponentTest.java
/trunk/servers/media/component/src/test/java/org/mobicents/media/server/impl/PipeImplTest.java
/trunk/servers/media/spi/src/main/java/org/mobicents/media/MediaSink.java
/trunk/servers/media/spi/src/main/java/org/mobicents/media/MediaSource.java
/trunk/servers/media/spi/src/test/java/org/mobicents/media/server/spi/format/AudioFormatTest.java
=======================================
---
/trunk/servers/media/codecs/g711/src/main/java/org/mobicents/media/server/impl/dsp/audio/g711/alaw/Decoder.java
Thu Mar 10 08:37:01 2011
+++
/trunk/servers/media/codecs/g711/src/main/java/org/mobicents/media/server/impl/dsp/audio/g711/alaw/Decoder.java
Fri Mar 11 00:54:52 2011
@@ -68,7 +68,6 @@
688, 656, 752, 720, 560, 528, 624, 592,
944, 912, 1008, 976, 816, 784, 880, 848
};
-// private byte[] temp = new byte[1200];
/**
* (Non Java-doc)
@@ -101,6 +100,8 @@
res.setLength(len);
res.setTimestamp(frame.getTimestamp());
res.setDuration(frame.getDuration());
+ res.setSequenceNumber(frame.getSequenceNumber());
+ res.setEOM(frame.isEOM());
res.setFormat(linear);
return res;
=======================================
---
/trunk/servers/media/codecs/g711/src/main/java/org/mobicents/media/server/impl/dsp/audio/g711/alaw/Encoder.java
Thu Mar 10 08:37:01 2011
+++
/trunk/servers/media/codecs/g711/src/main/java/org/mobicents/media/server/impl/dsp/audio/g711/alaw/Encoder.java
Fri Mar 11 00:54:52 2011
@@ -85,6 +85,8 @@
res.setFormat(alaw);
res.setTimestamp(frame.getTimestamp());
res.setDuration(frame.getDuration());
+ res.setEOM(frame.isEOM());
+ res.setSequenceNumber(frame.getSequenceNumber());
return res;
}
=======================================
---
/trunk/servers/media/codecs/g729/src/main/java/org/mobicents/media/server/impl/dsp/audio/g729/Decoder.java
Wed Feb 2 05:01:45 2011
+++
/trunk/servers/media/codecs/g729/src/main/java/org/mobicents/media/server/impl/dsp/audio/g729/Decoder.java
Fri Mar 11 00:54:52 2011
@@ -18,7 +18,6 @@
package org.mobicents.media.server.impl.dsp.audio.g729;
import org.mobicents.media.server.spi.dsp.Codec;
-import org.mobicents.media.server.spi.dsp.SignalingProcessor;
import org.mobicents.media.server.spi.format.Format;
import org.mobicents.media.server.spi.format.FormatFactory;
import org.mobicents.media.server.spi.memory.Frame;
@@ -75,9 +74,9 @@
return linear;
}
- public Frame process(Frame buffer) {
+ public Frame process(Frame frame) {
Frame res = null;
- byte[] data = buffer.getData();
+ byte[] data = frame.getData();
circular.addData(data);
byte[] speechWindow = circular.getData(20);
@@ -108,11 +107,16 @@
resultBytes[q + one.length] = two[q];
}
} else {
- res = Memory.allocate(buffer.getLength());
+ res = Memory.allocate(frame.getLength());
res.setLength(0);
resultBytes = new byte[0];
}
res.setOffset(0);
+ res.setTimestamp(frame.getTimestamp());
+ res.setDuration(frame.getDuration());
+ res.setSequenceNumber(frame.getSequenceNumber());
+ res.setEOM(frame.isEOM());
+ res.setFormat(linear);
return res;
}
@@ -164,6 +168,4 @@
return Util.floatArrayToByteArray(pst_out, LD8KConstants.L_FRAME);
}
- public void setProc(SignalingProcessor processor) {
- }
-}
+}
=======================================
---
/trunk/servers/media/codecs/g729/src/main/java/org/mobicents/media/server/impl/dsp/audio/g729/Encoder.java
Wed Feb 2 05:01:45 2011
+++
/trunk/servers/media/codecs/g729/src/main/java/org/mobicents/media/server/impl/dsp/audio/g729/Encoder.java
Fri Mar 11 00:54:52 2011
@@ -21,7 +21,6 @@
import java.io.FileOutputStream;
import org.mobicents.media.server.spi.dsp.Codec;
-import org.mobicents.media.server.spi.dsp.SignalingProcessor;
import org.mobicents.media.server.spi.format.Format;
import org.mobicents.media.server.spi.format.FormatFactory;
import org.mobicents.media.server.spi.memory.Frame;
@@ -64,9 +63,9 @@
return g729;
}
- public Frame process(Frame buffer) {
+ public Frame process(Frame frame) {
Frame res = null;
- byte[] data = buffer.getData();
+ byte[] data = frame.getData();
circularBuffer.addData(data);
@@ -101,6 +100,11 @@
}
}
res.setOffset(0);
+ res.setTimestamp(frame.getTimestamp());
+ res.setDuration(frame.getDuration());
+ res.setSequenceNumber(frame.getSequenceNumber());
+ res.setEOM(frame.isEOM());
+ res.setFormat(g729);
return res;
}
@@ -191,15 +195,11 @@
testData.read(tmp);
short[] sdata = Util.byteArrayToShortArray(tmp);
byte[] bits = Bits.toRealBits(sdata);
- for (int q = 0; q < 10; q++) {
- data[q] = bits[q];
- }
+ System.arraycopy(bits, 0, data, 0, 10);
testData.read(tmp);
sdata = Util.byteArrayToShortArray(tmp);
bits = Bits.toRealBits(sdata);
- for (int q = 0; q < 10; q++) {
- data[10 + q] = bits[q];
- }
+ System.arraycopy(bits, 0, data, 10, 10);
res = data;
} catch (Exception e) {
e.printStackTrace();
@@ -207,6 +207,4 @@
}
- public void setProc(SignalingProcessor processor) {
- }
-}
+}
=======================================
---
/trunk/servers/media/codecs/gsm/src/main/java/org/mobicents/media/server/impl/dsp/audio/gsm/Decoder.java
Wed Feb 2 05:01:45 2011
+++
/trunk/servers/media/codecs/gsm/src/main/java/org/mobicents/media/server/impl/dsp/audio/gsm/Decoder.java
Fri Mar 11 00:54:52 2011
@@ -18,7 +18,6 @@
package org.mobicents.media.server.impl.dsp.audio.gsm;
import org.mobicents.media.server.spi.dsp.Codec;
-import org.mobicents.media.server.spi.dsp.SignalingProcessor;
import org.mobicents.media.server.spi.format.Format;
import org.mobicents.media.server.spi.format.FormatFactory;
import org.mobicents.media.server.spi.memory.Frame;
@@ -46,6 +45,11 @@
process(frame.getData(), res.getData());
res.setOffset(0);
res.setLength(320);
+ res.setTimestamp(frame.getTimestamp());
+ res.setDuration(frame.getDuration());
+ res.setSequenceNumber(frame.getSequenceNumber());
+ res.setEOM(frame.isEOM());
+ res.setFormat(linear);
return frame;
}
=======================================
---
/trunk/servers/media/codecs/gsm/src/main/java/org/mobicents/media/server/impl/dsp/audio/gsm/Encoder.java
Wed Feb 2 05:01:45 2011
+++
/trunk/servers/media/codecs/gsm/src/main/java/org/mobicents/media/server/impl/dsp/audio/gsm/Encoder.java
Fri Mar 11 00:54:52 2011
@@ -18,7 +18,6 @@
package org.mobicents.media.server.impl.dsp.audio.gsm;
import org.mobicents.media.server.spi.dsp.Codec;
-import org.mobicents.media.server.spi.dsp.SignalingProcessor;
import org.mobicents.media.server.spi.format.Format;
import org.mobicents.media.server.spi.format.FormatFactory;
import org.mobicents.media.server.spi.memory.Frame;
@@ -50,8 +49,15 @@
Frame res = Memory.allocate(33);
encoder.encode(signal, res.getData());
+
res.setOffset(0);
res.setLength(33);
+ res.setTimestamp(frame.getTimestamp());
+ res.setDuration(frame.getDuration());
+ res.setSequenceNumber(frame.getSequenceNumber());
+ res.setEOM(frame.isEOM());
+ res.setFormat(gsm);
+
return res;
}
=======================================
---
/trunk/servers/media/codecs/speex/src/main/java/org/mobicents/media/server/impl/dsp/audio/speex/Decoder.java
Wed Feb 2 05:01:45 2011
+++
/trunk/servers/media/codecs/speex/src/main/java/org/mobicents/media/server/impl/dsp/audio/speex/Decoder.java
Fri Mar 11 00:54:52 2011
@@ -42,6 +42,7 @@
private final static int SAMPLE_RATE = 8000;
private final static int CHANNELS = 1;
private SpeexDecoder decoder = new SpeexDecoder();
+ private int len;
public Decoder() {
decoder.init(MODE_NB, SAMPLE_RATE, CHANNELS, ENHANCED);
@@ -71,11 +72,16 @@
* @see org.mobicents.media.server.impl.jmf.dsp.Codec#process(Buffer).
*/
public Frame process(Frame frame) {
- byte[] data = frame.getData();
Frame res = Memory.allocate(320);
- int len = process(data, 0, data.length, res.getData());
+ len = process(frame.getData(), 0, frame.getLength(),
res.getData());
+
res.setOffset(0);
res.setLength(len);
+ res.setTimestamp(frame.getTimestamp());
+ res.setDuration(frame.getDuration());
+ res.setSequenceNumber(frame.getSequenceNumber());
+ res.setEOM(frame.isEOM());
+
return res;
}
=======================================
---
/trunk/servers/media/codecs/speex/src/main/java/org/mobicents/media/server/impl/dsp/audio/speex/Encoder.java
Wed Feb 2 05:01:45 2011
+++
/trunk/servers/media/codecs/speex/src/main/java/org/mobicents/media/server/impl/dsp/audio/speex/Encoder.java
Fri Mar 11 00:54:52 2011
@@ -42,6 +42,7 @@
private final static int SAMPLE_RATE = 8000;
private final static int CHANNELS = 1;
private SpeexEncoder speexEncoder = new SpeexEncoder();
+ private int limit, len;
public Encoder() {
speexEncoder.init(MODE_NB, QUALITY, SAMPLE_RATE, CHANNELS);
@@ -108,15 +109,20 @@
*/
public Frame process(Frame frame) {
Frame res = Memory.allocate(320);
- //if packet not full we need to pad it with zeros
- byte[] temp = new byte[320];
- byte[] data = frame.getData();
-
- System.arraycopy(data, 0, temp, 0, data.length);
-
- int len = process(temp, 0, 320, res.getData());
+
+ //fill remainder with zeros
+ limit = Math.min(320, frame.getData().length);
+ for (int i = frame.getLength(); i < limit; i++) {
+ frame.getData()[i] = 0;
+ }
+
+ len = process(frame.getData(), 0, 320, res.getData());
res.setOffset(0);
res.setLength(len);
+ res.setTimestamp(frame.getTimestamp());
+ res.setDuration(frame.getDuration());
+ res.setSequenceNumber(frame.getSequenceNumber());
+ res.setEOM(frame.isEOM());
return res;
}
=======================================
---
/trunk/servers/media/component/src/main/java/org/mobicents/media/server/component/Splitter.java
Thu Mar 10 08:37:01 2011
+++
/trunk/servers/media/component/src/main/java/org/mobicents/media/server/component/Splitter.java
Fri Mar 11 00:54:52 2011
@@ -37,7 +37,7 @@
private final static int POOL_SIZE = 100;
//Input stream
- private Input input = new Input();
+ private final Input input;
//The pool of output streams
private ArrayList<Output> pool = new ArrayList(POOL_SIZE);
@@ -51,22 +51,11 @@
* Creates new Splitter.
*/
public Splitter(Scheduler scheduler) {
+ input = new Input(scheduler);
for (int i = 0; i < POOL_SIZE; i++) {
pool.add(new Output(scheduler));
}
}
-
- /**
- * Assigns scheduler.
- *
- * @param scheduler scheduler instance
- */
- public void setScheduler(Scheduler scheduler) {
- this.input.setScheduler(scheduler);
- for (int i = 0; i < POOL_SIZE; i++) {
- pool.get(i).setScheduler(scheduler);
- }
- }
/**
* Gets input stream.
@@ -106,8 +95,8 @@
/**
* Creates new stream.
*/
- public Input() {
- super("splitter.input");
+ public Input(Scheduler scheduler) {
+ super("splitter.input", scheduler);
}
@Override
=======================================
---
/trunk/servers/media/component/src/main/java/org/mobicents/media/server/component/audio/AudioMixer.java
Thu Mar 10 08:37:01 2011
+++
/trunk/servers/media/component/src/main/java/org/mobicents/media/server/component/audio/AudioMixer.java
Fri Mar 11 00:54:52 2011
@@ -68,26 +68,13 @@
public AudioMixer(Scheduler scheduler) {
this.scheduler = scheduler;
+ mixer = new MixTask(scheduler);
output = new Output(scheduler);
formats.add(format);
for (int i = 0; i < POOL_SIZE; i++) {
- pool.add(new Input());
+ pool.add(new Input(scheduler));
}
}
-
- /**
- * Assigns scheduler.
- *
- * @param scheduler scheduler instance
- */
- public void setScheduler(Scheduler scheduler) {
- this.scheduler = scheduler;
- this.output.setScheduler(scheduler);
- for (int i = 0; i < POOL_SIZE; i++) {
- pool.get(i).setScheduler(scheduler);
- }
- mixer = new MixTask(scheduler);
- }
/**
* Gets the format of the output stream.
@@ -177,8 +164,8 @@
/**
* Creates new stream
*/
- public Input() {
- super("mixer.input");
+ public Input(Scheduler scheduler) {
+ super("mixer.input", scheduler);
}
@Override
=======================================
---
/trunk/servers/media/component/src/main/java/org/mobicents/media/server/component/audio/SpectraAnalyzer.java
Wed Mar 9 05:40:24 2011
+++
/trunk/servers/media/component/src/main/java/org/mobicents/media/server/component/audio/SpectraAnalyzer.java
Fri Mar 11 00:54:52 2011
@@ -20,6 +20,7 @@
import java.io.IOException;
import java.util.ArrayList;
import org.mobicents.media.server.impl.AbstractSink;
+import org.mobicents.media.server.scheduler.Scheduler;
import org.mobicents.media.server.spi.format.AudioFormat;
import org.mobicents.media.server.spi.format.FormatFactory;
import org.mobicents.media.server.spi.format.Formats;
@@ -45,8 +46,8 @@
formats.add(LINEAR_AUDIO);
}
- public SpectraAnalyzer(String name) {
- super(name);
+ public SpectraAnalyzer(String name, Scheduler scheduler) {
+ super(name, scheduler);
}
@Override
=======================================
---
/trunk/servers/media/component/src/main/java/org/mobicents/media/server/impl/AbstractSink.java
Thu Mar 10 08:37:01 2011
+++
/trunk/servers/media/component/src/main/java/org/mobicents/media/server/impl/AbstractSink.java
Fri Mar 11 00:54:52 2011
@@ -40,23 +40,33 @@
*/
public abstract class AbstractSink extends BaseComponent implements
MediaSink {
+ //shows if component is started or not.
private volatile boolean started = false;
- private long packetsReceived;
- private long bytesReceived;
-
+
+
+ //transmission statisctics
+ private volatile long rxPackets;
+ private volatile long rxBytes;
+
+ //media transmission pipe
private PipeImpl pipe;
- private Scheduler scheduler;
- private Worker worker;
- private Transfer transfer;
+ //scheduler instance
+ private final Scheduler scheduler;
+
+ //receiver and transcoding task
+ private final Worker worker;
+
+ //media handler/transfer task
+ private final Transfer transfer;
//signaling processor
private Dsp dsp;
- //allowed formats
- private Formats formats = new Formats();
+ //active formats
+ private final Formats formats = new Formats();
//supported formats
- private Formats supportedFormats = new Formats();
+ private final Formats supportedFormats = new Formats();
private ConcurrentLinkedQueue<Frame> buffer = new
ConcurrentLinkedQueue();
@@ -65,11 +75,8 @@
*
* @param name the name of the sink to be created.
*/
- public AbstractSink(String name) {
+ public AbstractSink(String name, Scheduler scheduler) {
super(name);
- }
-
- public void setScheduler(Scheduler scheduler) {
this.scheduler = scheduler;
this.worker = new Worker(scheduler);
this.transfer = new Transfer(scheduler);
@@ -88,7 +95,8 @@
//rebuild list of supported formats
if (dsp == null) {
//no transcoding
- this.supportedFormats = this.getNativeFormats();
+ supportedFormats.clean();
+ supportedFormats.addAll(getNativeFormats());
return;
}
@@ -215,7 +223,7 @@
/**
* Restores synchronization
*/
- protected synchronized void wakeup() {
+ protected void wakeup() {
synchronized(worker) {
if (!this.started) {
started = true;
@@ -251,7 +259,7 @@
* @see org.mobicents.media.MediaSink#getPacketsReceived().
*/
public long getPacketsReceived() {
- return packetsReceived;
+ return rxPackets;
}
/**
@@ -260,13 +268,13 @@
* @see org.mobicents.media.MediaSink#getBytesReceived()
*/
public long getBytesReceived() {
- return bytesReceived;
+ return rxBytes;
}
@Override
public void reset() {
- this.packetsReceived = 0;
- this.bytesReceived = 0;
+ this.rxPackets = 0;
+ this.rxBytes = 0;
this.formats.clean();
this.formats.addAll(this.supportedFormats);
}
@@ -293,40 +301,55 @@
return null;
}
+ /**
+ * Receiver and transcoding task
+ */
private class Worker extends Task {
- private volatile long priority;
- private volatile long duration;
-
+ /**
+ * Creates new instance of task.
+ *
+ * @param scheduler scheduler.
+ */
public Worker(Scheduler scheduler) {
super(scheduler);
}
+ /**
+ * (Non Java-doc.)
+ *
+ * @see org.mobicents.media.server.scheduler.Task#getPriority()
+ */
public long getPriority() {
- return priority;
+ return 0;
}
- public void setPriority(long priority) {
- this.priority = priority;
- }
-
-
+ /**
+ * (Non Java-doc.)
+ *
+ * @see org.mobicents.media.server.scheduler.Task#getDuration()
+ */
public long getDuration() {
- return duration;
+ return 0;
}
- public synchronized long perform() {
- //cancel job if sink is not connected
+ /**
+ * (Non Java-doc.)
+ *
+ * @see org.mobicents.media.server.scheduler.Task#perform()
+ */
+ public long perform() {
if (pipe == null) {
+ //no source of data
started = false;
return 0;
}
- //try to read frame from pipe
+ //Reading next frame
Frame frame = pipe.read();
- //if frame is null then source is not ready yet
- //cancel this task as well till frame arrival from source
+
if (frame == null) {
+ //los of synchronization
started = false;
return 0;
}
@@ -339,21 +362,13 @@
buffer.offer(frame);
long frameDuration = frame.getDuration();
+ //schedule transfer/handlig task
transfer.setDeadLine(scheduler.getClock().getTime() +
frameDuration/2);
scheduler.submit(transfer);
-
-/* //frame is not null, let's handle it
- try {
- onMediaTransfer(frame);
- } catch (IOException e) {
- started = false;
- failed(e);
- return 0;
- }
-*/
- //if frame duration is not valid do not try to reschedule the
- //job
+
+ //check synchronization
if (frameDuration == 0 || frameDuration == Long.MAX_VALUE) {
+ //los of synchronization
started = false;
return 0;
}
@@ -371,6 +386,9 @@
}
}
+ /**
+ * Transfer task
+ */
private class Transfer extends Task {
private Transfer(Scheduler scheduler) {
=======================================
---
/trunk/servers/media/component/src/main/java/org/mobicents/media/server/impl/AbstractSource.java
Thu Mar 10 08:37:01 2011
+++
/trunk/servers/media/component/src/main/java/org/mobicents/media/server/impl/AbstractSource.java
Fri Mar 11 00:54:52 2011
@@ -71,10 +71,10 @@
private Dsp dsp;
//active formats
- private Formats formats = new Formats();
+ private final Formats formats = new Formats();
//supported formats
- private Formats supportedFormats = new Formats();
+ private final Formats supportedFormats = new Formats();
//temporary buffer
private ConcurrentLinkedQueue<Frame> buffer = new
ConcurrentLinkedQueue();
@@ -92,14 +92,6 @@
this.processor = new Processor(scheduler);
}
- /**
- * (Non Java-doc).
- *
- * @see org.mobicents.media.MediaSource#setScheduler(Scheduler);
- */
- public void setScheduler(Scheduler scheduler) {
- }
-
/**
* (Non Java-doc).
*
@@ -149,7 +141,8 @@
//rebuild list of supported formats
if (dsp == null) {
//no transcoding
- this.supportedFormats = this.getNativeFormats();
+ supportedFormats.clean();
+ supportedFormats.addAll(getNativeFormats());
return;
}
@@ -158,10 +151,10 @@
int fcount = fmts.size();
for (int i = 0; i < fcount; i++) {
- this.supportedFormats.add(fmts.get(i));
+ supportedFormats.add(fmts.get(i));
for (Codec c : dsp.getCodecs()) {
if (c.getSupportedInputFormat().matches(fmts.get(i))) {
-
this.supportedFormats.add(c.getSupportedOutputFormat());
+ supportedFormats.add(c.getSupportedOutputFormat());
}
}
}
@@ -186,7 +179,9 @@
*/
public void setFormats(Formats formats) {
supportedFormats.intersection(formats, this.formats);
- if (dsp != null) dsp.setFormats(this.formats);
+ if (dsp != null) {
+ dsp.setFormats(this.formats);
+ }
}
/**
@@ -235,8 +230,7 @@
}
/**
- * Softly starts source again.
- * This method is used when source has external synchronization.
+ * Restores synchronization
*/
public void wakeup() {
synchronized(worker) {
@@ -386,27 +380,43 @@
return null;
}
+ /**
+ * Media generator task
+ */
private class Worker extends Task {
- private volatile long priority;
- private volatile long duration;
-
+ /**
+ * Creates new instance of task.
+ *
+ * @param scheduler the scheduler instance.
+ */
public Worker(Scheduler scheduler) {
super(scheduler);
}
+ /**
+ * (Non Java-doc.)
+ *
+ * @see org.mobicents.media.server.scheduler.Task#getPriority()
+ */
public long getPriority() {
- return priority;
+ return 0;
}
- public void setPriority(long priority) {
- this.priority = priority;
- }
-
+ /**
+ * (Non Java-doc.)
+ *
+ * @see org.mobicents.media.server.scheduler.Task#getDuration()
+ */
public long getDuration() {
return duration;
}
+ /**
+ * (Non Java-doc.)
+ *
+ * @see org.mobicents.media.server.scheduler.Task#perform()
+ */
public long perform() {
//get next frame
Frame frame = evolve(timestamp);
@@ -471,7 +481,6 @@
/**
* Implements DSP and transmission tasks.
- *
*/
private class Processor extends Task {
=======================================
---
/trunk/servers/media/component/src/test/java/org/mobicents/media/server/component/SplitterTest.java
Thu Mar 10 08:37:01 2011
+++
/trunk/servers/media/component/src/test/java/org/mobicents/media/server/component/SplitterTest.java
Fri Mar 11 00:54:52 2011
@@ -33,9 +33,9 @@
private Sine sine;
- private SpectraAnalyzer analyzer1 = new SpectraAnalyzer("analyzer-1");
- private SpectraAnalyzer analyzer2 = new SpectraAnalyzer("analyzer-2");
- private SpectraAnalyzer analyzer3 = new SpectraAnalyzer("analyzer-3");
+ private SpectraAnalyzer analyzer1;
+ private SpectraAnalyzer analyzer2;
+ private SpectraAnalyzer analyzer3;
private Splitter splitter;
private NetworkChannel network;
@@ -65,7 +65,10 @@
network = new NetworkChannel(scheduler, 9201);
scheduler.submit(network, 0);
- splitter.setScheduler(scheduler);
+ analyzer1 = new SpectraAnalyzer("analyzer-1", scheduler);
+ analyzer2 = new SpectraAnalyzer("analyzer-1", scheduler);
+ analyzer3 = new SpectraAnalyzer("analyzer-1", scheduler);
+
MediaSource output1 = splitter.newOutput();
MediaSource output2 = splitter.newOutput();
@@ -87,11 +90,6 @@
pipe4.connect(sine);
pipe4.connect(splitter.getInput());
- analyzer1.setScheduler(scheduler);
- analyzer2.setScheduler(scheduler);
- analyzer3.setScheduler(scheduler);
-
- sine.setScheduler(scheduler);
sine.setFrequency(50);
output1.start();
=======================================
---
/trunk/servers/media/component/src/test/java/org/mobicents/media/server/component/audio/AudioMixerTest.java
Thu Mar 10 08:37:01 2011
+++
/trunk/servers/media/component/src/test/java/org/mobicents/media/server/component/audio/AudioMixerTest.java
Fri Mar 11 00:54:52 2011
@@ -36,7 +36,7 @@
private Sine sine2;
private Sine sine3;
- private SpectraAnalyzer analyzer = new SpectraAnalyzer("analyzer");
+ private SpectraAnalyzer analyzer;
private AudioMixer mixer;
private NetworkChannel network;
@@ -66,13 +66,13 @@
sine1 = new Sine(scheduler);
sine2 = new Sine(scheduler);
sine3 = new Sine(scheduler);
-
+ analyzer = new SpectraAnalyzer("analyzer", scheduler);
+
mixer = new AudioMixer(scheduler);
network = new NetworkChannel(scheduler, 9201);
scheduler.submit(network, 0);
- mixer.setScheduler(scheduler);
input1 = mixer.newInput();
input2 = mixer.newInput();
@@ -94,11 +94,6 @@
pipe4.connect(analyzer);
pipe4.connect(mixer.getOuput());
- sine1.setScheduler(scheduler);
- sine2.setScheduler(scheduler);
- sine3.setScheduler(scheduler);
-
- analyzer.setScheduler(scheduler);
sine1.setAmplitude((short)(Short.MAX_VALUE / 4));
sine2.setAmplitude((short)(Short.MAX_VALUE / 4));
=======================================
---
/trunk/servers/media/component/src/test/java/org/mobicents/media/server/component/audio/SineTest.java
Thu Mar 10 08:37:01 2011
+++
/trunk/servers/media/component/src/test/java/org/mobicents/media/server/component/audio/SineTest.java
Fri Mar 11 00:54:52 2011
@@ -29,7 +29,7 @@
private Scheduler scheduler;
private Sine sine;
- private SpectraAnalyzer analyzer = new SpectraAnalyzer("analyzer");
+ private SpectraAnalyzer analyzer;
private NetworkChannel channel;
@@ -56,15 +56,14 @@
scheduler.submit(channel, 0);
sine = new Sine(scheduler);
+ analyzer = new SpectraAnalyzer("analyzer", scheduler);
+
Pipe pipe = new PipeImpl();
pipe.connect(sine);
pipe.connect(analyzer);
- sine.setScheduler(scheduler);
- analyzer.setScheduler(scheduler);
-
sine.setFrequency(50);
}
=======================================
---
/trunk/servers/media/component/src/test/java/org/mobicents/media/server/component/audio/TranscodingTest.java
Thu Mar 10 08:37:01 2011
+++
/trunk/servers/media/component/src/test/java/org/mobicents/media/server/component/audio/TranscodingTest.java
Fri Mar 11 00:54:52 2011
@@ -36,7 +36,7 @@
private Scheduler scheduler;
private Sine sine;
- private SpectraAnalyzer analyzer = new SpectraAnalyzer("analyzer");
+ private SpectraAnalyzer analyzer;
private NetworkChannel channel;
private Dsp dsp1, dsp2;
@@ -73,15 +73,13 @@
scheduler.submit(channel, 0);
sine = new Sine(scheduler);
+ analyzer = new SpectraAnalyzer("analyzer", scheduler);
Pipe pipe = new PipeImpl();
pipe.connect(sine);
pipe.connect(analyzer);
- sine.setScheduler(scheduler);
- analyzer.setScheduler(scheduler);
-
sine.setDsp(dsp1);
analyzer.setDsp(dsp2);
@@ -101,6 +99,7 @@
@Test
public void testSetFormats() {
+ System.out.println("****************************");
Formats fmts = sine.getFormats();
assertEquals(1, fmts.size());
assertTrue(fmts.get(0).matches((FormatFactory.createAudioFormat("pcma",
8000, 8, 1))));
=======================================
---
/trunk/servers/media/component/src/test/java/org/mobicents/media/server/impl/AbstractComponentTest.java
Thu Mar 10 08:37:01 2011
+++
/trunk/servers/media/component/src/test/java/org/mobicents/media/server/impl/AbstractComponentTest.java
Fri Mar 11 00:54:52 2011
@@ -135,7 +135,7 @@
private class TestSink extends AbstractSink {
public TestSink(String name) {
- super(name);
+ super(name, null);
}
public Formats getNativeFormats() {
=======================================
---
/trunk/servers/media/component/src/test/java/org/mobicents/media/server/impl/PipeImplTest.java
Thu Mar 10 08:37:01 2011
+++
/trunk/servers/media/component/src/test/java/org/mobicents/media/server/impl/PipeImplTest.java
Fri Mar 11 00:54:52 2011
@@ -40,7 +40,7 @@
private int count;
private MyTestSource source;
- private MyTestSink sink = new MyTestSink();
+ private MyTestSink sink;
static {
formats.add(fmt);
@@ -65,13 +65,11 @@
scheduler.start();
source = new MyTestSource(scheduler);
+ sink = new MyTestSink(scheduler);
channel = new NetworkChannel(scheduler, 9201);
scheduler.submit(channel, 0);
- source.setScheduler(scheduler);
- sink.setScheduler(scheduler);
-
count = 0;
}
@@ -135,8 +133,8 @@
private class MyTestSink extends AbstractSink {
- public MyTestSink() {
- super("test-sink");
+ public MyTestSink(Scheduler scheduler) {
+ super("test-sink", scheduler);
}
@Override
=======================================
---
/trunk/servers/media/spi/src/main/java/org/mobicents/media/MediaSink.java
Wed Mar 9 05:40:24 2011
+++
/trunk/servers/media/spi/src/main/java/org/mobicents/media/MediaSink.java
Fri Mar 11 00:54:52 2011
@@ -31,14 +31,6 @@
*/
public interface MediaSink extends Component {
- /**
- * Assigns joh scheduler for this media sink.
- * Ussage of this scheduler only allewed.
- *
- * @param scheduler the instance of scheduler.
- */
- public void setScheduler(Scheduler scheduler);
-
/**
* Starts media processing.
*/
=======================================
---
/trunk/servers/media/spi/src/main/java/org/mobicents/media/MediaSource.java
Wed Mar 9 05:40:24 2011
+++
/trunk/servers/media/spi/src/main/java/org/mobicents/media/MediaSource.java
Fri Mar 11 00:54:52 2011
@@ -32,14 +32,6 @@
*/
public interface MediaSource extends Component {
- /**
- * Assigns joh scheduler for this media source.
- * Ussage of this scheduler only allewed.
- *
- * @param scheduler the instance of scheduler.
- */
- public void setScheduler(Scheduler scheduler);
-
/**
* Starts media processing.
*/
=======================================
---
/trunk/servers/media/spi/src/test/java/org/mobicents/media/server/spi/format/AudioFormatTest.java
Wed Mar 9 07:25:49 2011
+++
/trunk/servers/media/spi/src/test/java/org/mobicents/media/server/spi/format/AudioFormatTest.java
Fri Mar 11 00:54:52 2011
@@ -70,7 +70,7 @@
@Test
public void testMatch() {
AudioFormat f1 = FormatFactory.createAudioFormat("linear", 8000,
16, 1);
- AudioFormat f2 = FormatFactory.createAudioFormat("LINEAR", 8000,
8, 1);
+ AudioFormat f2 = FormatFactory.createAudioFormat("LINEAR", 8000,
16, 1);
assertTrue("Formats must match", f1.matches(f2));
}