Adding C++ versions of currently spec'd "RtpParameters" structs.

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.
  */
 
@@ skipping 131 matching lines @@
   return feedback_params.Has(param);
 }
 
 void Codec::IntersectFeedbackParams(const Codec& other) {
   feedback_params.Intersect(other.feedback_params);
 }
 
 webrtc::RtpCodecParameters Codec::ToCodecParameters() const {
   webrtc::RtpCodecParameters codec_params;
   codec_params.payload_type = id;
-  codec_params.mime_type = name;
-  codec_params.clock_rate = clockrate;
+  codec_params.name = name;
+  codec_params.clock_rate = rtc::Optional<int>(clockrate);
   return codec_params;
 }
 
 AudioCodec::AudioCodec(int id,
                        const std::string& name,
                        int clockrate,
                        int bitrate,
                        size_t channels)
     : Codec(id, name, clockrate), bitrate(bitrate), channels(channels) {}
 
@@ skipping 19 matching lines @@
   // omitted if the number of channels is one."
   // Preference is ignored.
   // 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);
-  return codec_params;
-}
-
 std::string AudioCodec::ToString() const {
   std::ostringstream os;
   os << "AudioCodec[" << id << ":" << name << ":" << clockrate << ":" << bitrate
      << ":" << channels << "]";
   return os.str();
 }
 
+webrtc::RtpCodecParameters AudioCodec::ToCodecParameters() const {
+  webrtc::RtpCodecParameters codec_params = Codec::ToCodecParameters();
+  codec_params.num_channels = rtc::Optional<int>(static_cast<int>(channels));
+  codec_params.kind = MEDIA_TYPE_AUDIO;
+  return codec_params;
+}
+
 std::string VideoCodec::ToString() const {
   std::ostringstream os;
   os << "VideoCodec[" << id << ":" << name << "]";
   return os.str();
 }
 
+webrtc::RtpCodecParameters VideoCodec::ToCodecParameters() const {
+  webrtc::RtpCodecParameters codec_params = Codec::ToCodecParameters();
+  codec_params.kind = MEDIA_TYPE_VIDEO;
+  return codec_params;
+}
+
 VideoCodec::VideoCodec(int id, const std::string& name)
     : Codec(id, name, kVideoCodecClockrate) {
   SetDefaultParameters();
 }
 
 VideoCodec::VideoCodec(const std::string& name) : VideoCodec(0 /* id */, name) {
   SetDefaultParameters();
 }
 
 VideoCodec::VideoCodec() : Codec() {
@@ skipping 124 matching lines @@
     if (CodecNamesEq(codec.name.c_str(), kH264CodecName) &&
         !IsSameH264Profile(codec.params, supported_codec.params)) {
       continue;
     }
     return &supported_codec;
   }
   return nullptr;
 }
 
 }  // namespace cricket