generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update libjingle to 50191337.

Browse Source 
R=mallinath@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1885005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4461 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
wu@webrtc.org
2013-08-01 00:00:07 +00:00
parent d3ae3c7b1f
commit d64719d895
31 changed files with 479 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
talk/media/base/fakemediaengine.h
View File

@@ -599,7 +599,7 @@ class FakeSoundclipMedia : public SoundclipMedia {
class FakeDataMediaChannel : public RtpHelper<DataMediaChannel> {
public:
explicit FakeDataMediaChannel(void* unused)
: auto_bandwidth_(false), max_bps_(-1) {}
: auto_bandwidth_(false), 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_; }
@@ -647,13 +647,20 @@ class FakeDataMediaChannel : public RtpHelper<DataMediaChannel> {
virtual bool SendData(const SendDataParams& params,
const talk_base::Buffer& payload,
SendDataResult* result) {
last_sent_data_params_ = params;
last_sent_data_ = std::string(payload.data(), payload.length());
return true;
if (send_blocked_) {
*result = SDR_BLOCK;
return false;
} else {
last_sent_data_params_ = params;
last_sent_data_ = std::string(payload.data(), payload.length());
return true;
}
}
SendDataParams last_sent_data_params() { return last_sent_data_params_; }
std::string last_sent_data() { return last_sent_data_; }
bool is_send_blocked() { return send_blocked_; }
void set_send_blocked(bool blocked) { send_blocked_ = blocked; }
private:
std::vector<DataCodec> recv_codecs_;
@@ -661,6 +668,7 @@ class FakeDataMediaChannel : public RtpHelper<DataMediaChannel> {
SendDataParams last_sent_data_params_;
std::string last_sent_data_;
bool auto_bandwidth_;
bool send_blocked_;
int max_bps_;
};