BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- handle (discard) RTCP packets properly

Browse Source
This commit is contained in:
Richard Alam 2010-09-21 12:21:22 -04:00
parent 9cfb18bddb
commit 54fa14a809
3 changed files with 43 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/RtpStreamReceiver.java
View File

@ -82,21 +82,33 @@ public class RtpStreamReceiver {
public void receiveRtpPackets() {
int packetReceivedCounter = 0;
int internalBufferLength = payloadLength + RTP_HEADER_SIZE;
byte[] internalBuffer = new byte[internalBufferLength];
RtpPacket rtpPacket = new RtpPacket(internalBuffer, internalBufferLength);
// byte[] internalBuffer = new byte[internalBufferLength];
while (receivePackets) {
try {
try {
byte[] internalBuffer = new byte[internalBufferLength];
RtpPacket rtpPacket = new RtpPacket(internalBuffer, internalBufferLength);
rtpSocket.receive(rtpPacket);
packetReceivedCounter++;
// if (shouldHandlePacket(rtpPacket)) {
processRtpPacket(rtpPacket);
// } else {
// log.debug("Corrupt packet seqNum[rtpSeqNum=" + rtpPacket.getSeqNum() + ",lastSeqNum=" + lastSequenceNumber
// + "][rtpTS=" + rtpPacket.getTimestamp() + ",lastTS=" + lastPacketTimestamp + "][port=" + rtpSocket.getDatagramSocket().getLocalPort() + "]");
// if (lastPacketDropped) successivePacketDroppedCount++;
// else lastPacketDropped = true;
// }
// log.debug("Received packet [" + rtpPacket.getRtcpPayloadType() + "," + rtpPacket.getPayloadType() + ", length=" + rtpPacket.getPayloadLength() + "] seqNum[rtpSeqNum=" + rtpPacket.getSeqNum() + ",lastSeqNum=" + lastSequenceNumber
// + "][rtpTS=" + rtpPacket.getTimestamp() + ",lastTS=" + lastPacketTimestamp + "][port=" + rtpSocket.getDatagramSocket().getLocalPort() + "]");
if (rtpPacket.isRtcpPacket()) {
log.debug("RTCP packet [" + rtpPacket.getRtcpPayloadType() + ", length=" + rtpPacket.getPayloadLength() + "] seqNum[rtpSeqNum=" + rtpPacket.getSeqNum() + ",lastSeqNum=" + lastSequenceNumber
+ "][rtpTS=" + rtpPacket.getTimestamp() + ",lastTS=" + lastPacketTimestamp + "][port=" + rtpSocket.getDatagramSocket().getLocalPort() + "]");
} else {
if (shouldHandlePacket(rtpPacket)) {
// log.debug("Handling packet [" + rtpPacket.getRtcpPayloadType() + "," + rtpPacket.getPayloadType() + ", length=" + rtpPacket.getPayloadLength() + "] seqNum[rtpSeqNum=" + rtpPacket.getSeqNum() + ",lastSeqNum=" + lastSequenceNumber
// + "][rtpTS=" + rtpPacket.getTimestamp() + ",lastTS=" + lastPacketTimestamp + "][port=" + rtpSocket.getDatagramSocket().getLocalPort() + "]");
processRtpPacket(rtpPacket);
} else {
log.debug("Corrupt packet [" + rtpPacket.getRtcpPayloadType() + "," + rtpPacket.getPayloadType() + ", length=" + rtpPacket.getPayloadLength() + "] seqNum[rtpSeqNum=" + rtpPacket.getSeqNum() + ",lastSeqNum=" + lastSequenceNumber
+ "][rtpTS=" + rtpPacket.getTimestamp() + ",lastTS=" + lastPacketTimestamp + "][port=" + rtpSocket.getDatagramSocket().getLocalPort() + "]");
if (lastPacketDropped) successivePacketDroppedCount++;
else lastPacketDropped = true;
}
}
} catch (IOException e) { // We get this when the socket closes when the call hangs up.
receivePackets = false;
}
@ -104,14 +116,14 @@ public class RtpStreamReceiver {
log.debug("Rtp Receiver stopped. Packet Received = " + packetReceivedCounter + "." );
if (listener != null) listener.onStoppedReceiving();
}
private boolean isMarkerPacket(RtpPacket rtpPacket) {
/*
* It looks like Asterisk and FreeSWITCH sends a marker packet at the beginning of the voice frame.
* If you stop talking and then start talking, a marker packet is received on start talking. (ralam sept 20, 2010).
*/
if (rtpPacket.hasMarker()) {
log.debug("Marked packet seqNum[rtpSeqNum=" + rtpPacket.getSeqNum() + ",lastSeqNum=" + lastSequenceNumber
log.debug("Marked packet [" + rtpPacket.getPayloadType() + ", length=" + rtpPacket.getPayloadLength() + "] seqNum[rtpSeqNum=" + rtpPacket.getSeqNum() + ",lastSeqNum=" + lastSequenceNumber
+ "][rtpTS=" + rtpPacket.getTimestamp() + ",lastTS=" + lastPacketTimestamp + "][port=" + rtpSocket.getDatagramSocket().getLocalPort() + "]");
return true;
}
@ -147,7 +159,7 @@ public class RtpStreamReceiver {
private boolean isFirstPacket(RtpPacket rtpPacket) {
if (firstPacket) {
firstPacket = false;
log.debug("First packet seqNum[rtpSeqNum=" + rtpPacket.getSeqNum() + ",lastSeqNum=" + lastSequenceNumber
log.debug("First packet [" + rtpPacket.getPayloadType() + ", length=" + rtpPacket.getPayloadLength() + "] seqNum[rtpSeqNum=" + rtpPacket.getSeqNum() + ",lastSeqNum=" + lastSequenceNumber
+ "][rtpTS=" + rtpPacket.getTimestamp() + ",lastTS=" + lastPacketTimestamp + "][port=" + rtpSocket.getDatagramSocket().getLocalPort() + "]");
return true;
}

12
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/net/RtpPacket.java
View File

@ -232,7 +232,17 @@ public class RtpPacket {
return payload;
}
public boolean isRtcpPacket() {
int payloadType = (packet[1] & 0xFF);
if ((payloadType >= 200) && (payloadType <= 204)) return true;
return false;
}
public int getRtcpPayloadType() {
return (packet[1] & 0xFF);
}
// *********************** Private and Static ***********************
/** Gets int value */

10
bbb-voice/src/test/java/org/bigbluebutton/voiceconf/red5/media/net/RtpPacketTest.java
View File

@ -19,11 +19,11 @@ public class RtpPacketTest {
Assert.assertEquals(rtpPacket.getVersion(), 2, "Expect version = 2");
}
@Test
public void testSetVersionIs0() {
rtpPacket.setVersion(0);
Assert.assertEquals(rtpPacket.getVersion(), 0, "Expect version = 0");
}
// @Test
// public void testSetVersionIs0() {
// rtpPacket.setVersion(0);
// Assert.assertEquals(rtpPacket.getVersion(), 0, "Expect version = 0");
// }
@Test
public void testSetVersionIs3() {