Update libjingle to 59676287
R=wu@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/7229004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@5390 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/media/base/fakemediaengine.h b/talk/media/base/fakemediaengine.h
index d71c660..9ffe074 100644
--- a/talk/media/base/fakemediaengine.h
+++ b/talk/media/base/fakemediaengine.h
@@ -281,7 +281,8 @@
}
return set_sending(flag != SEND_NOTHING);
}
- virtual bool SetSendBandwidth(bool autobw, int bps) { return true; }
+ virtual bool SetStartSendBandwidth(int bps) { return true; }
+ virtual bool SetMaxSendBandwidth(int bps) { return true; }
virtual bool AddRecvStream(const StreamParams& sp) {
if (!RtpHelper<VoiceMediaChannel>::AddRecvStream(sp))
return false;
@@ -446,7 +447,9 @@
explicit FakeVideoMediaChannel(FakeVideoEngine* engine)
: engine_(engine),
sent_intra_frame_(false),
- requested_intra_frame_(false) {}
+ requested_intra_frame_(false),
+ start_bps_(-1),
+ max_bps_(-1) {}
~FakeVideoMediaChannel();
const std::vector<VideoCodec>& recv_codecs() const { return recv_codecs_; }
@@ -457,6 +460,8 @@
const std::map<uint32, VideoRenderer*>& renderers() const {
return renderers_;
}
+ int start_bps() const { return start_bps_; }
+ int max_bps() const { return max_bps_; }
bool GetSendStreamFormat(uint32 ssrc, VideoFormat* format) {
if (send_formats_.find(ssrc) == send_formats_.end()) {
return false;
@@ -534,7 +539,14 @@
bool HasCapturer(uint32 ssrc) const {
return capturers_.find(ssrc) != capturers_.end();
}
- virtual bool SetSendBandwidth(bool autobw, int bps) { return true; }
+ virtual bool SetStartSendBandwidth(int bps) {
+ start_bps_ = bps;
+ return true;
+ }
+ virtual bool SetMaxSendBandwidth(int bps) {
+ max_bps_ = bps;
+ return true;
+ }
virtual bool AddRecvStream(const StreamParams& sp) {
if (!RtpHelper<VideoMediaChannel>::AddRecvStream(sp))
return false;
@@ -591,6 +603,8 @@
bool sent_intra_frame_;
bool requested_intra_frame_;
VideoOptions options_;
+ int start_bps_;
+ int max_bps_;
};
class FakeSoundclipMedia : public SoundclipMedia {
@@ -601,12 +615,11 @@
class FakeDataMediaChannel : public RtpHelper<DataMediaChannel> {
public:
explicit FakeDataMediaChannel(void* unused)
- : auto_bandwidth_(false), send_blocked_(false), max_bps_(-1) {}
+ : send_blocked_(false), max_bps_(-1) {}
~FakeDataMediaChannel() {}
const std::vector<DataCodec>& recv_codecs() const { return recv_codecs_; }
const std::vector<DataCodec>& send_codecs() const { return send_codecs_; }
const std::vector<DataCodec>& codecs() const { return send_codecs(); }
- bool auto_bandwidth() const { return auto_bandwidth_; }
int max_bps() const { return max_bps_; }
virtual bool SetRecvCodecs(const std::vector<DataCodec>& codecs) {
@@ -630,8 +643,8 @@
set_playout(receive);
return true;
}
- virtual bool SetSendBandwidth(bool autobw, int bps) {
- auto_bandwidth_ = autobw;
+ virtual bool SetStartSendBandwidth(int bps) { return true; }
+ virtual bool SetMaxSendBandwidth(int bps) {
max_bps_ = bps;
return true;
}
@@ -669,7 +682,6 @@
std::vector<DataCodec> send_codecs_;
SendDataParams last_sent_data_params_;
std::string last_sent_data_;
- bool auto_bandwidth_;
bool send_blocked_;
int max_bps_;
};