diff --git a/webrtc/common_types.cc b/webrtc/common_types.cc index 82307ce52b..6cf7304ad8 100644 --- a/webrtc/common_types.cc +++ b/webrtc/common_types.cc @@ -168,16 +168,6 @@ VideoCodecType PayloadStringToCodecType(const std::string& name) { return kVideoCodecGeneric; } -// TODO(kthelgason): Remove these methods once upstream projects -// have been updated. -rtc::Optional CodecTypeToPayloadName(VideoCodecType type) { - return rtc::Optional(CodecTypeToPayloadString(type)); -} - -rtc::Optional PayloadNameToCodecType(const std::string& name) { - return rtc::Optional(PayloadStringToCodecType(name)); -} - const uint32_t BitrateAllocation::kMaxBitrateBps = std::numeric_limits::max(); diff --git a/webrtc/common_types.h b/webrtc/common_types.h index c4b5ce8e70..843d9b8584 100644 --- a/webrtc/common_types.h +++ b/webrtc/common_types.h @@ -550,10 +550,6 @@ enum VideoCodecType { // 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 CodecTypeToPayloadName(VideoCodecType type); -rtc::Optional PayloadNameToCodecType(const std::string& name); union VideoCodecUnion { VideoCodecVP8 VP8;