Replace rtcp parser in rtc event log handlers.

webrtc/logging/rtc_event_log/rtc_event_log.cc

Index: webrtc/logging/rtc_event_log/rtc_event_log.cc
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log.cc b/webrtc/logging/rtc_event_log/rtc_event_log.cc
index ff31cee1fc82ed45afc354b9746dfc7592c4acf0..00314e619d086d13fa4a20510d47ba0e1f73dcbc 100644
--- a/webrtc/logging/rtc_event_log/rtc_event_log.cc
+++ b/webrtc/logging/rtc_event_log/rtc_event_log.cc
@@ -22,7 +22,16 @@
 #include "webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
-#include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h"
+#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h"
+#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h"
+#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h"
+#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h"
+#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h"
+#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h"
+#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h"
+#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h"
+#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h"
+#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/system_wrappers/include/file_wrapper.h"
 #include "webrtc/system_wrappers/include/logging.h"
@@ -323,42 +332,34 @@ void RtcEventLogImpl::LogRtcpPacket(PacketDirection direction,
   rtcp_event->mutable_rtcp_packet()->set_incoming(direction == kIncomingPacket);
   rtcp_event->mutable_rtcp_packet()->set_type(ConvertMediaType(media_type));
 
-  RTCPUtility::RtcpCommonHeader header;
+  rtcp::CommonHeader header;
   const uint8_t* block_begin = packet;
   const uint8_t* packet_end = packet + length;
   RTC_DCHECK(length <= IP_PACKET_SIZE);
   uint8_t buffer[IP_PACKET_SIZE];
   uint32_t buffer_length = 0;
   while (block_begin < packet_end) {
-    if (!RtcpParseCommonHeader(block_begin, packet_end - block_begin,
-                               &header)) {
+    if (!header.Parse(block_begin, packet_end - block_begin)) {
       break;  // Incorrect message header.
     }
-    uint32_t block_size = header.BlockSize();
-    switch (header.packet_type) {
-      case RTCPUtility::PT_SR:
-        FALLTHROUGH();
-      case RTCPUtility::PT_RR:
-        FALLTHROUGH();
-      case RTCPUtility::PT_BYE:
-        FALLTHROUGH();
-      case RTCPUtility::PT_IJ:
-        FALLTHROUGH();
-      case RTCPUtility::PT_RTPFB:
-        FALLTHROUGH();
-      case RTCPUtility::PT_PSFB:
-        FALLTHROUGH();
-      case RTCPUtility::PT_XR:
+    const uint8_t* next_block = header.NextPacket();
+    uint32_t block_size = next_block - block_begin;
+    switch (header.type()) {
+      case rtcp::SenderReport::kPacketType:
+      case rtcp::ReceiverReport::kPacketType:
+      case rtcp::Bye::kPacketType:
+      case rtcp::ExtendedJitterReport::kPacketType:
+      case rtcp::Rtpfb::kPacketType:
+      case rtcp::Psfb::kPacketType:
+      case rtcp::ExtendedReports::kPacketType:

[terelius, 2016/10/07 12:39:25]

There is no need for annotating the fall-through?

[danilchap, 2016/10/07 12:45:18]

shouldn't be needed when the block is empty.
FALLTHROUGH is required when you go to next case in addition to doing something
else.

         // We log sender reports, receiver reports, bye messages
         // inter-arrival jitter, third-party loss reports, payload-specific
         // feedback and extended reports.
         memcpy(buffer + buffer_length, block_begin, block_size);
         buffer_length += block_size;
         break;
-      case RTCPUtility::PT_SDES:
-        FALLTHROUGH();
-      case RTCPUtility::PT_APP:
-        FALLTHROUGH();
+      case rtcp::Sdes::kPacketType:
+      case rtcp::App::kPacketType:
       default:
         // We don't log sender descriptions, application defined messages
         // or message blocks of unknown type.