Remove cricket::VideoCodec with, height and framerate properties

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 200 matching lines @@
 
 std::string AudioCodec::ToString() const {
   std::ostringstream os;
   os << "AudioCodec[" << id << ":" << name << ":" << clockrate << ":" << bitrate
      << ":" << channels << "]";
   return os.str();
 }
 
 std::string VideoCodec::ToString() const {
   std::ostringstream os;
-  os << "VideoCodec[" << id << ":" << name << ":" << width << ":" << height
-     << ":" << framerate << "]";
+  os << "VideoCodec[" << id << ":" << name << "]";
   return os.str();
 }
 
-VideoCodec::VideoCodec(int id,
-                       const std::string& name,
-                       int width,
-                       int height,
-                       int framerate)
-    : Codec(id, name, kVideoCodecClockrate),
-      width(width),
-      height(height),
-      framerate(framerate) {}
+VideoCodec::VideoCodec(int id, const std::string& name)
+    : Codec(id, name, kVideoCodecClockrate) {}
 
-VideoCodec::VideoCodec(int id, const std::string& name)
-    : Codec(id, name, kVideoCodecClockrate),
-      width(0),
-      height(0),
-      framerate(0) {}
-
-VideoCodec::VideoCodec() : Codec(), width(0), height(0), framerate(0) {
+VideoCodec::VideoCodec() : Codec() {
   clockrate = kVideoCodecClockrate;
 }
 
 VideoCodec::VideoCodec(const VideoCodec& c) = default;
 
 VideoCodec& VideoCodec::operator=(const VideoCodec& c) {
   Codec::operator=(c);
-  width = c.width;
-  height = c.height;
-  framerate = c.framerate;
   return *this;
 }
 
 bool VideoCodec::operator==(const VideoCodec& c) const {
-  return width == c.width && height == c.height && framerate == c.framerate &&
-         Codec::operator==(c);
+  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, 0, 0, 0);
+  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) {
     return CODEC_RED;
   }
   if (_stricmp(payload_name, kUlpfecCodecName) == 0) {
     return CODEC_ULPFEC;
   }
   if (_stricmp(payload_name, kRtxCodecName) == 0) {
     return CODEC_RTX;
   }
 
   return CODEC_VIDEO;
 }
 
 bool VideoCodec::ValidateCodecFormat() const {
   if (id < 0 || id > 127) {
     LOG(LS_ERROR) << "Codec with invalid payload type: " << ToString();
     return false;
   }
   if (GetCodecType() != CODEC_VIDEO) {
     return true;
   }
 
   // Video validation from here on.
-
-  if (width <= 0 || height <= 0) {
-    LOG(LS_ERROR) << "Codec with invalid dimensions: " << ToString();
-    return false;
-  }
   int min_bitrate = -1;
   int max_bitrate = -1;
   if (GetParam(kCodecParamMinBitrate, &min_bitrate) &&
       GetParam(kCodecParamMaxBitrate, &max_bitrate)) {
     if (max_bitrate < min_bitrate) {
       LOG(LS_ERROR) << "Codec with max < min bitrate: " << ToString();
       return false;
     }
   }
   return true;
@@ skipping 29 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