Revert of Split out target rtc_media_base from rtc_media

webrtc/media/base/codec.cc

 /*
  *  Copyright (c) 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/media/base/codec.h"
 
 #include <algorithm>
 #include <sstream>
 
-#include "webrtc/base/checks.h"
+#include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/stringencode.h"
 #include "webrtc/base/stringutils.h"
 #include "webrtc/common_video/h264/profile_level_id.h"
 
 namespace cricket {
 
 static bool IsSameH264Profile(const CodecParameterMap& params1,
                               const CodecParameterMap& params2) {
   const rtc::Optional<webrtc::H264::ProfileLevelId> profile_level_id =
@@ skipping 20 matching lines @@
 
 void FeedbackParams::Add(const FeedbackParam& param) {
   if (param.id().empty()) {
     return;
   }
   if (Has(param)) {
     // Param already in |this|.
     return;
   }
   params_.push_back(param);
-  RTC_CHECK(!HasDuplicateEntries());
+  ASSERT(!HasDuplicateEntries());
 }
 
 void FeedbackParams::Intersect(const FeedbackParams& from) {
   std::vector<FeedbackParam>::iterator iter_to = params_.begin();
   while (iter_to != params_.end()) {
     if (!from.Has(*iter_to)) {
       iter_to = params_.erase(iter_to);
     } else {
       ++iter_to;
     }
@@ skipping 117 matching lines @@
   // TODO(juberti): Treat a zero clockrate as 8000Hz, the RTP default clockrate.
   return Codec::Matches(codec) &&
       ((codec.clockrate == 0 /*&& clockrate == 8000*/) ||
           clockrate == codec.clockrate) &&
       (codec.bitrate == 0 || bitrate <= 0 || bitrate == codec.bitrate) &&
       ((codec.channels < 2 && channels < 2) || channels == codec.channels);
 }
 
 webrtc::RtpCodecParameters AudioCodec::ToCodecParameters() const {
   webrtc::RtpCodecParameters codec_params = Codec::ToCodecParameters();
-  codec_params.channels = static_cast<int>(channels);
+  codec_params.channels = channels;
   return codec_params;
 }
 
 std::string AudioCodec::ToString() const {
   std::ostringstream os;
   os << "AudioCodec[" << id << ":" << name << ":" << clockrate << ":" << bitrate
      << ":" << channels << "]";
   return os.str();
 }
 
@@ skipping 138 matching lines @@
     if (CodecNamesEq(codec.name.c_str(), kH264CodecName) &&
         !IsSameH264Profile(codec.params, supported_codec.params)) {
       continue;
     }
     return &supported_codec;
   }
   return nullptr;
 }
 
 }  // namespace cricket