Revision: 16270
Author: oleg.kulikoff
Date: Sat Jan 8 09:33:14 2011
Log: Changed DTMF detector SPI
http://code.google.com/p/mobicents/source/detail?r=16270
Added:
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/dtmf/DtmfEventImpl.java
Deleted:
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/dtmf/DtmfEvent.java
Modified:
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/dtmf/DetectorImpl.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/dtmf/GeneratorImpl.java
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/rtp/SendStream.java
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/rtp/rfc2833/DtmfConverter.java
=======================================
--- /dev/null
+++
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/dtmf/DtmfEventImpl.java
Sat Jan 8 09:33:14 2011
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright XXXX, Red Hat Middleware LLC, and individual contributors as
indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a full listing
+ * of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License, v. 2.0.
+ * This program is distributed in the hope that it will be useful, but
WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License,
+ * v. 2.0 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.mobicents.media.server.impl.resource.dtmf;
+
+import org.mobicents.media.server.spi.dtmf.DtmfDetector;
+import org.mobicents.media.server.spi.dtmf.DtmfEvent;
+
+/**
+ *
+ * @author kulikov
+ */
+public class DtmfEventImpl implements DtmfEvent {
+
+ private DtmfDetector source;
+ private int volume;
+ private String tone;
+
+ public DtmfEventImpl(DtmfDetector source, String tone, int volume) {
+ this.source = source;
+ this.volume = volume;
+ this.tone = tone;
+ }
+
+ public int getVolume() {
+ return volume;
+ }
+
+
+ public DtmfDetector getSource() {
+ return source;
+ }
+
+ public String getTone() {
+ return tone;
+ }
+}
=======================================
---
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/dtmf/DtmfEvent.java
Tue May 4 23:31:18 2010
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright XXXX, Red Hat Middleware LLC, and individual contributors as
indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a full listing
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License, v. 2.0.
- * This program is distributed in the hope that it will be useful, but
WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License,
- * v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.mobicents.media.server.impl.resource.dtmf;
-
-import org.mobicents.media.server.impl.BaseComponent;
-import org.mobicents.media.server.impl.NotifyEventImpl;
-
-/**
- *
- * @author kulikov
- */
-public class DtmfEvent extends NotifyEventImpl {
-
- public final static int DTMF_0 = 0;
- public final static int DTMF_1 = 1;
- public final static int DTMF_2 = 2;
- public final static int DTMF_3 = 3;
- public final static int DTMF_4 = 4;
- public final static int DTMF_5 = 5;
- public final static int DTMF_6 = 6;
- public final static int DTMF_7 = 7;
- public final static int DTMF_8 = 8;
- public final static int DTMF_9 = 9;
- public final static int DTMF_A = 10;
- public final static int DTMF_B = 11;
- public final static int DTMF_C = 12;
- public final static int DTMF_D = 13;
- public final static int DTMF_HASH = 14;
- public final static int DTMF_STAR = 15;
- private int volume;
-
-
- public DtmfEvent(BaseComponent source, int eventID, int volume) {
- super(source, eventID,"Dtmf");
- this.volume = volume;
- }
-
- public int getVolume() {
- return volume;
- }
-
- public static int getId(String evt) {
- if (evt.equals("0")) {
- return DTMF_0;
- } else if (evt.equals("1")) {
- return DTMF_1;
- } else if (evt.equals("2")) {
- return DTMF_2;
- } else if (evt.equals("3")) {
- return DTMF_3;
- } if (evt.equals("4")) {
- return DTMF_4;
- } else if (evt.equals("5")) {
- return DTMF_5;
- } if (evt.equals("6")) {
- return DTMF_6;
- } else if (evt.equals("7")) {
- return DTMF_7;
- } if (evt.equals("8")) {
- return DTMF_8;
- } else if (evt.equals("8")) {
- return DTMF_8;
- } if (evt.equals("9")) {
- return DTMF_9;
- } else if (evt.equals("A")) {
- return DTMF_A;
- } if (evt.equals("B")) {
- return DTMF_B;
- } else if (evt.equals("C")) {
- return DTMF_C;
- } if (evt.equals("D")) {
- return DTMF_D;
- } else if (evt.equals("#")) {
- return DTMF_HASH;
- } else if (evt.equals("*")) {
- return DTMF_STAR;
- } else {
- return -1;
- }
- }
-}
=======================================
---
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/dtmf/DetectorImpl.java
Sat Jan 8 01:33:59 2011
+++
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/dtmf/DetectorImpl.java
Sat Jan 8 09:33:14 2011
@@ -28,7 +28,10 @@
import org.mobicents.media.server.spi.NotificationListener;
import org.mobicents.media.server.spi.dsp.Codec;
import org.mobicents.media.server.spi.dsp.CodecFactory;
-import org.mobicents.media.server.spi.resource.DtmfDetector;
+import org.mobicents.media.server.spi.dtmf.DtmfDetector;
+import org.mobicents.media.server.spi.dtmf.DtmfDetectorListener;
+import org.mobicents.media.server.spi.listener.Listeners;
+import org.mobicents.media.server.spi.listener.TooManyListenersException;
/**
* Implements inband DTMF detector.
@@ -97,7 +100,8 @@
private Codec codec;
private final static ArrayList<CodecFactory> codecFactories = new
ArrayList();
-
+ private Listeners<DtmfDetectorListener> listeners = new Listeners();
+
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());
@@ -194,8 +198,8 @@
*/
public void onMediaTransfer(Buffer buffer) throws IOException {
if (buffer.getHeader() != null) {
- DtmfEvent evt = (DtmfEvent) buffer.getHeader();
- dtmfBuffer.push(evtID[evt.getEventID()]);
+ DtmfEventImpl evt = (DtmfEventImpl) buffer.getHeader();
+ dtmfBuffer.push(evt.getTone());
return;
}
@@ -348,11 +352,10 @@
return dtmfBuffer.getInterdigitInterval();
}
- protected void fireEvent(int eventID) {
- DtmfEvent dtmfEvent = new DtmfEvent(this, eventID, 0);
- super.sendEvent(dtmfEvent);
- }
-
+ protected void fireEvent(String tone) {
+ listeners.dispatch(new DtmfEventImpl(this, tone, 0));
+ }
+
public void flushBuffer() {
dtmfBuffer.flush();
}
@@ -365,7 +368,14 @@
@Override
public void addListener(NotificationListener listener) {
super.addListener(listener);
-
+ }
+
+ public void addListener(DtmfDetectorListener listener) throws
TooManyListenersException {
+ listeners.add(listener);
+ }
+
+ public void removeListener(DtmfDetectorListener listener) {
+ listeners.remove(listener);
}
}
=======================================
---
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/dtmf/DtmfBuffer.java
Sat Jan 8 01:33:59 2011
+++
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/dtmf/DtmfBuffer.java
Sat Jan 8 09:33:14 2011
@@ -20,7 +20,6 @@
import java.io.Serializable;
import java.util.concurrent.ConcurrentLinkedQueue;
import org.apache.log4j.Logger;
-import org.mobicents.media.server.spi.NotificationListener;
/**
* Implements digit buffer.
@@ -64,55 +63,11 @@
lastSymbol = symbol;
logger.info("Send " + symbol);
- detector.fireEvent(eventID(symbol));
- }
- }
-
- private int eventID(String symbol) {
- if (symbol.equals("0")) {
- return DtmfEvent.DTMF_0;
- } else if (symbol.equals("1")) {
- return DtmfEvent.DTMF_1;
- } else if (symbol.equals("2")) {
- return DtmfEvent.DTMF_2;
- } else if (symbol.equals("3")) {
- return DtmfEvent.DTMF_3;
- } else if (symbol.equals("4")) {
- return DtmfEvent.DTMF_4;
- } else if (symbol.equals("5")) {
- return DtmfEvent.DTMF_5;
- } else if (symbol.equals("6")) {
- return DtmfEvent.DTMF_6;
- } else if (symbol.equals("7")) {
- return DtmfEvent.DTMF_7;
- } else if (symbol.equals("8")) {
- return DtmfEvent.DTMF_8;
- } else if (symbol.equals("9")) {
- return DtmfEvent.DTMF_9;
- } else if (symbol.equals("A")) {
- return DtmfEvent.DTMF_A;
- } else if (symbol.equals("B")) {
- return DtmfEvent.DTMF_B;
- } else if (symbol.equals("C")) {
- return DtmfEvent.DTMF_C;
- } else if (symbol.equals("D")) {
- return DtmfEvent.DTMF_D;
- } else if (symbol.equals("*")) {
- return DtmfEvent.DTMF_STAR;
- } else if (symbol.equals("#")) {
- return DtmfEvent.DTMF_HASH;
- } else {
- return -1;
+ detector.fireEvent(symbol);
}
}
public void flush() {
queue.clear();
- }
-
- protected void receive(NotificationListener listener) {
- while (!queue.isEmpty()) {
- listener.update(new DtmfEvent(detector, eventID(queue.poll()),
0));
- }
- }
-}
+ }
+}
=======================================
---
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/dtmf/GeneratorImpl.java
Wed Jun 30 02:26:17 2010
+++
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/dtmf/GeneratorImpl.java
Sat Jan 8 09:33:14 2011
@@ -182,7 +182,7 @@
data[k++] = (byte) v;
data[k++] = (byte) (v >> 8);
}
- buffer.setHeader(new DtmfEvent(this, DtmfEvent.getId(digit),
volume));
+ buffer.setHeader(new DtmfEventImpl(null, digit, volume));
buffer.setData(data);
buffer.setOffset(0);
buffer.setLength(2* frameSize);
=======================================
---
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/rtp/SendStream.java
Fri Nov 5 02:26:07 2010
+++
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/rtp/SendStream.java
Sat Jan 8 09:33:14 2011
@@ -24,7 +24,7 @@
import org.mobicents.media.Format;
import org.mobicents.media.MediaSource;
import org.mobicents.media.server.impl.AbstractSink;
-import org.mobicents.media.server.impl.resource.dtmf.DtmfEvent;
+import org.mobicents.media.server.impl.resource.dtmf.DtmfEventImpl;
import org.mobicents.media.server.spi.dsp.Codec;
import org.mobicents.media.server.spi.rtp.AVProfile;
@@ -118,9 +118,9 @@
int timestamp = (int) clock.getTimestamp(buffer.getTimeStamp());
- if (buffer.getHeader() != null && buffer.getHeader() instanceof
DtmfEvent && dtmf > 0) {
- DtmfEvent evt = (DtmfEvent) buffer.getHeader();
- int digit = evt.getEventID();
+ if (buffer.getHeader() != null && buffer.getHeader() instanceof
DtmfEventImpl && dtmf > 0) {
+ DtmfEventImpl evt = (DtmfEventImpl) buffer.getHeader();
+ int digit = Integer.valueOf(evt.getTone());
int volume = evt.getVolume();
byte[] data = new byte[4];
=======================================
---
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/rtp/rfc2833/DtmfConverter.java
Thu Jul 15 23:41:30 2010
+++
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/rtp/rfc2833/DtmfConverter.java
Sat Jan 8 09:33:14 2011
@@ -23,7 +23,7 @@
import org.mobicents.media.Format;
import org.mobicents.media.Server;
import org.mobicents.media.format.AudioFormat;
-import org.mobicents.media.server.impl.resource.dtmf.DtmfEvent;
+import org.mobicents.media.server.impl.resource.dtmf.DtmfEventImpl;
import org.mobicents.media.server.impl.rtp.RtpClock;
import org.mobicents.media.server.impl.rtp.RtpPacket;
import org.mobicents.media.server.spi.dsp.Codec;
@@ -151,7 +151,7 @@
data[k++] = (byte) (v >> 8);
}
- buffer.setHeader(new DtmfEvent(null, DtmfEvent.getId(digit),
volume));
+ buffer.setHeader(new DtmfEventImpl(null, digit, volume));
buffer.setData(data);
buffer.setOffset(0);
buffer.setLength(320);