Index: webrtc/pc/channel.cc |
diff --git a/webrtc/pc/channel.cc b/webrtc/pc/channel.cc |
index 86b5d5f5b681bd9e6e5adac05534ac7d0349d5dc..f5428a43effac7a93fce554e11946c220946337c 100644 |
--- a/webrtc/pc/channel.cc |
+++ b/webrtc/pc/channel.cc |
@@ -443,42 +443,39 @@ |
} |
bool BaseChannel::AddRecvStream(const StreamParams& sp) { |
- return InvokeOnWorker<bool>(RTC_FROM_HERE, |
- Bind(&BaseChannel::AddRecvStream_w, this, sp)); |
+ return InvokeOnWorker(RTC_FROM_HERE, |
+ Bind(&BaseChannel::AddRecvStream_w, this, sp)); |
} |
bool BaseChannel::RemoveRecvStream(uint32_t ssrc) { |
- return InvokeOnWorker<bool>( |
- RTC_FROM_HERE, Bind(&BaseChannel::RemoveRecvStream_w, this, ssrc)); |
+ return InvokeOnWorker(RTC_FROM_HERE, |
+ Bind(&BaseChannel::RemoveRecvStream_w, this, ssrc)); |
} |
bool BaseChannel::AddSendStream(const StreamParams& sp) { |
- return InvokeOnWorker<bool>( |
+ return InvokeOnWorker( |
RTC_FROM_HERE, Bind(&MediaChannel::AddSendStream, media_channel(), sp)); |
} |
bool BaseChannel::RemoveSendStream(uint32_t ssrc) { |
- return InvokeOnWorker<bool>( |
- RTC_FROM_HERE, |
- Bind(&MediaChannel::RemoveSendStream, media_channel(), ssrc)); |
+ return InvokeOnWorker(RTC_FROM_HERE, Bind(&MediaChannel::RemoveSendStream, |
+ media_channel(), ssrc)); |
} |
bool BaseChannel::SetLocalContent(const MediaContentDescription* content, |
ContentAction action, |
std::string* error_desc) { |
TRACE_EVENT0("webrtc", "BaseChannel::SetLocalContent"); |
- return InvokeOnWorker<bool>( |
- RTC_FROM_HERE, |
- Bind(&BaseChannel::SetLocalContent_w, this, content, action, error_desc)); |
+ return InvokeOnWorker(RTC_FROM_HERE, Bind(&BaseChannel::SetLocalContent_w, |
+ this, content, action, error_desc)); |
} |
bool BaseChannel::SetRemoteContent(const MediaContentDescription* content, |
ContentAction action, |
std::string* error_desc) { |
TRACE_EVENT0("webrtc", "BaseChannel::SetRemoteContent"); |
- return InvokeOnWorker<bool>( |
- RTC_FROM_HERE, Bind(&BaseChannel::SetRemoteContent_w, this, content, |
- action, error_desc)); |
+ return InvokeOnWorker(RTC_FROM_HERE, Bind(&BaseChannel::SetRemoteContent_w, |
+ this, content, action, error_desc)); |
} |
void BaseChannel::StartConnectionMonitor(int cms) { |
@@ -1508,9 +1505,9 @@ |
bool enable, |
const AudioOptions* options, |
AudioSource* source) { |
- return InvokeOnWorker<bool>( |
- RTC_FROM_HERE, Bind(&VoiceMediaChannel::SetAudioSend, media_channel(), |
- ssrc, enable, options, source)); |
+ return InvokeOnWorker(RTC_FROM_HERE, |
+ Bind(&VoiceMediaChannel::SetAudioSend, media_channel(), |
+ ssrc, enable, options, source)); |
} |
// TODO(juberti): Handle early media the right way. We should get an explicit |
@@ -1530,22 +1527,20 @@ |
} |
bool VoiceChannel::CanInsertDtmf() { |
- return InvokeOnWorker<bool>( |
+ return InvokeOnWorker( |
RTC_FROM_HERE, Bind(&VoiceMediaChannel::CanInsertDtmf, media_channel())); |
} |
bool VoiceChannel::InsertDtmf(uint32_t ssrc, |
int event_code, |
int duration) { |
- return InvokeOnWorker<bool>( |
- RTC_FROM_HERE, |
- Bind(&VoiceChannel::InsertDtmf_w, this, ssrc, event_code, duration)); |
+ return InvokeOnWorker(RTC_FROM_HERE, Bind(&VoiceChannel::InsertDtmf_w, this, |
+ ssrc, event_code, duration)); |
} |
bool VoiceChannel::SetOutputVolume(uint32_t ssrc, double volume) { |
- return InvokeOnWorker<bool>( |
- RTC_FROM_HERE, |
- Bind(&VoiceMediaChannel::SetOutputVolume, media_channel(), ssrc, volume)); |
+ return InvokeOnWorker(RTC_FROM_HERE, Bind(&VoiceMediaChannel::SetOutputVolume, |
+ media_channel(), ssrc, volume)); |
} |
void VoiceChannel::SetRawAudioSink( |
@@ -1554,8 +1549,8 @@ |
// We need to work around Bind's lack of support for unique_ptr and ownership |
// passing. So we invoke to our own little routine that gets a pointer to |
// our local variable. This is OK since we're synchronously invoking. |
- InvokeOnWorker<bool>(RTC_FROM_HERE, |
- Bind(&SetRawAudioSink_w, media_channel(), ssrc, &sink)); |
+ InvokeOnWorker(RTC_FROM_HERE, |
+ Bind(&SetRawAudioSink_w, media_channel(), ssrc, &sink)); |
} |
webrtc::RtpParameters VoiceChannel::GetRtpSendParameters(uint32_t ssrc) const { |
@@ -1571,7 +1566,7 @@ |
bool VoiceChannel::SetRtpSendParameters( |
uint32_t ssrc, |
const webrtc::RtpParameters& parameters) { |
- return InvokeOnWorker<bool>( |
+ return InvokeOnWorker( |
RTC_FROM_HERE, |
Bind(&VoiceChannel::SetRtpSendParameters_w, this, ssrc, parameters)); |
} |
@@ -1596,7 +1591,7 @@ |
bool VoiceChannel::SetRtpReceiveParameters( |
uint32_t ssrc, |
const webrtc::RtpParameters& parameters) { |
- return InvokeOnWorker<bool>( |
+ return InvokeOnWorker( |
RTC_FROM_HERE, |
Bind(&VoiceChannel::SetRtpReceiveParameters_w, this, ssrc, parameters)); |
} |
@@ -1607,8 +1602,8 @@ |
} |
bool VoiceChannel::GetStats(VoiceMediaInfo* stats) { |
- return InvokeOnWorker<bool>(RTC_FROM_HERE, Bind(&VoiceMediaChannel::GetStats, |
- media_channel(), stats)); |
+ return InvokeOnWorker(RTC_FROM_HERE, Bind(&VoiceMediaChannel::GetStats, |
+ media_channel(), stats)); |
} |
std::vector<webrtc::RtpSource> VoiceChannel::GetSources(uint32_t ssrc) const { |
@@ -1927,9 +1922,9 @@ |
bool mute, |
const VideoOptions* options, |
rtc::VideoSourceInterface<webrtc::VideoFrame>* source) { |
- return InvokeOnWorker<bool>( |
- RTC_FROM_HERE, Bind(&VideoMediaChannel::SetVideoSend, media_channel(), |
- ssrc, mute, options, source)); |
+ return InvokeOnWorker(RTC_FROM_HERE, |
+ Bind(&VideoMediaChannel::SetVideoSend, media_channel(), |
+ ssrc, mute, options, source)); |
} |
webrtc::RtpParameters VideoChannel::GetRtpSendParameters(uint32_t ssrc) const { |
@@ -1945,7 +1940,7 @@ |
bool VideoChannel::SetRtpSendParameters( |
uint32_t ssrc, |
const webrtc::RtpParameters& parameters) { |
- return InvokeOnWorker<bool>( |
+ return InvokeOnWorker( |
RTC_FROM_HERE, |
Bind(&VideoChannel::SetRtpSendParameters_w, this, ssrc, parameters)); |
} |
@@ -1970,7 +1965,7 @@ |
bool VideoChannel::SetRtpReceiveParameters( |
uint32_t ssrc, |
const webrtc::RtpParameters& parameters) { |
- return InvokeOnWorker<bool>( |
+ return InvokeOnWorker( |
RTC_FROM_HERE, |
Bind(&VideoChannel::SetRtpReceiveParameters_w, this, ssrc, parameters)); |
} |
@@ -1992,14 +1987,9 @@ |
LOG(LS_INFO) << "Changing video state, send=" << send; |
} |
-void VideoChannel::FillBitrateInfo(BandwidthEstimationInfo* bwe_info) { |
- InvokeOnWorker<void>(RTC_FROM_HERE, Bind(&VideoMediaChannel::FillBitrateInfo, |
- media_channel(), bwe_info)); |
-} |
- |
bool VideoChannel::GetStats(VideoMediaInfo* stats) { |
- return InvokeOnWorker<bool>(RTC_FROM_HERE, Bind(&VideoMediaChannel::GetStats, |
- media_channel(), stats)); |
+ return InvokeOnWorker(RTC_FROM_HERE, Bind(&VideoMediaChannel::GetStats, |
+ media_channel(), stats)); |
} |
void VideoChannel::StartMediaMonitor(int cms) { |
@@ -2189,7 +2179,7 @@ |
bool RtpDataChannel::SendData(const SendDataParams& params, |
const rtc::CopyOnWriteBuffer& payload, |
SendDataResult* result) { |
- return InvokeOnWorker<bool>( |
+ return InvokeOnWorker( |
RTC_FROM_HERE, Bind(&DataMediaChannel::SendData, media_channel(), params, |
payload, result)); |
} |