Fixed rtcp rpsi parsing of invalid packets.

webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 1081 matching lines @@
                                  RTCPPacketInformation& rtcpPacketInformation) {
   // in theory there could be multiple slices lost
   rtcpPacketInformation.rtcpPacketTypeFlags |= kRtcpSli; // received signal that we need to refresh a slice
   rtcpPacketInformation.sliPictureId = rtcpPacket.SLIItem.PictureId;
 }
 
 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,
                                  RTCPPacketInformation& rtcpPacketInformation) {
   RTCPUtility::RTCPPacketTypes pktType = rtcpParser.Iterate();
   if (pktType == RTCPPacketTypes::kPsfbRemb) {
     pktType = rtcpParser.Iterate();
     if (pktType == RTCPPacketTypes::kPsfbRembItem) {
       HandleREMBItem(rtcpParser, rtcpPacketInformation);
       rtcpParser.Iterate();
@@ skipping 309 matching lines @@
         return -1;
       }
       num += receiveInfo->TmmbrSet.lengthOfSet();
       receiveInfoIt++;
     }
   }
   return num;
 }
 
 }  // namespace webrtc