- Filter data channel codecs based on codec name instead of payload type, which may have been remap…

webrtc/media/sctp/sctpdataengine.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 302 matching lines @@
 
 void DecrementUsrSctpUsageCount() {
   rtc::GlobalLockScope lock(&g_usrsctp_lock_);
   --g_usrsctp_usage_count;
   if (!g_usrsctp_usage_count) {
     UninitializeUsrSctp();
   }
 }
 
 DataCodec GetSctpDataCodec() {
-  DataCodec codec(kGoogleSctpDataCodecId, kGoogleSctpDataCodecName);
+  DataCodec codec(kGoogleSctpDataCodecPlType, kGoogleSctpDataCodecName);
   codec.SetParam(kCodecParamPort, kSctpDefaultPort);
   return codec;
 }
 
 }  // namespace
 
 SctpDataEngine::SctpDataEngine() : codecs_(1, GetSctpDataCodec()) {}
 
 SctpDataEngine::~SctpDataEngine() {}
 
@@ skipping 644 matching lines @@
         *dest = rtc::FromString<int>(value);
         return true;
       }
     }
   }
   return false;
 }
 
 bool SctpDataMediaChannel::SetSendCodecs(const std::vector<DataCodec>& codecs) {
   return GetCodecIntParameter(
-      codecs, kGoogleSctpDataCodecId, kGoogleSctpDataCodecName, kCodecParamPort,
-      &remote_port_);
+      codecs, kGoogleSctpDataCodecPlType, kGoogleSctpDataCodecName,
+      kCodecParamPort, &remote_port_);
 }
 
 bool SctpDataMediaChannel::SetRecvCodecs(const std::vector<DataCodec>& codecs) {
   return GetCodecIntParameter(
-      codecs, kGoogleSctpDataCodecId, kGoogleSctpDataCodecName, kCodecParamPort,
-      &local_port_);
+      codecs, kGoogleSctpDataCodecPlType, kGoogleSctpDataCodecName,
+      kCodecParamPort, &local_port_);
 }
 
 void SctpDataMediaChannel::OnPacketFromSctpToNetwork(
     rtc::CopyOnWriteBuffer* buffer) {
   if (buffer->size() > (kSctpMtu)) {
     LOG(LS_ERROR) << debug_name_ << "->OnPacketFromSctpToNetwork(...): "
                   << "SCTP seems to have made a packet that is bigger "
                   << "than its official MTU: " << buffer->size()
                   << " vs max of " << kSctpMtu;
   }
@@ skipping 51 matching lines @@
     }
     case MSG_SCTPOUTBOUNDPACKET: {
       std::unique_ptr<OutboundPacketMessage> pdata(
           static_cast<OutboundPacketMessage*>(msg->pdata));
       OnPacketFromSctpToNetwork(pdata->data().get());
       break;
     }
   }
 }
 }  // namespace cricket