Chromium Code Reviews| Index: webrtc/voice_engine/channel_proxy.cc |
| diff --git a/webrtc/voice_engine/channel_proxy.cc b/webrtc/voice_engine/channel_proxy.cc |
| index a58b2e19557790c9248ae0133a714fa4d50729ae..85602cbf47f8ca6cce0f47faceb8fd915cdaea4d 100644 |
| --- a/webrtc/voice_engine/channel_proxy.cc |
| +++ b/webrtc/voice_engine/channel_proxy.cc |
| @@ -134,7 +134,7 @@ int32_t ChannelProxy::GetSpeechOutputLevelFullRange() const { |
| } |
| uint32_t ChannelProxy::GetDelayEstimate() const { |
| - RTC_DCHECK(thread_checker_.CalledOnValidThread()); |
| + // Called on worker thread or Call's module_process_thread_. |
|
kwiberg-webrtc
2017/02/09 10:16:40
Umm... First, can you use thread checkers to verif
the sun
2017/02/11 12:05:53
Are you saying an rtc::RaceChecker would be more a
kwiberg-webrtc
2017/02/11 21:25:25
I'm just saying that I don't understand what you'r
the sun
2017/02/11 23:24:53
Ah, well. The underlying code (voe::Channel) is sp
kwiberg-webrtc
2017/02/12 00:58:37
OK. Then it sounds like you want a race checker---
|
| return channel()->GetDelayEstimate(); |
| } |
| @@ -267,16 +267,6 @@ void ChannelProxy::GetRtpRtcp(RtpRtcp** rtp_rtcp, |
| RTC_DCHECK_EQ(0, error); |
| } |
| -void ChannelProxy::GetDelayEstimate(int* jitter_buffer_delay_ms, |
| - int* playout_buffer_delay_ms) const { |
| - // Called on Call's module_process_thread_. |
| - RTC_DCHECK(jitter_buffer_delay_ms); |
| - RTC_DCHECK(playout_buffer_delay_ms); |
| - bool error = channel()->GetDelayEstimate(jitter_buffer_delay_ms, |
| - playout_buffer_delay_ms); |
| - RTC_DCHECK(error); |
| -} |
| - |
| uint32_t ChannelProxy::GetPlayoutTimestamp() const { |
| // Called on video capture thread. |
| unsigned int timestamp = 0; |