(Auto)update libjingle 69144530-> 69164179
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6434 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/app/webrtc/mediaconstraintsinterface.cc b/talk/app/webrtc/mediaconstraintsinterface.cc
index 3573ef3..c4f9306 100644
--- a/talk/app/webrtc/mediaconstraintsinterface.cc
+++ b/talk/app/webrtc/mediaconstraintsinterface.cc
@@ -114,8 +114,6 @@
"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/talk/app/webrtc/mediaconstraintsinterface.h b/talk/app/webrtc/mediaconstraintsinterface.h
index 39028af..63b749c 100644
--- a/talk/app/webrtc/mediaconstraintsinterface.h
+++ b/talk/app/webrtc/mediaconstraintsinterface.h
@@ -126,7 +126,6 @@
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/talk/app/webrtc/webrtcsession.cc b/talk/app/webrtc/webrtcsession.cc
index b41813e..887aa4f 100644
--- a/talk/app/webrtc/webrtcsession.cc
+++ b/talk/app/webrtc/webrtcsession.cc
@@ -371,15 +371,14 @@
// 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 @@
SetOptionFromOptionalConstraint(constraints,
MediaConstraintsInterface::kCpuOveruseThreshold,
&video_options_.cpu_overuse_threshold);
- SetOptionFromOptionalConstraint(constraints,
- MediaConstraintsInterface::kCpuOveruseDetection,
- &video_options_.cpu_overuse_detection);
- SetOptionFromOptionalConstraint(constraints,
- MediaConstraintsInterface::kCpuOveruseEncodeUsage,
- &video_options_.cpu_overuse_encode_usage);
- // Find payload padding constraint.
- SetOptionFromOptionalConstraint(constraints,
- MediaConstraintsInterface::kPayloadPadding,
- &video_options_.use_payload_padding);
+ if (FindConstraint(
+ constraints,
+ MediaConstraintsInterface::kCpuOveruseDetection,
+ &value,
+ NULL)) {
+ video_options_.cpu_overuse_detection.Set(value);
+ }
+ if (FindConstraint(
+ constraints,
+ MediaConstraintsInterface::kCpuOveruseEncodeUsage,
+ &value,
+ NULL)) {
+ video_options_.cpu_overuse_encode_usage.Set(value);
+ }
// Find improved wifi bwe constraint.
if (FindConstraint(
@@ -589,9 +592,13 @@
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,
diff --git a/talk/media/base/mediachannel.h b/talk/media/base/mediachannel.h
index 4762115..078c073 100644
--- a/talk/media/base/mediachannel.h
+++ b/talk/media/base/mediachannel.h
@@ -331,7 +331,6 @@
screencast_min_bitrate.SetFrom(change.screencast_min_bitrate);
use_improved_wifi_bandwidth_estimator.SetFrom(
change.use_improved_wifi_bandwidth_estimator);
- use_payload_padding.SetFrom(change.use_payload_padding);
}
bool operator==(const VideoOptions& o) const {
@@ -367,8 +366,7 @@
skip_encoding_unused_streams == o.skip_encoding_unused_streams &&
screencast_min_bitrate == o.screencast_min_bitrate &&
use_improved_wifi_bandwidth_estimator ==
- o.use_improved_wifi_bandwidth_estimator &&
- use_payload_padding == o.use_payload_padding;
+ o.use_improved_wifi_bandwidth_estimator;
}
std::string ToString() const {
@@ -411,7 +409,6 @@
ost << ToStringIfSet("screencast min bitrate", screencast_min_bitrate);
ost << ToStringIfSet("improved wifi bwe",
use_improved_wifi_bandwidth_estimator);
- ost << ToStringIfSet("payload padding", use_payload_padding);
ost << "}";
return ost.str();
}
@@ -480,8 +477,6 @@
Settable<int> screencast_min_bitrate;
// Enable improved bandwidth estiamtor on wifi.
Settable<bool> use_improved_wifi_bandwidth_estimator;
- // Enable payload padding.
- Settable<bool> use_payload_padding;
};
// A class for playing out soundclips.
diff --git a/talk/media/webrtc/fakewebrtcvideoengine.h b/talk/media/webrtc/fakewebrtcvideoengine.h
index 610a342..3eba47b 100644
--- a/talk/media/webrtc/fakewebrtcvideoengine.h
+++ b/talk/media/webrtc/fakewebrtcvideoengine.h
@@ -1000,8 +1000,6 @@
return 0;
}
- WEBRTC_STUB(SetPadWithRedundantPayloads, (int, bool));
-
WEBRTC_FUNC(SetRtxReceivePayloadType, (const int channel,
const uint8 payload_type)) {
WEBRTC_CHECK_CHANNEL(channel);
diff --git a/talk/media/webrtc/webrtcvideoengine.cc b/talk/media/webrtc/webrtcvideoengine.cc
index 726939a..eeff90f 100644
--- a/talk/media/webrtc/webrtcvideoengine.cc
+++ b/talk/media/webrtc/webrtcvideoengine.cc
@@ -2976,11 +2976,6 @@
options_.use_improved_wifi_bandwidth_estimator !=
options.use_improved_wifi_bandwidth_estimator;
-#ifdef USE_WEBRTC_DEV_BRANCH
- bool payload_padding_changed = options.use_payload_padding.IsSet() &&
- options_.use_payload_padding != options.use_payload_padding;
-#endif
-
// Save the options, to be interpreted where appropriate.
// Use options_.SetAll() instead of assignment so that unset value in options
@@ -3110,17 +3105,6 @@
it->second->channel_id(), config);
}
}
-#ifdef USE_WEBRTC_DEV_BRANCH
- if (payload_padding_changed) {
- LOG(LS_INFO) << "Payload-based padding called.";
- for (SendChannelMap::iterator it = send_channels_.begin();
- it != send_channels_.end(); ++it) {
- engine()->vie()->rtp()->SetPadWithRedundantPayloads(
- it->second->channel_id(),
- options_.use_payload_padding.GetWithDefaultIfUnset(false));
- }
- }
-#endif
webrtc::CpuOveruseOptions overuse_options;
if (GetCpuOveruseOptions(options_, &overuse_options)) {
for (SendChannelMap::iterator it = send_channels_.begin();
