Fixed rtcp rpsi parsing of invalid packets.

webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc

Index: webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
index 1bfa7cdebc3106b09514fb205ed87d13e00b05a2..0169e0a08274fca936f17fbefaa94a3d1981c961 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
@@ -1099,28 +1099,25 @@ void
 RTCPReceiver::HandleRPSI(RTCPUtility::RTCPParserV2& rtcpParser,
                          RTCPHelp::RTCPPacketInformation& rtcpPacketInformation)
 {
-    const RTCPUtility::RTCPPacket& rtcpPacket = rtcpParser.Packet();
-    RTCPUtility::RTCPPacketTypes pktType = rtcpParser.Iterate();
-    if (pktType == RTCPPacketTypes::kPsfbRpsi) {

[åsapersson, 2016/04/11 09:22:55]

kPsfbRpsiItem?

[danilchap, 2016/04/11 11:00:31]

For neighbor packets 'Item' suffix means subpacket, FCI item.
For Rpsi packet this notion removed (because valid packet has exactly one FCI
item, it make little sense to handle rpsi item without rpsi)

-        rtcpPacketInformation.rtcpPacketTypeFlags |= kRtcpRpsi; // received signal that we have a confirmed reference picture
-        if(rtcpPacket.RPSI.NumberOfValidBits%8 != 0)
-        {
-            // to us unknown
-            // continue
-            rtcpParser.Iterate();
-            return;
-        }
-        rtcpPacketInformation.rpsiPictureId = 0;
+  const RTCPUtility::RTCPPacket& rtcpPacket = rtcpParser.Packet();
+  if (rtcpPacket.RPSI.NumberOfValidBits % 8 != 0) {
+    rtcpParser.Iterate();
+    return;
+  }
+  // Received signal that we have a confirmed reference picture.
+  rtcpPacketInformation.rtcpPacketTypeFlags |= kRtcpRpsi;
+  rtcpPacketInformation.rpsiPictureId = 0;
 
-        // convert NativeBitString to rpsiPictureId
-        uint8_t numberOfBytes = rtcpPacket.RPSI.NumberOfValidBits /8;
-        for(uint8_t n = 0; n < (numberOfBytes-1); n++)
-        {
-            rtcpPacketInformation.rpsiPictureId += (rtcpPacket.RPSI.NativeBitString[n] & 0x7f);
-            rtcpPacketInformation.rpsiPictureId <<= 7; // prepare next
-        }
-        rtcpPacketInformation.rpsiPictureId += (rtcpPacket.RPSI.NativeBitString[numberOfBytes-1] & 0x7f);
-    }
+  // Convert NativeBitString to rpsiPictureId.
+  uint8_t numberOfBytes = rtcpPacket.RPSI.NumberOfValidBits / 8;
+  for (uint8_t n = 0; n < numberOfBytes - 1; n++) {
+    rtcpPacketInformation.rpsiPictureId +=
+        (rtcpPacket.RPSI.NativeBitString[n] & 0x7f);
+    rtcpPacketInformation.rpsiPictureId <<= 7;  // prepare next
+  }
+  rtcpPacketInformation.rpsiPictureId +=
+      (rtcpPacket.RPSI.NativeBitString[numberOfBytes - 1] & 0x7f);
+  rtcpParser.Iterate();
 }
 
 void RTCPReceiver::HandlePsfbApp(RTCPUtility::RTCPParserV2& rtcpParser,