commit b947fe1218f8043ff3c8b2214cffcc9fce547f28
author Amit Hilbuch <amithi@webrtc.org> Fri Mar 22 19:04:26 2019
committer Commit Bot <commit-bot@chromium.org> Fri Mar 22 19:59:59 2019
tree 09fabc7bac4fd27963c1ff7df1f83cbe6142fdbc
parent 56325786d49d5f8b456faa038cfb3890ac4c5827

Paying off some debt from rtp_utils.cc

Using reinterpret_cast for array view and re-enabling DCHECK.

Bug: webrtc:10418
Change-Id: Ie96e7b203c95546ea790e1434d6cad8daadbbf5d
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/128824
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Commit-Queue: Amit Hilbuch <amithi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27252}

media/base/rtp_utils.cc

diff --git a/media/base/rtp_utils.cc b/media/base/rtp_utils.cc
index 0669933..00719b5 100644
--- a/media/base/rtp_utils.cc
+++ b/media/base/rtp_utils.cc
@@ -277,18 +277,22 @@
           SetRtpSsrc(data, len, header.ssrc));
 }
 
-static bool HasCorrectRtpVersion(rtc::ArrayView<const char> packet) {
-  return reinterpret_cast<const uint8_t*>(packet.data())[0] >> 6 == kRtpVersion;
+static bool HasCorrectRtpVersion(rtc::ArrayView<const uint8_t> packet) {
+  return packet.data()[0] >> 6 == kRtpVersion;
 }
 
 bool IsRtpPacket(rtc::ArrayView<const char> packet) {
-  return packet.size() >= kMinRtpPacketLen && HasCorrectRtpVersion(packet);
+  return packet.size() >= kMinRtpPacketLen &&
+         HasCorrectRtpVersion(
+             rtc::reinterpret_array_view<const uint8_t>(packet));
 }
 
 // Check the RTP payload type. If 63 < payload type < 96, it's RTCP.
 // For additional details, see http://tools.ietf.org/html/rfc5761.
 bool IsRtcpPacket(rtc::ArrayView<const char> packet) {
-  if (packet.size() < kMinRtcpPacketLen || !HasCorrectRtpVersion(packet)) {
+  if (packet.size() < kMinRtcpPacketLen ||
+      !HasCorrectRtpVersion(
+          rtc::reinterpret_array_view<const uint8_t>(packet))) {
     return false;
   }
 
@@ -301,8 +305,7 @@
 }
 
 bool IsValidRtpPacketSize(RtpPacketType packet_type, size_t size) {
-  // TODO(webrtc:10418): uncomment when relands.
-  // RTC_DCHECK_NE(RtpPacketType::kUnknown, packet_type);
+  RTC_DCHECK_NE(RtpPacketType::kUnknown, packet_type);
   size_t min_packet_length = packet_type == RtpPacketType::kRtcp
                                  ? kMinRtcpPacketLen
                                  : kMinRtpPacketLen;
@@ -493,9 +496,8 @@
   }
 
   // Making sure we have a valid RTP packet at the end.
-  auto packet = rtc::MakeArrayView(
-      reinterpret_cast<const char*>(data + rtp_start_pos), rtp_length);
-  if (!IsRtpPacket(packet) ||
+  auto packet = rtc::MakeArrayView(data + rtp_start_pos, rtp_length);
+  if (!IsRtpPacket(rtc::reinterpret_array_view<const char>(packet)) ||
       !ValidateRtpHeader(data + rtp_start_pos, rtp_length, nullptr)) {
     RTC_NOTREACHED();
     return false;