Chromium Code Reviews| Index: webrtc/voice_engine/channel_proxy.h |
| diff --git a/webrtc/voice_engine/channel_proxy.h b/webrtc/voice_engine/channel_proxy.h |
| index 966abc4868d336ab346c265850e9e0e5edfbf4ec..2e9d5825711b35eb29bac7c9f6aa841e26fa81e5 100644 |
| --- a/webrtc/voice_engine/channel_proxy.h |
| +++ b/webrtc/voice_engine/channel_proxy.h |
| @@ -105,8 +105,6 @@ class ChannelProxy { |
| virtual void DisassociateSendChannel(); |
| virtual void GetRtpRtcp(RtpRtcp** rtp_rtcp, |
| RtpReceiver** rtp_receiver) const; |
| - virtual void GetDelayEstimate(int* jitter_buffer_delay_ms, |
| - int* playout_buffer_delay_ms) const; |
| virtual uint32_t GetPlayoutTimestamp() const; |
| virtual void SetMinimumPlayoutDelay(int delay_ms); |
| virtual void SetRtcpRttStats(RtcpRttStats* rtcp_rtt_stats); |
| @@ -122,8 +120,10 @@ class ChannelProxy { |
| private: |
| Channel* channel() const; |
| - rtc::ThreadChecker thread_checker_; |
| - rtc::RaceChecker race_checker_; |
| + rtc::ThreadChecker worker_thread_checker_; |
| + rtc::ThreadChecker module_process_thread_checker_; |
| + rtc::RaceChecker audio_thread_race_checker_; |
| + rtc::RaceChecker video_capture_thread_race_checker_; |
|
kwiberg-webrtc
2017/02/13 13:58:04
Hmm. How does it make sense to name race checkers
|
| ChannelOwner channel_owner_; |
| RTC_DISALLOW_COPY_AND_ASSIGN(ChannelProxy); |