Commit d62cfc8e authored by Dele Olajide's avatar Dele Olajide

Jitsi Videobridge : Updated videobridge engine

parent 637cc817
Some of the files here, notably libjitsi.jar, are OSGi bundles from the Jitsi Some of the files here, notably libjitsi.jar, are OSGi bundles from the Jitsi
project. In Jitsi they are generated in the 'sc-bundles' directory by the project. In Jitsi they are generated in the 'sc-bundles' directory by the
'bundles' ant target. To update the files here, run 'ant rebuild' in Jitsi and 'bundles' ant target. To update the files here, run 'ant rebuild' in Jitsi and
then copy the files here, e.g.: then copy the files here, e.g.:
for f in *.jar; do for f in *.jar; do
if [ -e ../../jitsi/sc-bundles/$f ]; then if [ -e ../../jitsi/sc-bundles/$f ]; then
cp ../../jitsi/sc-bundles/$f .; cp ../../jitsi/sc-bundles/$f .;
fi; fi;
done done
handlers= java.util.logging.ConsoleHandler
java.util.logging.ConsoleHandler.level = ALL
java.util.logging.ConsoleHandler.formatter = net.java.sip.communicator.util.ScLogFormatter
.level=INFO
# FIXME: remove once RTT issue is fixed
org.jitsi.impl.neomedia.MediaStreamStatsImpl.level=WARNING
\ No newline at end of file
...@@ -946,7 +946,7 @@ function handleOffer (from, offer) ...@@ -946,7 +946,7 @@ function handleOffer (from, offer)
$(this).find('source').each(function() $(this).find('source').each(function()
{ {
var ssrc = $(this).attr('ssrc'); var ssrc = $(this).attr('ssrc');
if (ssrc) if (ssrc)
{ {
......
...@@ -214,10 +214,25 @@ public abstract class RTPConnectorInputStream ...@@ -214,10 +214,25 @@ public abstract class RTPConnectorInputStream
if (pkt == null) if (pkt == null)
pkt = new RawPacket(); pkt = new RawPacket();
pkt.setBuffer(datagramPacket.getData()); byte[] buffer = pkt.getBuffer();
int length = datagramPacket.getLength();
if (buffer == null || buffer.length < length)
{
buffer = new byte[length];
pkt.setBuffer(buffer);
}
System.arraycopy(
datagramPacket.getData(),
datagramPacket.getOffset(),
buffer,
0,
length);
pkt.setBuffer(buffer);
pkt.setOffset(0);
pkt.setLength(length);
pkt.setFlags(0); pkt.setFlags(0);
pkt.setLength(datagramPacket.getLength());
pkt.setOffset(datagramPacket.getOffset());
pkts[0] = pkt; pkts[0] = pkt;
return pkts; return pkts;
...@@ -679,4 +694,4 @@ public abstract class RTPConnectorInputStream ...@@ -679,4 +694,4 @@ public abstract class RTPConnectorInputStream
this.enabled = enabled; this.enabled = enabled;
} }
} }
\ No newline at end of file
...@@ -1519,7 +1519,7 @@ public class PluginImpl implements Plugin, PropertyEventListener ...@@ -1519,7 +1519,7 @@ public class PluginImpl implements Plugin, PropertyEventListener
if (vbContent != null) if (vbContent != null)
{ {
RtpChannel videoChannel = (RtpChannel) vbContent.getChannel(participant.videoChannelId); Channel videoChannel = (Channel) vbContent.getChannel(participant.videoChannelId);
if (videoChannel != null) if (videoChannel != null)
{ {
...@@ -1537,7 +1537,7 @@ public class PluginImpl implements Plugin, PropertyEventListener ...@@ -1537,7 +1537,7 @@ public class PluginImpl implements Plugin, PropertyEventListener
if (vbContent != null) if (vbContent != null)
{ {
RtpChannel audioChannel = (RtpChannel) vbContent.getChannel(participant.audioChannelId); Channel audioChannel = (Channel) vbContent.getChannel(participant.audioChannelId);
if (audioChannel != null) if (audioChannel != null)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment