Merge third_party/libjingle/source/talk from https://chromium.googlesource.com/external/webrtc/trunk/talk.git at 19c8d5c35a3e7a7341124f3865a3a117985e7c08

This commit was generated by merge_from_chromium.py.

Change-Id: I75181570213a02c85bd866a22896805d4b1f966f

3 files changed, 12 insertions, 23 deletions

diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index a7b4851..9e7b5da 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -23,9 +23,6 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# List of files that should not be committed to
-DO_NOT_SUBMIT_FILES = ["talk/media/webrtc/webrtcvideoengine.cc"]
-
 def _LicenseHeader(input_api):
   """Returns the license header regexp."""
   # Accept any year number from start of project to the current year
@@ -79,26 +76,11 @@ def _LicenseHeader(input_api):
   }
   return license_header
 
-def _ProtectedFiles(input_api, output_api):
-  results = []
-  changed_files = []
-  for f in input_api.AffectedFiles():
-    changed_files.append(f.LocalPath())
-  bad_files = list(set(DO_NOT_SUBMIT_FILES) & set(changed_files))
-  if bad_files:
-    error_type = output_api.PresubmitError
-    results.append(error_type(
-        'The following affected files are only allowed to be updated when '
-        'importing libjingle',
-        bad_files))
-  return results
-
 def _CommonChecks(input_api, output_api):
   """Checks common to both upload and commit."""
   results = []
   results.extend(input_api.canned_checks.CheckLicense(
       input_api, output_api, _LicenseHeader(input_api)))
-  results.extend(_ProtectedFiles(input_api, output_api))
   return results
 
 def CheckChangeOnUpload(input_api, output_api):
diff --git a/media/webrtc/webrtcvideoengine2.cc b/media/webrtc/webrtcvideoengine2.cc
index a877921..d79f71d 100644
--- a/media/webrtc/webrtcvideoengine2.cc
+++ b/media/webrtc/webrtcvideoengine2.cc
@@ -249,8 +249,9 @@ std::vector<webrtc::VideoStream> WebRtcVideoEncoderFactory2::CreateVideoStreams(
     const VideoOptions& options,
     size_t num_streams) {
   if (num_streams != 1) {
-    LOG(LS_ERROR) << "Unsupported number of streams: " << num_streams;
-    return std::vector<webrtc::VideoStream>();
+    LOG(LS_WARNING) << "Unsupported number of streams (" << num_streams
+                    << "), falling back to one.";
+    num_streams = 1;
   }
 
   webrtc::VideoStream stream;
@@ -261,6 +262,12 @@ std::vector<webrtc::VideoStream> WebRtcVideoEncoderFactory2::CreateVideoStreams(
 
   int min_bitrate = kMinVideoBitrate;
   codec.GetParam(kCodecParamMinBitrate, &min_bitrate);
+  // Clamp the min video bitrate, this is set from JavaScript directly and needs
+  // to be sanitized.
+  if (min_bitrate < kMinVideoBitrate) {
+    min_bitrate = kMinVideoBitrate;
+  }
+
   int max_bitrate = kMaxVideoBitrate;
   codec.GetParam(kCodecParamMaxBitrate, &max_bitrate);
   stream.min_bitrate_bps = min_bitrate * 1000;
diff --git a/media/webrtc/webrtcvideoengine2_unittest.cc b/media/webrtc/webrtcvideoengine2_unittest.cc
index e45ad6d..0b85723 100644
--- a/media/webrtc/webrtcvideoengine2_unittest.cc
+++ b/media/webrtc/webrtcvideoengine2_unittest.cc
@@ -1634,13 +1634,13 @@ TEST_F(WebRtcVideoChannel2Test, SetSendCodecsChangesExistingStreams) {
 }
 
 TEST_F(WebRtcVideoChannel2Test, SetSendCodecsWithMinMaxBitrate) {
-  SetSendCodecsShouldWorkForBitrates("10", "20");
+  SetSendCodecsShouldWorkForBitrates("100", "200");
 }
 
 TEST_F(WebRtcVideoChannel2Test, SetSendCodecsRejectsMaxLessThanMinBitrate) {
   std::vector<VideoCodec> video_codecs = engine_.codecs();
-  video_codecs[0].params[kCodecParamMinBitrate] = "30";
-  video_codecs[0].params[kCodecParamMaxBitrate] = "20";
+  video_codecs[0].params[kCodecParamMinBitrate] = "300";
+  video_codecs[0].params[kCodecParamMaxBitrate] = "200";
   EXPECT_FALSE(channel_->SetSendCodecs(video_codecs));
 }