Reland of move deprecated CodecType methods.

webrtc/common_types.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 150 matching lines @@
     return kVideoCodecH264;
   if (CodecNamesEq(name.c_str(), kPayloadNameI420))
     return kVideoCodecI420;
   if (CodecNamesEq(name.c_str(), kPayloadNameRED))
     return kVideoCodecRED;
   if (CodecNamesEq(name.c_str(), kPayloadNameULPFEC))
     return kVideoCodecULPFEC;
   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();
 
 BitrateAllocation::BitrateAllocation() : sum_(0), bitrates_{} {}
 
 bool BitrateAllocation::SetBitrate(size_t spatial_index,
                                    size_t temporal_index,
                                    uint32_t bitrate_bps) {
   RTC_CHECK_LT(spatial_index, kMaxSpatialLayers);
   RTC_CHECK_LT(temporal_index, kMaxTemporalStreams);
@@ skipping 68 matching lines @@
   oss << " ]";
   return oss.str();
 }
 
 std::ostream& BitrateAllocation::operator<<(std::ostream& os) const {
   os << ToString();
   return os;
 }
 
 }  // namespace webrtc