summaryrefslogtreecommitdiff
path: root/media/base/mediachannel.h
diff options
context:
space:
mode:
authorbuildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2014-07-23 07:11:58 +0000
committerbuildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2014-07-23 07:11:58 +0000
commit6260d68d9590e7a2ba3f9834cb010dd0fe740449 (patch)
tree2d5bb6d6ece26ccf40a7de8d0bdad8df76a07eaa /media/base/mediachannel.h
parentbe28fe45b6a738309cfb071c8cd3a1a80bc7ec0c (diff)
downloadtalk-6260d68d9590e7a2ba3f9834cb010dd0fe740449.tar.gz
(Auto)update libjingle 71726409-> 71726772
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@6762 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'media/base/mediachannel.h')
-rw-r--r--media/base/mediachannel.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/media/base/mediachannel.h b/media/base/mediachannel.h
index ac62d5e..ab5bdb4 100644
--- a/media/base/mediachannel.h
+++ b/media/base/mediachannel.h
@@ -329,7 +329,6 @@ struct VideoOptions {
system_high_adaptation_threshhold.SetFrom(
change.system_high_adaptation_threshhold);
buffered_mode_latency.SetFrom(change.buffered_mode_latency);
- lower_min_bitrate.SetFrom(change.lower_min_bitrate);
dscp.SetFrom(change.dscp);
suspend_below_min_bitrate.SetFrom(change.suspend_below_min_bitrate);
unsignalled_recv_stream_limit.SetFrom(change.unsignalled_recv_stream_limit);
@@ -368,7 +367,6 @@ struct VideoOptions {
system_high_adaptation_threshhold ==
o.system_high_adaptation_threshhold &&
buffered_mode_latency == o.buffered_mode_latency &&
- lower_min_bitrate == o.lower_min_bitrate &&
dscp == o.dscp &&
suspend_below_min_bitrate == o.suspend_below_min_bitrate &&
unsignalled_recv_stream_limit == o.unsignalled_recv_stream_limit &&
@@ -409,7 +407,6 @@ struct VideoOptions {
ost << ToStringIfSet("low", system_low_adaptation_threshhold);
ost << ToStringIfSet("high", system_high_adaptation_threshhold);
ost << ToStringIfSet("buffered mode latency", buffered_mode_latency);
- ost << ToStringIfSet("lower min bitrate", lower_min_bitrate);
ost << ToStringIfSet("dscp", dscp);
ost << ToStringIfSet("suspend below min bitrate",
suspend_below_min_bitrate);
@@ -480,8 +477,6 @@ struct VideoOptions {
SettablePercent system_high_adaptation_threshhold;
// Specify buffered mode latency in milliseconds.
Settable<int> buffered_mode_latency;
- // Make minimum configured send bitrate even lower than usual, at 30kbit.
- Settable<bool> lower_min_bitrate;
// Set DSCP value for packet sent from video channel.
Settable<bool> dscp;
// Enable WebRTC suspension of video. No video frames will be sent when the