diff options
| author | buildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-06-13 18:24:39 +0000 |
|---|---|---|
| committer | buildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-06-13 18:24:39 +0000 |
| commit | b449ff6d2befd6707e96b1db3074d1d2a49a4203 (patch) | |
| tree | fe893089fd98ab8ffbde0edc00afdb103513acea /media/base | |
| parent | 6d33fabcee9db2ac552c1d10ab9ca12091b354ec (diff) | |
| download | talk-b449ff6d2befd6707e96b1db3074d1d2a49a4203.tar.gz | |
(Auto)update libjingle 69144530-> 69164179
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@6434 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'media/base')
| -rw-r--r-- | media/base/mediachannel.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/media/base/mediachannel.h b/media/base/mediachannel.h index 4762115..078c073 100644 --- a/media/base/mediachannel.h +++ b/media/base/mediachannel.h @@ -331,7 +331,6 @@ struct VideoOptions { 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 @@ struct VideoOptions { 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 @@ struct VideoOptions { 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 @@ struct VideoOptions { 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. |