summaryrefslogtreecommitdiff
path: root/media/base/mediachannel.h
diff options
context:
space:
mode:
authorwu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2014-03-27 17:03:58 +0000
committerwu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2014-03-27 17:03:58 +0000
commitc8079d8b9dab16606ba32c1950d6a5c44ccbfc8e (patch)
treeb0ee9b7d9c48adc1e383eef4c835c428e3d3d258 /media/base/mediachannel.h
parent3865f242aa057847ca2c3728d24874882ef227ee (diff)
downloadtalk-c8079d8b9dab16606ba32c1950d6a5c44ccbfc8e.tar.gz
(Auto)update libjingle 63837929-> 63884381
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@5800 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'media/base/mediachannel.h')
-rw-r--r--media/base/mediachannel.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/base/mediachannel.h b/media/base/mediachannel.h
index 873c1ff..9bdf4d9 100644
--- a/media/base/mediachannel.h
+++ b/media/base/mediachannel.h
@@ -62,6 +62,7 @@ class VideoRenderer;
const int kMinRtpHeaderExtensionId = 1;
const int kMaxRtpHeaderExtensionId = 255;
const int kScreencastDefaultFps = 5;
+const int kHighStartBitrate = 1500;
// Used in AudioOptions and VideoOptions to signify "unset" values.
template <class T>
@@ -441,7 +442,7 @@ struct VideoOptions {
// Enable WebRTC leaky bucket when sending media packets.
Settable<bool> video_leaky_bucket;
// Set highest bitrate mode for video.
- Settable<int> video_highest_bitrate;
+ Settable<HighestBitrate> video_highest_bitrate;
// Enable WebRTC Cpu Overuse Detection, which is a new version of the CPU
// adaptation algorithm. So this option will override the
// |adapt_input_to_cpu_usage|.