[rtcp] App::Parse updated not to use RTCPUtility,

webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h

Index: webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h
index f5a885cfdd7fe6bf8dad941d87666620a34b8c6e..fea55e4b6575620eb52aeb23c50bf424755adbd9 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h
@@ -13,26 +13,20 @@
 
 #include "webrtc/base/buffer.h"
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h"
-#include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h"
 
 namespace webrtc {
 namespace rtcp {
+class CommonHeader;
 
 class App : public RtcpPacket {
  public:
-  static const uint8_t kPacketType = 204;
-  // 28 bytes for UDP header
-  // 12 bytes for RTCP app header
-  static const size_t kMaxDataSize = IP_PACKET_SIZE - 12 - 28;
+  static constexpr uint8_t kPacketType = 204;
   App() : sub_type_(0), ssrc_(0), name_(0) {}
-
-  virtual ~App() {}
+  ~App() override {}
 
   // Parse assumes header is already parsed and validated.
-  bool Parse(const RTCPUtility::RtcpCommonHeader& header,
-             const uint8_t* payload);  // Size of the payload is in the header.
+  bool Parse(const CommonHeader& packet);
 
   void From(uint32_t ssrc) { ssrc_ = ssrc; }
   void WithSubType(uint8_t subtype);
@@ -52,7 +46,11 @@ class App : public RtcpPacket {
               RtcpPacket::PacketReadyCallback* callback) const override;
 
  private:
-  size_t BlockLength() const override { return 12 + data_.size(); }
+  static constexpr size_t kAppBaseLength = 8;  // Ssrc and Name.
+  static constexpr size_t kMaxDataSize = 0xffff * 4 - kAppBaseLength;
+  size_t BlockLength() const override {
+    return kHeaderLength + kAppBaseLength + data_.size();
+  }
 
   uint8_t sub_type_;
   uint32_t ssrc_;