Remove deprecated CodecType methods.
These are no longer needed as all clients have been updated to use the
new methods that always return a value.
BUG=None
Review-Url: https://codereview.webrtc.org/3009583002
Cr-Original-Commit-Position: refs/heads/master@{#19559}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 1a92d0de49779567241e97e50cb69d51257adcce
diff --git a/common_types.cc b/common_types.cc
index 82307ce..6cf7304 100644
--- a/common_types.cc
+++ b/common_types.cc
@@ -168,16 +168,6 @@
return kVideoCodecGeneric;
}
-// TODO(kthelgason): Remove these methods once upstream projects
-// have been updated.
-rtc::Optional<const char*> CodecTypeToPayloadName(VideoCodecType type) {
- return rtc::Optional<const char*>(CodecTypeToPayloadString(type));
-}
-
-rtc::Optional<VideoCodecType> PayloadNameToCodecType(const std::string& name) {
- return rtc::Optional<VideoCodecType>(PayloadStringToCodecType(name));
-}
-
const uint32_t BitrateAllocation::kMaxBitrateBps =
std::numeric_limits<uint32_t>::max();
diff --git a/common_types.h b/common_types.h
index c4b5ce8..843d9b8 100644
--- a/common_types.h
+++ b/common_types.h
@@ -550,10 +550,6 @@
// Translates from name of codec to codec type and vice versa.
const char* CodecTypeToPayloadString(VideoCodecType type);
VideoCodecType PayloadStringToCodecType(const std::string& name);
-// TODO(kthelgason): Remove these methods once upstream projects
-// have been updated.
-rtc::Optional<const char*> CodecTypeToPayloadName(VideoCodecType type);
-rtc::Optional<VideoCodecType> PayloadNameToCodecType(const std::string& name);
union VideoCodecUnion {
VideoCodecVP8 VP8;
