Revision: e4a4cebdc0ed
Author: unknown <sipme yulian@sipmeyulian-PC.(none)>
Date: Tue Jul 17 06:52:24 2012
Log: Added Exception logging to Rtp Data Channel + Task
Optimized queues of frames
http://code.google.com/p/mediaserver/source/detail?r=e4a4cebdc0ed
Added:
/.gitignore
/jsr-309/.gitignore
/media-server-docs/jdocbook-mobicents/.gitignore
/media-server-docs/sources-mobicents/.gitignore
/media-server-docs/sources/.gitignore
/resources/telephony/tone/.gitignore
Modified:
/component/src/main/java/org/mobicents/media/server/component/Splitter.java
/component/src/main/java/org/mobicents/media/server/component/audio/AudioMixer.java
/io/rtp/src/main/java/org/mobicents/media/server/impl/rtp/RTPDataChannel.java
/io/ss7/src/main/java/org/mobicents/media/server/io/ss7/SS7Input.java
/media-server-docs/sources-mobicents/src/main/resources/META-INF/MANIFEST.MF
/media-server-docs/sources-mobicents/src/main/resources/META-INF/maven/org.mobicents.media.docs/mobicents-mms-docs-sources/pom.properties
/scheduler/src/main/java/org/mobicents/media/server/scheduler/Scheduler.java
/scheduler/src/main/java/org/mobicents/media/server/scheduler/Task.java
=======================================
--- /dev/null
+++ /.gitignore Tue Jul 17 06:52:24 2012
@@ -0,0 +1,15 @@
+/.project
+
+# ignore .svn metadata files
+.svn
+# ignore Maven generated target folders
+~
+target
+classes
+*.zip
+
+# temp files
+*~
+
+# Ignore Maven target/ dirs
+/**/target/**/*
=======================================
--- /dev/null
+++ /jsr-309/.gitignore Tue Jul 17 06:52:24 2012
@@ -0,0 +1,1 @@
+/target
=======================================
--- /dev/null
+++ /media-server-docs/jdocbook-mobicents/.gitignore Tue Jul 17 06:52:24
2012
@@ -0,0 +1,1 @@
+/target
=======================================
--- /dev/null
+++ /media-server-docs/sources-mobicents/.gitignore Tue Jul 17 06:52:24 2012
@@ -0,0 +1,1 @@
+/target
=======================================
--- /dev/null
+++ /media-server-docs/sources/.gitignore Tue Jul 17 06:52:24 2012
@@ -0,0 +1,1 @@
+/target
=======================================
--- /dev/null
+++ /resources/telephony/tone/.gitignore Tue Jul 17 06:52:24 2012
@@ -0,0 +1,1 @@
+/target
=======================================
---
/component/src/main/java/org/mobicents/media/server/component/Splitter.java
Fri Feb 17 05:07:24 2012
+++
/component/src/main/java/org/mobicents/media/server/component/Splitter.java
Tue Jul 17 06:52:24 2012
@@ -176,10 +176,11 @@
while(activeOutputs.hasNext())
{
Output output=activeOutputs.next();
- if (output.buffer.size() < Output.limit) {
- output.buffer.offer((Frame)currFrame.clone());
- output.wakeup();
- }
+ if (output.buffer.size() > Output.limit)
+ output.buffer.poll().recycle();
+
+ output.buffer.offer((Frame)currFrame.clone());
+ output.wakeup();
}
//recycle original frame
@@ -194,7 +195,7 @@
*/
private class Output extends AbstractSource {
//buffer limit
- private final static int limit = 5;
+ private final static int limit = 1;
private int outputId;
//transmission buffer
=======================================
---
/component/src/main/java/org/mobicents/media/server/component/audio/AudioMixer.java
Fri Jun 1 08:57:08 2012
+++
/component/src/main/java/org/mobicents/media/server/component/audio/AudioMixer.java
Tue Jul 17 06:52:24 2012
@@ -230,8 +230,8 @@
*/
private class Input extends AbstractSink {
private int inputId;
- //50 frames is too much , 5 frames equals 100ms
- private int limit=5;
+ //50 frames is too much , 2 frames is more then enough
+ private int limit=3;
private ConcurrentLinkedList<Frame> buffer = new
ConcurrentLinkedList();
private Frame activeFrame=null;
private byte[] activeData;
@@ -257,9 +257,6 @@
public void onMediaTransfer(Frame frame) throws IOException {
//generate frames with correct size here , aggregate frames if
needed.
//allows to accept several sources with different ptime ( packet
time )
- if (buffer.size() >= limit)
- buffer.poll().recycle();
-
oldData=frame.getData();
for(int i=0;i<oldData.length;i++)
{
@@ -276,7 +273,10 @@
if(byteIndex>=activeData.length)
{
- buffer.offer(activeFrame);
+ if (buffer.size() >= limit)
+ buffer.poll().recycle();
+
+ buffer.offer(activeFrame);
activeFrame=null;
activeData=null;
}
@@ -480,7 +480,10 @@
frame.setDuration(period);
frame.setFormat(format);
- //finita la comedia
+ //lets remove packet if we have too much
+ if(output.buffer.size()>1)
+ output.buffer.poll().recycle();
+
output.buffer.offer(frame);
scheduler.submit(this,scheduler.MIXER_MIX_QUEUE);
output.wakeup();
=======================================
---
/io/rtp/src/main/java/org/mobicents/media/server/impl/rtp/RTPDataChannel.java
Sun Jul 1 07:11:22 2012
+++
/io/rtp/src/main/java/org/mobicents/media/server/impl/rtp/RTPDataChannel.java
Tue Jul 17 06:52:24 2012
@@ -242,7 +242,8 @@
try {
dataChannel.disconnect();
}
- catch (IOException e) {
+ catch (IOException e) {
+ logger.error(e);
}
connectImmediately=rtpManager.udpManager.connectImmediately((InetSocketAddress)address);
@@ -250,7 +251,8 @@
try {
dataChannel.connect(address);
}
- catch (IOException e) {
+ catch (IOException e) {
+ logger.error(e);
}
}
@@ -273,13 +275,15 @@
try {
dataChannel.disconnect();
}
- catch(IOException e) {
+ catch(IOException e) {
+ logger.error(e);
}
try {
dataChannel.socket().close();
dataChannel.close();
- } catch(IOException e) {
+ } catch(IOException e) {
+ logger.error(e);
}
if (controlChannel != null) {
@@ -477,7 +481,7 @@
}
}
catch (Exception e) {
- //TODO: handle error
+ logger.error(e);
}
}
@@ -503,7 +507,8 @@
else if(currAddress!=null && rxCount==0)
rxBuffer.restart();
}
- catch (IOException e) {
+ catch (IOException e) {
+ logger.error(e);
}
while (currAddress != null) {
@@ -526,7 +531,7 @@
currAddress=dataChannel.receive(rtpPacket.getBuffer());
}
} catch (Exception e) {
- //TODO: handle error
+ logger.error(e);
}
rtpHandler.isReading = false;
@@ -592,7 +597,7 @@
txCount++;
}
} catch (Exception e) {
- //TODO : handle IO problems
+ logger.error(e);
}
}
}
=======================================
--- /io/ss7/src/main/java/org/mobicents/media/server/io/ss7/SS7Input.java
Wed Jul 11 09:28:19 2012
+++ /io/ss7/src/main/java/org/mobicents/media/server/io/ss7/SS7Input.java
Tue Jul 17 06:52:24 2012
@@ -185,7 +185,7 @@
System.arraycopy(smallBuffer, currIndex, tempBuffer, currPosition,
readBytes-currIndex);
//lets keep 2 last packets all the time,there is no reason to keep
more
- if(framesBuffer.size()>2)
+ if(framesBuffer.size()>1)
framesBuffer.remove(0);
framesBuffer.add(currFrame);
=======================================
---
/media-server-docs/sources-mobicents/src/main/resources/META-INF/MANIFEST.MF
Wed Jul 11 09:28:19 2012
+++
/media-server-docs/sources-mobicents/src/main/resources/META-INF/MANIFEST.MF
Tue Jul 17 06:52:24 2012
@@ -2,7 +2,7 @@
Archiver-Version: Plexus Archiver
Created-By: Apache Maven Bundle Plugin
Built-By: sipme yulian
-Build-Jdk: 1.7.0_04
+Build-Jdk: 1.6.0_31
Implementation-Title: org.mobicents.media.docs:mobicents-mms-docs-sour
ces
Implementation-Version: 2.4.0.FINAL
@@ -13,7 +13,7 @@
Bundle-Vendor: TeleStax, Inc.
Implementation-Vendor-Id: TeleStax, Inc.
Bundle-Version: 2.4.0.FINAL
-Bnd-LastModified: 1342023136734
+Bnd-LastModified: 1342532509834
Bundle-ManifestVersion: 2
Bundle-License: http://www.gnu.org/licenses/lgpl-2.1.html
Bundle-Description: Mobicents :: Parent pom for 2.x releases
=======================================
---
/media-server-docs/sources-mobicents/src/main/resources/META-INF/maven/org.mobicents.media.docs/mobicents-mms-docs-sources/pom.properties
Wed Jul 11 09:28:19 2012
+++
/media-server-docs/sources-mobicents/src/main/resources/META-INF/maven/org.mobicents.media.docs/mobicents-mms-docs-sources/pom.properties
Tue Jul 17 06:52:24 2012
@@ -1,5 +1,5 @@
#Generated by Maven
-#Wed Jul 11 19:12:16 IDT 2012
+#Tue Jul 17 16:41:49 IDT 2012
version=2.4.0.FINAL
groupId=org.mobicents.media.docs
artifactId=mobicents-mms-docs-sources
=======================================
---
/scheduler/src/main/java/org/mobicents/media/server/scheduler/Scheduler.java
Sun Jul 1 07:11:22 2012
+++
/scheduler/src/main/java/org/mobicents/media/server/scheduler/Scheduler.java
Tue Jul 17 06:52:24 2012
@@ -46,7 +46,7 @@
* and other parameters.
*
*
- * @author kulikov
+ * @author Oifa Yulian
*/
public class Scheduler {
public static final Integer RECEIVER_QUEUE=0;
=======================================
--- /scheduler/src/main/java/org/mobicents/media/server/scheduler/Task.java
Tue Feb 21 14:42:14 2012
+++ /scheduler/src/main/java/org/mobicents/media/server/scheduler/Task.java
Tue Jul 17 06:52:24 2012
@@ -24,10 +24,12 @@
import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.log4j.Logger;
+
/**
* Scheduling task.
*
- * @author kulikov
+ * @author Oifa Yulian
*/
public abstract class Task implements Runnable {
protected Scheduler scheduler;
@@ -45,6 +47,8 @@
private AtomicBoolean inQueue0=new AtomicBoolean(false);
private AtomicBoolean inQueue1=new AtomicBoolean(false);
+ private Logger logger = Logger.getLogger(Scheduler.class) ;
+
public Task(Scheduler scheduler) {
this.scheduler = scheduler;
}
@@ -136,7 +140,10 @@
//submit next partition
// if (chain != null) chain.continueExecution();
} catch (Exception e) {
- if (this.listener != null)
listener.handlerError(e);
+ if (this.listener != null)
+ listener.handlerError(e);
+ else
+ logger.error(e);
}
}