commit 29d8846df9bcb0b76fa6afcdb0d9c9a98af832f1
author philipel <philipel@webrtc.org> Wed Aug 08 14:26:00 2018 +0200
committer Commit Bot <commit-bot@chromium.org> Thu Aug 09 10:53:28 2018 +0000
tree fb2348c315b23f48a117d91a2da2fe820d4cc290
parent 527ff1eec2f99b3725c8662101d2f895c3bc600d

Remove RTPVideoHeader::vp9() accessors.

TBR=stefan@webrtc.org

Bug: none
Change-Id: Ia2f728ea3377754a16a0b081e25c4479fe211b3e
Reviewed-on: https://webrtc-review.googlesource.com/93024
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24243}

modules/video_coding/session_info.cc

diff --git a/modules/video_coding/session_info.cc b/modules/video_coding/session_info.cc
index b0066ab..a80c7b2 100644
--- a/modules/video_coding/session_info.cc
+++ b/modules/video_coding/session_info.cc
@@ -64,7 +64,9 @@
   if (packets_.front().video_header.codec == kVideoCodecVP8) {
     return packets_.front().video_header.vp8().pictureId;
   } else if (packets_.front().video_header.codec == kVideoCodecVP9) {
-    return packets_.front().video_header.vp9().picture_id;
+    return absl::get<RTPVideoHeaderVP9>(
+               packets_.front().video_header.video_type_header)
+        .picture_id;
   } else {
     return kNoPictureId;
   }
@@ -76,7 +78,9 @@
   if (packets_.front().video_header.codec == kVideoCodecVP8) {
     return packets_.front().video_header.vp8().temporalIdx;
   } else if (packets_.front().video_header.codec == kVideoCodecVP9) {
-    return packets_.front().video_header.vp9().temporal_idx;
+    return absl::get<RTPVideoHeaderVP9>(
+               packets_.front().video_header.video_type_header)
+        .temporal_idx;
   } else {
     return kNoTemporalIdx;
   }
@@ -88,7 +92,9 @@
   if (packets_.front().video_header.codec == kVideoCodecVP8) {
     return packets_.front().video_header.vp8().layerSync;
   } else if (packets_.front().video_header.codec == kVideoCodecVP9) {
-    return packets_.front().video_header.vp9().temporal_up_switch;
+    return absl::get<RTPVideoHeaderVP9>(
+               packets_.front().video_header.video_type_header)
+        .temporal_up_switch;
   } else {
     return false;
   }
@@ -100,7 +106,9 @@
   if (packets_.front().video_header.codec == kVideoCodecVP8) {
     return packets_.front().video_header.vp8().tl0PicIdx;
   } else if (packets_.front().video_header.codec == kVideoCodecVP9) {
-    return packets_.front().video_header.vp9().tl0_pic_idx;
+    return absl::get<RTPVideoHeaderVP9>(
+               packets_.front().video_header.video_type_header)
+        .tl0_pic_idx;
   } else {
     return kNoTl0PicIdx;
   }
@@ -122,17 +130,19 @@
 }
 
 void VCMSessionInfo::SetGofInfo(const GofInfoVP9& gof_info, size_t idx) {
-  if (packets_.empty() ||
-      packets_.front().video_header.codec != kVideoCodecVP9 ||
-      packets_.front().video_header.vp9().flexible_mode) {
+  if (packets_.empty())
     return;
-  }
-  packets_.front().video_header.vp9().temporal_idx = gof_info.temporal_idx[idx];
-  packets_.front().video_header.vp9().temporal_up_switch =
-      gof_info.temporal_up_switch[idx];
-  packets_.front().video_header.vp9().num_ref_pics = gof_info.num_ref_pics[idx];
+
+  auto* vp9_header = absl::get_if<RTPVideoHeaderVP9>(
+      &packets_.front().video_header.video_type_header);
+  if (!vp9_header || vp9_header->flexible_mode)
+    return;
+
+  vp9_header->temporal_idx = gof_info.temporal_idx[idx];
+  vp9_header->temporal_up_switch = gof_info.temporal_up_switch[idx];
+  vp9_header->num_ref_pics = gof_info.num_ref_pics[idx];
   for (uint8_t i = 0; i < gof_info.num_ref_pics[idx]; ++i) {
-    packets_.front().video_header.vp9().pid_diff[i] = gof_info.pid_diff[idx][i];
+    vp9_header->pid_diff[i] = gof_info.pid_diff[idx][i];
   }
 }