(Auto)update libjingle 69144530-> 69164179

git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@6434 4adac7df-926f-26a2-2b94-8c16560cd09d

3 files changed, 22 insertions, 18 deletions

diff --git a/app/webrtc/mediaconstraintsinterface.cc b/app/webrtc/mediaconstraintsinterface.cc
index 3573ef3..c4f9306 100644
--- a/app/webrtc/mediaconstraintsinterface.cc
+++ b/app/webrtc/mediaconstraintsinterface.cc
@@ -114,8 +114,6 @@ const char MediaConstraintsInterface::kHighBitrate[] =
     "googHighBitrate";
 const char MediaConstraintsInterface::kVeryHighBitrate[] =
     "googVeryHighBitrate";
-const char MediaConstraintsInterface::kPayloadPadding[] = "googPayloadPadding";
-
 
 // Set |value| to the value associated with the first appearance of |key|, or
 // return false if |key| is not found.
diff --git a/app/webrtc/mediaconstraintsinterface.h b/app/webrtc/mediaconstraintsinterface.h
index 39028af..63b749c 100644
--- a/app/webrtc/mediaconstraintsinterface.h
+++ b/app/webrtc/mediaconstraintsinterface.h
@@ -126,7 +126,6 @@ class MediaConstraintsInterface {
   static const char kHighStartBitrate[];  // googHighStartBitrate
   static const char kHighBitrate[];  // googHighBitrate
   static const char kVeryHighBitrate[];  // googVeryHighBitrate
-  static const char kPayloadPadding[];  // googPayloadPadding
 
   // The prefix of internal-only constraints whose JS set values should be
   // stripped by Chrome before passed down to Libjingle.
diff --git a/app/webrtc/webrtcsession.cc b/app/webrtc/webrtcsession.cc
index b41813e..887aa4f 100644
--- a/app/webrtc/webrtcsession.cc
+++ b/app/webrtc/webrtcsession.cc
@@ -371,15 +371,14 @@ static std::string MakeTdErrorString(const std::string& desc) {
 
 // Set |option| to the highest-priority value of |key| in the optional
 // constraints if the key is found and has a valid value.
-template<typename T>
 static void SetOptionFromOptionalConstraint(
     const MediaConstraintsInterface* constraints,
-    const std::string& key, cricket::Settable<T>* option) {
+    const std::string& key, cricket::Settable<int>* option) {
   if (!constraints) {
     return;
   }
   std::string string_value;
-  T value;
+  int value;
   if (constraints->GetOptional().FindFirst(key, &string_value)) {
     if (talk_base::FromString(string_value, &value)) {
       option->Set(value);
@@ -565,17 +564,21 @@ bool WebRtcSession::Initialize(
   SetOptionFromOptionalConstraint(constraints,
       MediaConstraintsInterface::kCpuOveruseThreshold,
       &video_options_.cpu_overuse_threshold);
-  SetOptionFromOptionalConstraint(constraints,
+
+  if (FindConstraint(
+      constraints,
       MediaConstraintsInterface::kCpuOveruseDetection,
-      &video_options_.cpu_overuse_detection);
-  SetOptionFromOptionalConstraint(constraints,
+      &value,
+      NULL)) {
+    video_options_.cpu_overuse_detection.Set(value);
+  }
+  if (FindConstraint(
+      constraints,
       MediaConstraintsInterface::kCpuOveruseEncodeUsage,
-      &video_options_.cpu_overuse_encode_usage);
-
-  // Find payload padding constraint.
-  SetOptionFromOptionalConstraint(constraints,
-      MediaConstraintsInterface::kPayloadPadding,
-      &video_options_.use_payload_padding);
+      &value,
+      NULL)) {
+    video_options_.cpu_overuse_encode_usage.Set(value);
+  }
 
   // Find improved wifi bwe constraint.
   if (FindConstraint(
@@ -589,9 +592,13 @@ bool WebRtcSession::Initialize(
     video_options_.use_improved_wifi_bandwidth_estimator.Set(true);
   }
 
-  SetOptionFromOptionalConstraint(constraints,
-      MediaConstraintsInterface::kHighStartBitrate,
-      &video_options_.video_start_bitrate);
+  if (FindConstraint(
+        constraints,
+        MediaConstraintsInterface::kHighStartBitrate,
+        &value,
+        NULL)) {
+    video_options_.video_start_bitrate.Set(cricket::kHighStartBitrate);
+  }
 
   if (FindConstraint(
       constraints,