From 011dc6427ac10dfb8dd2e59a77c7c792d594302e Mon Sep 17 00:00:00 2001
From: philipel <philipel@webrtc.org>
Date: Wed, 4 Jul 2018 16:55:55 +0200
Subject: [PATCH] Remove RTPTypeHeader union and use RTPVideoHeader directly.

Bug: none
Change-Id: I2abd7d1cfb423ca989158167eb0502b44bc3a04a
Reviewed-on: https://webrtc-review.googlesource.com/87103
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23855}
---
 modules/include/module_common_types.h | 11 ++++-------
 modules/rtp_rtcp/source/rtp_format.h  |  7 ++++---
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/modules/include/module_common_types.h b/modules/include/module_common_types.h
index c22e9950ad..f6fab45030 100644
--- a/modules/include/module_common_types.h
+++ b/modules/include/module_common_types.h
@@ -63,17 +63,14 @@ struct RTPVideoHeader {
   VideoCodecType codec;
   RTPVideoTypeHeader codecHeader;
 };
-union RTPTypeHeader {
-  RTPVideoHeader Video;
-};
 
 struct WebRtcRTPHeader {
+  RTPVideoHeader& video_header() { return video; }
+  const RTPVideoHeader& video_header() const { return video; }
+  RTPVideoHeader video;
+
   RTPHeader header;
   FrameType frameType;
-  // TODO(philipel): Remove with RTPTypeHeader.
-  RTPVideoHeader& video_header() { return type.Video; }
-  const RTPVideoHeader& video_header() const { return type.Video; }
-  RTPTypeHeader type;
   // NTP time of the capture time in local timebase in milliseconds.
   int64_t ntp_time_ms;
 };
diff --git a/modules/rtp_rtcp/source/rtp_format.h b/modules/rtp_rtcp/source/rtp_format.h
index e702270f45..5c2f3ec5da 100644
--- a/modules/rtp_rtcp/source/rtp_format.h
+++ b/modules/rtp_rtcp/source/rtp_format.h
@@ -52,12 +52,13 @@ class RtpPacketizer {
 class RtpDepacketizer {
  public:
   struct ParsedPayload {
+    RTPVideoHeader& video_header() { return video; }
+    const RTPVideoHeader& video_header() const { return video; }
+    RTPVideoHeader video;
+
     const uint8_t* payload;
     size_t payload_length;
     FrameType frame_type;
-    RTPVideoHeader& video_header() { return type.Video; }
-    const RTPVideoHeader& video_header() const { return type.Video; }
-    RTPTypeHeader type;
   };
 
   static RtpDepacketizer* Create(VideoCodecType type);