commit 520ca4e3b87f2b7d9c705750cb91c4272471fd1b
author Niels Möller <nisse@webrtc.org> Mon Jun 04 11:14:38 2018 +0200
committer Commit Bot <commit-bot@chromium.org> Mon Jun 04 11:53:17 2018 +0000
tree decce5e0fc31504f48f51125e3108c5854e7a238
parent b18931d30c132a77e1cc43e16f976b5d3753160d

Delete enum RtpVideoCodecTypes, replaced with VideoCodecType.

Bug: webrtc:8995
Change-Id: I0b44aa26f2f6a81aec7ca1281b8513d8e03228b8
Reviewed-on: https://webrtc-review.googlesource.com/79561
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Reviewed-by: Åsa Persson <asapersson@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23507}

modules/video_coding/session_info.cc

diff --git a/modules/video_coding/session_info.cc b/modules/video_coding/session_info.cc
index 74d7bfa..bf4adcc 100644
--- a/modules/video_coding/session_info.cc
+++ b/modules/video_coding/session_info.cc
@@ -60,9 +60,9 @@
 int VCMSessionInfo::PictureId() const {
   if (packets_.empty())
     return kNoPictureId;
-  if (packets_.front().video_header.codec == kRtpVideoVp8) {
+  if (packets_.front().video_header.codec == kVideoCodecVP8) {
     return packets_.front().video_header.codecHeader.VP8.pictureId;
-  } else if (packets_.front().video_header.codec == kRtpVideoVp9) {
+  } else if (packets_.front().video_header.codec == kVideoCodecVP9) {
     return packets_.front().video_header.codecHeader.VP9.picture_id;
   } else {
     return kNoPictureId;
@@ -72,9 +72,9 @@
 int VCMSessionInfo::TemporalId() const {
   if (packets_.empty())
     return kNoTemporalIdx;
-  if (packets_.front().video_header.codec == kRtpVideoVp8) {
+  if (packets_.front().video_header.codec == kVideoCodecVP8) {
     return packets_.front().video_header.codecHeader.VP8.temporalIdx;
-  } else if (packets_.front().video_header.codec == kRtpVideoVp9) {
+  } else if (packets_.front().video_header.codec == kVideoCodecVP9) {
     return packets_.front().video_header.codecHeader.VP9.temporal_idx;
   } else {
     return kNoTemporalIdx;
@@ -84,9 +84,9 @@
 bool VCMSessionInfo::LayerSync() const {
   if (packets_.empty())
     return false;
-  if (packets_.front().video_header.codec == kRtpVideoVp8) {
+  if (packets_.front().video_header.codec == kVideoCodecVP8) {
     return packets_.front().video_header.codecHeader.VP8.layerSync;
-  } else if (packets_.front().video_header.codec == kRtpVideoVp9) {
+  } else if (packets_.front().video_header.codec == kVideoCodecVP9) {
     return packets_.front().video_header.codecHeader.VP9.temporal_up_switch;
   } else {
     return false;
@@ -96,9 +96,9 @@
 int VCMSessionInfo::Tl0PicId() const {
   if (packets_.empty())
     return kNoTl0PicIdx;
-  if (packets_.front().video_header.codec == kRtpVideoVp8) {
+  if (packets_.front().video_header.codec == kVideoCodecVP8) {
     return packets_.front().video_header.codecHeader.VP8.tl0PicIdx;
-  } else if (packets_.front().video_header.codec == kRtpVideoVp9) {
+  } else if (packets_.front().video_header.codec == kVideoCodecVP9) {
     return packets_.front().video_header.codecHeader.VP9.tl0_pic_idx;
   } else {
     return kNoTl0PicIdx;
@@ -106,13 +106,14 @@
 }
 
 bool VCMSessionInfo::NonReference() const {
-  if (packets_.empty() || packets_.front().video_header.codec != kRtpVideoVp8)
+  if (packets_.empty() || packets_.front().video_header.codec != kVideoCodecVP8)
     return false;
   return packets_.front().video_header.codecHeader.VP8.nonReference;
 }
 
 std::vector<NaluInfo> VCMSessionInfo::GetNaluInfos() const {
-  if (packets_.empty() || packets_.front().video_header.codec != kRtpVideoH264)
+  if (packets_.empty() ||
+      packets_.front().video_header.codec != kVideoCodecH264)
     return std::vector<NaluInfo>();
   std::vector<NaluInfo> nalu_infos;
   for (const VCMPacket& packet : packets_) {
@@ -125,7 +126,8 @@
 }
 
 void VCMSessionInfo::SetGofInfo(const GofInfoVP9& gof_info, size_t idx) {
-  if (packets_.empty() || packets_.front().video_header.codec != kRtpVideoVp9 ||
+  if (packets_.empty() ||
+      packets_.front().video_header.codec != kVideoCodecVP9 ||
       packets_.front().video_header.codecHeader.VP9.flexible_mode) {
     return;
   }
@@ -185,7 +187,7 @@
   // header supplied by the H264 depacketizer.
   const size_t kH264NALHeaderLengthInBytes = 1;
   const size_t kLengthFieldLength = 2;
-  if (packet.video_header.codec == kRtpVideoH264 &&
+  if (packet.video_header.codec == kVideoCodecH264 &&
       packet.video_header.codecHeader.H264.packetization_type == kH264StapA) {
     size_t required_length = 0;
     const uint8_t* nalu_ptr = packet_buffer + kH264NALHeaderLengthInBytes;