Revert of Wire up send-side bandwidth estimation.

webrtc/modules/rtp_rtcp/source/rtcp_utility.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.
  */
 
-#include "webrtc/base/checks.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h"
-#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
 
 #include <assert.h>
 #include <math.h>   // ceil
 #include <string.h> // memcpy
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
 
 namespace webrtc {
@@ skipping 26 matching lines @@
                                         size_t rtcpDataLength,
                                         bool rtcpReducedSizeEnable)
     : _ptrRTCPDataBegin(rtcpData),
       _RTCPReducedSizeEnable(rtcpReducedSizeEnable),
       _ptrRTCPDataEnd(rtcpData + rtcpDataLength),
       _validPacket(false),
       _ptrRTCPData(rtcpData),
       _ptrRTCPBlockEnd(NULL),
       _state(ParseState::State_TopLevel),
       _numberOfBlocks(0),
-      num_skipped_blocks_(0),
       _packetType(RTCPPacketTypes::kInvalid) {
   Validate();
 }
 
 RTCPUtility::RTCPParserV2::~RTCPParserV2() {
 }
 
 ptrdiff_t
 RTCPUtility::RTCPParserV2::LengthLeft() const
 {
     return (_ptrRTCPDataEnd- _ptrRTCPData);
 }
 
 RTCPUtility::RTCPPacketTypes
 RTCPUtility::RTCPParserV2::PacketType() const
 {
     return _packetType;
 }
 
 const RTCPUtility::RTCPPacket&
 RTCPUtility::RTCPParserV2::Packet() const
 {
     return _packet;
 }
 
-rtcp::RtcpPacket* RTCPUtility::RTCPParserV2::ReleaseRtcpPacket() {
-  return rtcp_packet_.release();
-}
 RTCPUtility::RTCPPacketTypes
 RTCPUtility::RTCPParserV2::Begin()
 {
     _ptrRTCPData = _ptrRTCPDataBegin;
 
     return Iterate();
 }
 
 RTCPUtility::RTCPPacketTypes
 RTCPUtility::RTCPParserV2::Iterate()
@@ skipping 47 matching lines @@
           case ParseState::State_XRItem:
             IterateXrItem();
             break;
           case ParseState::State_XR_DLLRItem:
             IterateXrDlrrItem();
             break;
           case ParseState::State_AppItem:
             IterateAppItem();
             break;
         default:
-          RTC_NOTREACHED() << "Invalid state!";
+            assert(false); // Invalid state!
             break;
         }
     }
     return _packetType;
 }
 
 void
 RTCPUtility::RTCPParserV2::IterateTopLevel()
 {
     for (;;)
     {
       RtcpCommonHeader header;
       if (_ptrRTCPDataEnd <= _ptrRTCPData)
         return;
 
       if (!RtcpParseCommonHeader(_ptrRTCPData, _ptrRTCPDataEnd - _ptrRTCPData,
                                  &header)) {
             return;
         }
         _ptrRTCPBlockEnd = _ptrRTCPData + header.BlockSize();
         if (_ptrRTCPBlockEnd > _ptrRTCPDataEnd)
         {
-          ++num_skipped_blocks_;
+            // Bad block!
             return;
         }
 
         switch (header.packet_type) {
         case PT_SR:
         {
             // number of Report blocks
             _numberOfBlocks = header.count_or_format;
             ParseSR();
             return;
@@ skipping 28 matching lines @@
             }
             return;
         }
         case PT_IJ:
         {
             // number of Report blocks
             _numberOfBlocks = header.count_or_format;
             ParseIJ();
             return;
         }
-        case PT_RTPFB:
-          FALLTHROUGH();
+        case PT_RTPFB: // Fall through!
         case PT_PSFB:
         {
-          if (!ParseFBCommon(header)) {
-            // Nothing supported found, continue to next block!
-            break;
-          }
-          return;
+            const bool ok = ParseFBCommon(header);
+            if (!ok)
+            {
+                // Nothing supported found, continue to next block!
+                break;
+            }
+            return;
         }
         case PT_APP:
         {
             const bool ok = ParseAPP(header);
             if (!ok)
             {
                 // Nothing supported found, continue to next block!
                 break;
             }
             return;
         }
         case PT_XR:
         {
             const bool ok = ParseXr();
             if (!ok)
             {
                 // Nothing supported found, continue to next block!
                 break;
             }
             return;
         }
         default:
             // Not supported! Skip!
-            ++num_skipped_blocks_;
             EndCurrentBlock();
             break;
         }
     }
 }
 
 void
 RTCPUtility::RTCPParserV2::IterateXrItem()
 {
     const bool success = ParseXrItem();
@@ skipping 888 matching lines @@
     EndCurrentBlock();
     return false;
   }
   // Skip block.
   _ptrRTCPData += kBlockLengthInBytes;
   _state = ParseState::State_XRItem;
   return false;
 }
 
 bool RTCPUtility::RTCPParserV2::ParseFBCommon(const RtcpCommonHeader& header) {
-  RTC_CHECK((header.packet_type == PT_RTPFB) ||
-            (header.packet_type == PT_PSFB));  // Parser logic check
+  assert((header.packet_type == PT_RTPFB) ||
+         (header.packet_type == PT_PSFB));  // Parser logic check
 
     const ptrdiff_t length = _ptrRTCPBlockEnd - _ptrRTCPData;
 
-    // 4 * 3, RFC4585 section 6.1
-    if (length < 12) {
-      LOG(LS_WARNING)
-          << "Invalid RTCP packet: Too little data (" << length
-          << " bytes) left in buffer to parse a 12 byte RTPFB/PSFB message.";
+    if (length < 12) // 4 * 3, RFC4585 section 6.1
+    {
+        EndCurrentBlock();
         return false;
     }
 
     _ptrRTCPData += 4; // Skip RTCP header
 
-    uint32_t senderSSRC = ByteReader<uint32_t>::ReadBigEndian(_ptrRTCPData);
-    _ptrRTCPData += 4;
+    uint32_t senderSSRC = *_ptrRTCPData++ << 24;
+    senderSSRC += *_ptrRTCPData++ << 16;
+    senderSSRC += *_ptrRTCPData++ << 8;
+    senderSSRC += *_ptrRTCPData++;
 
-    uint32_t mediaSSRC = ByteReader<uint32_t>::ReadBigEndian(_ptrRTCPData);
-    _ptrRTCPData += 4;
+    uint32_t mediaSSRC = *_ptrRTCPData++ << 24;
+    mediaSSRC += *_ptrRTCPData++ << 16;
+    mediaSSRC += *_ptrRTCPData++ << 8;
+    mediaSSRC += *_ptrRTCPData++;
 
     if (header.packet_type == PT_RTPFB) {
         // Transport layer feedback
 
         switch (header.count_or_format) {
         case 1:
         {
             // NACK
           _packetType = RTCPPacketTypes::kRtpfbNack;
             _packet.NACK.SenderSSRC = senderSSRC;
             _packet.NACK.MediaSSRC  = mediaSSRC;
 
             _state = ParseState::State_RTPFB_NACKItem;
 
             return true;
         }
+        case 2:
+        {
+            // used to be ACK is this code point, which is removed
+            // conficts with http://tools.ietf.org/html/draft-levin-avt-rtcp-burst-00
+            break;
+        }
         case 3:
         {
             // TMMBR
           _packetType = RTCPPacketTypes::kRtpfbTmmbr;
             _packet.TMMBR.SenderSSRC = senderSSRC;
             _packet.TMMBR.MediaSSRC  = mediaSSRC;
 
             _state = ParseState::State_RTPFB_TMMBRItem;
 
             return true;
@@ skipping 12 matching lines @@
         case 5:
          {
             // RTCP-SR-REQ Rapid Synchronisation of RTP Flows
             // draft-perkins-avt-rapid-rtp-sync-03.txt
             // trigger a new RTCP SR
           _packetType = RTCPPacketTypes::kRtpfbSrReq;
 
             // Note: No state transition, SR REQ is empty!
             return true;
         }
-        case 15: {
-          _packetType = RTCPPacketTypes::kTransportFeedback;
-          rtcp_packet_ =
-              rtcp::TransportFeedback::ParseFrom(_ptrRTCPData - 12, length);
-          // Since we parse the whole packet here, keep the TopLevel state and
-          // just end the current block.
-          if (rtcp_packet_.get()) {
-            EndCurrentBlock();
-            return true;
-          }
-          break;
-        }
         default:
             break;
         }
-        // Unsupported RTPFB message. Skip and move to next block.
-        ++num_skipped_blocks_;
+        EndCurrentBlock();
         return false;
     } else if (header.packet_type == PT_PSFB) {
         // Payload specific feedback
         switch (header.count_or_format) {
         case 1:
             // PLI
           _packetType = RTCPPacketTypes::kPsfbPli;
             _packet.PLI.SenderSSRC = senderSSRC;
             _packet.PLI.MediaSSRC  = mediaSSRC;
 
@@ skipping 27 matching lines @@
           _packetType = RTCPPacketTypes::kPsfbApp;
             _packet.PSFBAPP.SenderSSRC = senderSSRC;
             _packet.PSFBAPP.MediaSSRC  = mediaSSRC;
 
             _state = ParseState::State_PSFB_AppItem;
             return true;
         default:
             break;
         }
 
+        EndCurrentBlock();
         return false;
     }
     else
     {
-      RTC_NOTREACHED();
+        assert(false);
+
+        EndCurrentBlock();
         return false;
     }
 }
 
 bool RTCPUtility::RTCPParserV2::ParseRPSIItem() {
 
     // RFC 4585 6.3.3.  Reference Picture Selection Indication (RPSI).
     //
     //  0                   1                   2                   3
     //  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
@@ skipping 339 matching lines @@
         _ptrRTCPData += kRtcpAppCode_DATA_SIZE;
     }else
     {
         memcpy(_packet.APP.Data, _ptrRTCPData, length);
         _packet.APP.Size = (uint16_t)length;
         _ptrRTCPData += length;
     }
     return true;
 }
 
-size_t RTCPUtility::RTCPParserV2::NumSkippedBlocks() const {
-  return num_skipped_blocks_;
-}
-
 RTCPUtility::RTCPPacketIterator::RTCPPacketIterator(uint8_t* rtcpData,
                                                     size_t rtcpDataLength)
     : _ptrBegin(rtcpData),
       _ptrEnd(rtcpData + rtcpDataLength),
       _ptrBlock(NULL) {
   memset(&_header, 0, sizeof(_header));
 }
 
 RTCPUtility::RTCPPacketIterator::~RTCPPacketIterator() {
 }
@@ skipping 24 matching lines @@
 const RTCPUtility::RtcpCommonHeader*
 RTCPUtility::RTCPPacketIterator::Current() {
     if (!_ptrBlock)
     {
         return NULL;
     }
 
     return &_header;
 }
 }  // namespace webrtc