Revert of H264 codec: Check profile-level-id when matching

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/common.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/stringencode.h"
 #include "webrtc/base/stringutils.h"
 
-namespace {
-
-// Return the contained value for |key| if available, and |default_value|
-// otherwise.
-std::string GetParamOrDefault(const cricket::Codec& codec,
-                              const std::string& key,
-                              const std::string& default_value) {
-  cricket::CodecParameterMap::const_iterator iter = codec.params.find(key);
-  return (iter == codec.params.end()) ? default_value : iter->second;
-}
-
-}  // anonymous namespace
-
 namespace cricket {
 
 const int kMaxPayloadId = 127;
 
 bool FeedbackParam::operator==(const FeedbackParam& other) const {
   return _stricmp(other.id().c_str(), id().c_str()) == 0 &&
       _stricmp(other.param().c_str(), param().c_str()) == 0;
 }
 
 bool FeedbackParams::operator==(const FeedbackParams& other) const {
@@ skipping 189 matching lines @@
 
 VideoCodec& VideoCodec::operator=(const VideoCodec& c) {
   Codec::operator=(c);
   return *this;
 }
 
 bool VideoCodec::operator==(const VideoCodec& c) const {
   return Codec::operator==(c);
 }
 
-bool VideoCodec::Matches(const VideoCodec& codec) const {
-  if (!Codec::Matches(codec))
-    return false;
-  // TODO(magjed): It would be better to have this logic in a H264 subclass. See
-  // http://crbug/webrtc/6385 for more info.
-  if (!CodecNamesEq(name, kH264CodecName))
-    return true;
-  // H264 codecs need to have matching profile-level-id.
-  const std::string our_profile_level_id = GetParamOrDefault(
-      *this, kH264FmtpProfileLevelId, kH264FmtpDefaultProfileLevelId);
-  const std::string their_profile_level_id = GetParamOrDefault(
-      codec, kH264FmtpProfileLevelId, kH264FmtpDefaultProfileLevelId);
-  if (our_profile_level_id == their_profile_level_id)
-    return true;
-  // At this point, profile-level-id is not an exact match, but that is still ok
-  // if only level_idc differs and level asymmetry is allowed.
-  const bool level_asymmetry_allowed =
-      GetParamOrDefault(*this, kH264FmtpLevelAsymmetryAllowed, "0") == "1" &&
-      GetParamOrDefault(codec, kH264FmtpLevelAsymmetryAllowed, "0") == "1";
-  // Ignore level_idc and compare only profile_idc and profile_iop.
-  const bool is_profile_match = (our_profile_level_id.substr(0, 4) ==
-                                 their_profile_level_id.substr(0, 4));
-  return level_asymmetry_allowed && is_profile_match;
-}
-
 VideoCodec VideoCodec::CreateRtxCodec(int rtx_payload_type,
                                       int associated_payload_type) {
   VideoCodec rtx_codec(rtx_payload_type, kRtxCodecName);
   rtx_codec.SetParam(kCodecParamAssociatedPayloadType, associated_payload_type);
   return rtx_codec;
 }
 
 VideoCodec::CodecType VideoCodec::GetCodecType() const {
   const char* payload_name = name.c_str();
   if (_stricmp(payload_name, kRedCodecName) == 0) {
@@ skipping 61 matching lines @@
 bool HasTransportCc(const Codec& codec) {
   return codec.HasFeedbackParam(
       FeedbackParam(kRtcpFbParamTransportCc, kParamValueEmpty));
 }
 
 bool CodecNamesEq(const std::string& name1, const std::string& name2) {
   return _stricmp(name1.c_str(), name2.c_str()) == 0;
 }
 
 }  // namespace cricket