commit 061ea0df0356facdbd002c3b9952eb19b2e6b531
author Per <perkj@chromium.org> Wed Oct 19 11:57:59 2016
committer Per <perkj@chromium.org> Wed Oct 19 11:58:09 2016
tree 429ae7a0b3a3e802b84dbff416ae05e181392495
parent e3e411a1aa2a90ce06ea0fd83a13636f4065c55d

Remove VideoCodec resolution validation.
This is needed to be able to land https://codereview.webrtc.org/2408153002/  "Remove cricket::VideoCodec with, height and framerate properties" without breaking upstream projects.

BUG=webrtc:5332
TBR=pthatcher@webrtc.org

Review URL: https://codereview.webrtc.org/2437453003 .

Cr-Commit-Position: refs/heads/master@{#14681}

webrtc/media/base/codec.cc

diff --git a/webrtc/media/base/codec.cc b/webrtc/media/base/codec.cc
index 3570ef6..6cb331a 100644
--- a/webrtc/media/base/codec.cc
+++ b/webrtc/media/base/codec.cc
@@ -315,11 +315,6 @@
   }
 
   // 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) &&

webrtc/media/base/codec_unittest.cc

diff --git a/webrtc/media/base/codec_unittest.cc b/webrtc/media/base/codec_unittest.cc
index ce159ef..11717b7 100644
--- a/webrtc/media/base/codec_unittest.cc
+++ b/webrtc/media/base/codec_unittest.cc
@@ -348,16 +348,6 @@
   too_high_payload_type.id = 128;
   EXPECT_FALSE(too_high_payload_type.ValidateCodecFormat());
 
-  // Reject zero-width codecs.
-  VideoCodec zero_width = codec;
-  zero_width.width = 0;
-  EXPECT_FALSE(zero_width.ValidateCodecFormat());
-
-  // Reject zero-height codecs.
-  VideoCodec zero_height = codec;
-  zero_height.height = 0;
-  EXPECT_FALSE(zero_height.ValidateCodecFormat());
-
   // Accept non-video codecs with zero dimensions.
   VideoCodec zero_width_rtx_codec = VideoCodec::CreateRtxCodec(96, 120);
   zero_width_rtx_codec.width = 0;

webrtc/media/engine/webrtcvideoengine2_unittest.cc

diff --git a/webrtc/media/engine/webrtcvideoengine2_unittest.cc b/webrtc/media/engine/webrtcvideoengine2_unittest.cc
index 0a40e04..0355cd5 100644
--- a/webrtc/media/engine/webrtcvideoengine2_unittest.cc
+++ b/webrtc/media/engine/webrtcvideoengine2_unittest.cc
@@ -2518,20 +2518,6 @@
   EXPECT_EQ(kMaxQuantization, codec.params[kCodecParamMaxQuantization]);
 }
 
-TEST_F(WebRtcVideoChannel2Test, SetSendCodecsRejectBadDimensions) {
-  cricket::VideoSendParameters parameters;
-  parameters.codecs.push_back(kVp8Codec);
-
-  parameters.codecs[0].width = 0;
-  EXPECT_FALSE(channel_->SetSendParameters(parameters))
-      << "Codec set though codec width is zero.";
-
-  parameters.codecs[0].width = kVp8Codec.width;
-  parameters.codecs[0].height = 0;
-  EXPECT_FALSE(channel_->SetSendParameters(parameters))
-      << "Codec set though codec height is zero.";
-}
-
 TEST_F(WebRtcVideoChannel2Test, SetSendCodecsRejectBadPayloadTypes) {
   // TODO(pbos): Should we only allow the dynamic range?
   static const int kIncorrectPayloads[] = {-2, -1, 128, 129};