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}diff --git a/modules/video_coding/packet.cc b/modules/video_coding/packet.cc
index f176194..7db566a 100644
--- a/modules/video_coding/packet.cc
+++ b/modules/video_coding/packet.cc
@@ -89,8 +89,9 @@
}
void VCMPacket::CopyCodecSpecifics(const RTPVideoHeader& videoHeader) {
+ codec = videoHeader.codec;
switch (videoHeader.codec) {
- case kRtpVideoVp8:
+ case kVideoCodecVP8:
// Handle all packets within a frame as depending on the previous packet
// TODO(holmer): This should be changed to make fragments independent
// when the VP8 RTP receiver supports fragments.
@@ -103,9 +104,8 @@
else
completeNALU = kNaluIncomplete;
- codec = kVideoCodecVP8;
return;
- case kRtpVideoVp9:
+ case kVideoCodecVP9:
if (is_first_packet_in_frame && markerBit)
completeNALU = kNaluComplete;
else if (is_first_packet_in_frame)
@@ -115,9 +115,8 @@
else
completeNALU = kNaluIncomplete;
- codec = kVideoCodecVP9;
return;
- case kRtpVideoH264:
+ case kVideoCodecH264:
is_first_packet_in_frame = videoHeader.is_first_packet_in_frame;
if (is_first_packet_in_frame)
insertStartCode = true;
@@ -131,12 +130,10 @@
} else {
completeNALU = kNaluIncomplete;
}
- codec = kVideoCodecH264;
return;
- case kRtpVideoGeneric:
- codec = kVideoCodecGeneric;
+ case kVideoCodecGeneric:
return;
- case kRtpVideoNone:
+ default:
codec = kVideoCodecUnknown;
return;
}