diff --git a/AUTHORS b/AUTHORS index f79b6adc32..5ec8b46310 100644 --- a/AUTHORS +++ b/AUTHORS @@ -143,6 +143,7 @@ ARM Holdings <*@arm.com> BroadSoft Inc. <*@broadsoft.com> Canonical Ltd <*@canonical.com> CoSMo Software Consulting, Pte Ltd <*@cosmosoftware.io> +Discord Inc. <*@discordapp.com> Facebook Inc. <*@fb.com> Google Inc. <*@google.com> Highfive, Inc. <*@highfive.com> diff --git a/modules/video_coding/utility/simulcast_utility.cc b/modules/video_coding/utility/simulcast_utility.cc index a407483edd..65061ed32a 100644 --- a/modules/video_coding/utility/simulcast_utility.cc +++ b/modules/video_coding/utility/simulcast_utility.cc @@ -49,20 +49,9 @@ bool SimulcastUtility::ValidSimulcastParameters(const VideoCodec& codec, return false; } } - if (codec.codecType == webrtc::kVideoCodecVP8) { - for (int i = 1; i < num_streams; ++i) { - if (codec.simulcastStream[i].width < codec.simulcastStream[i - 1].width) { - return false; - } - } - } else { - // TODO(mirtad): H264 encoder implementation still assumes the default - // resolution downscaling is used. - for (int i = 1; i < num_streams; ++i) { - if (codec.simulcastStream[i].width != - codec.simulcastStream[i - 1].width * 2) { - return false; - } + for (int i = 1; i < num_streams; ++i) { + if (codec.simulcastStream[i].width < codec.simulcastStream[i - 1].width) { + return false; } }