Merge "Merge upstream-master and enable ARM64" into emu-master-devemu-31-stable-releaseemu-31-release

1 files changed, 3 insertions, 14 deletions

diff --git a/logging/rtc_event_log/events/rtc_event_rtp_packet_outgoing.cc b/logging/rtc_event_log/events/rtc_event_rtp_packet_outgoing.cc
index e5324bf1a3..a6a4d99702 100644
--- a/logging/rtc_event_log/events/rtc_event_rtp_packet_outgoing.cc
+++ b/logging/rtc_event_log/events/rtc_event_rtp_packet_outgoing.cc
@@ -19,24 +19,13 @@ namespace webrtc {
 RtcEventRtpPacketOutgoing::RtcEventRtpPacketOutgoing(
     const RtpPacketToSend& packet,
     int probe_cluster_id)
-    : payload_length_(packet.payload_size()),
-      header_length_(packet.headers_size()),
-      padding_length_(packet.padding_size()),
-      probe_cluster_id_(probe_cluster_id) {
-  header_.CopyHeaderFrom(packet);
-  RTC_DCHECK_EQ(packet.size(),
-                payload_length_ + header_length_ + padding_length_);
-}
+    : packet_(packet), probe_cluster_id_(probe_cluster_id) {}
 
 RtcEventRtpPacketOutgoing::RtcEventRtpPacketOutgoing(
     const RtcEventRtpPacketOutgoing& other)
     : RtcEvent(other.timestamp_us_),
-      payload_length_(other.payload_length_),
-      header_length_(other.header_length_),
-      padding_length_(other.padding_length_),
-      probe_cluster_id_(other.probe_cluster_id_) {
-  header_.CopyHeaderFrom(other.header_);
-}
+      packet_(other.packet_),
+      probe_cluster_id_(other.probe_cluster_id_) {}
 
 RtcEventRtpPacketOutgoing::~RtcEventRtpPacketOutgoing() = default;