Delete webrtc/base/common.h

webrtc/pc/mediasession.cc

 /*
  *  Copyright 2004 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.
  */
 
 #include "webrtc/pc/mediasession.h"
 
 #include <algorithm>  // For std::find_if, std::sort.
 #include <functional>
 #include <map>
 #include <memory>
 #include <set>
 #include <unordered_map>
 #include <utility>
 
 #include "webrtc/base/base64.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/helpers.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/stringutils.h"
+#include "webrtc/common_types.h"
 #include "webrtc/common_video/h264/profile_level_id.h"
 #include "webrtc/media/base/cryptoparams.h"
 #include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/pc/channelmanager.h"
 #include "webrtc/pc/srtpfilter.h"
 
 namespace {
 const char kInline[] = "inline:";
 
@@ skipping 658 matching lines @@
   for (const auto& codec : codecs) {
     if (IsRtxCodec(codec)) {
       return true;
     }
   }
   return false;
 }
 
 template <class C>
 static bool IsRtxCodec(const C& codec) {
-  return stricmp(codec.name.c_str(), kRtxCodecName) == 0;
+  return STR_CASE_CMP(codec.name.c_str(), kRtxCodecName) == 0;
 }
 
 template <class C>
 static bool ContainsFlexfecCodec(const std::vector<C>& codecs) {
   for (const auto& codec : codecs) {
     if (IsFlexfecCodec(codec)) {
       return true;
     }
   }
   return false;
 }
 
 template <class C>
 static bool IsFlexfecCodec(const C& codec) {
-  return stricmp(codec.name.c_str(), kFlexfecCodecName) == 0;
+  return STR_CASE_CMP(codec.name.c_str(), kFlexfecCodecName) == 0;
 }
 
 static TransportOptions GetTransportOptions(const MediaSessionOptions& options,
                                             const std::string& content_name) {
   TransportOptions transport_options;
   auto it = options.transport_options.find(content_name);
   if (it != options.transport_options.end()) {
     transport_options = it->second;
   }
   transport_options.enable_ice_renomination = options.enable_ice_renomination;
@@ skipping 275 matching lines @@
     if (FindByUri(offered_extensions, *ours, &theirs)) {
       // We respond with their RTP header extension id.
       negotiated_extenstions->push_back(theirs);
     }
   }
 }
 
 static void StripCNCodecs(AudioCodecs* audio_codecs) {
   AudioCodecs::iterator iter = audio_codecs->begin();
   while (iter != audio_codecs->end()) {
-    if (stricmp(iter->name.c_str(), kComfortNoiseCodecName) == 0) {
+    if (STR_CASE_CMP(iter->name.c_str(), kComfortNoiseCodecName) == 0) {
       iter = audio_codecs->erase(iter);
     } else {
       ++iter;
     }
   }
 }
 
 // Create a media content to be answered in a session-accept,
 // according to the given options.rtcp_mux, options.streams, codecs,
 // crypto, and streams.  If we don't currently have crypto (in
@@ skipping 1142 matching lines @@
       GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_VIDEO));
 }
 
 DataContentDescription* GetFirstDataContentDescription(
     SessionDescription* sdesc) {
   return static_cast<DataContentDescription*>(
       GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_DATA));
 }
 
 }  // namespace cricket