| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. | 2  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. | 
| 3  * | 3  * | 
| 4  *  Use of this source code is governed by a BSD-style license | 4  *  Use of this source code is governed by a BSD-style license | 
| 5  *  that can be found in the LICENSE file in the root of the source | 5  *  that can be found in the LICENSE file in the root of the source | 
| 6  *  tree. An additional intellectual property rights grant can be found | 6  *  tree. An additional intellectual property rights grant can be found | 
| 7  *  in the file PATENTS.  All contributing project authors may | 7  *  in the file PATENTS.  All contributing project authors may | 
| 8  *  be found in the AUTHORS file in the root of the source tree. | 8  *  be found in the AUTHORS file in the root of the source tree. | 
| 9  */ | 9  */ | 
| 10 | 10 | 
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 109   virtual void SetMinimumPlayoutDelay(int delay_ms); | 109   virtual void SetMinimumPlayoutDelay(int delay_ms); | 
| 110   virtual void SetRtcpRttStats(RtcpRttStats* rtcp_rtt_stats); | 110   virtual void SetRtcpRttStats(RtcpRttStats* rtcp_rtt_stats); | 
| 111   virtual bool GetRecCodec(CodecInst* codec_inst) const; | 111   virtual bool GetRecCodec(CodecInst* codec_inst) const; | 
| 112   virtual bool GetSendCodec(CodecInst* codec_inst) const; | 112   virtual bool GetSendCodec(CodecInst* codec_inst) const; | 
| 113   virtual bool SetVADStatus(bool enable); | 113   virtual bool SetVADStatus(bool enable); | 
| 114   virtual bool SetCodecFECStatus(bool enable); | 114   virtual bool SetCodecFECStatus(bool enable); | 
| 115   virtual bool SetOpusDtx(bool enable); | 115   virtual bool SetOpusDtx(bool enable); | 
| 116   virtual bool SetOpusMaxPlaybackRate(int frequency_hz); | 116   virtual bool SetOpusMaxPlaybackRate(int frequency_hz); | 
| 117   virtual bool SetSendCodec(const CodecInst& codec_inst); | 117   virtual bool SetSendCodec(const CodecInst& codec_inst); | 
| 118   virtual bool SetSendCNPayloadType(int type, PayloadFrequencies frequency); | 118   virtual bool SetSendCNPayloadType(int type, PayloadFrequencies frequency); | 
|  | 119   virtual void OnTwccBasedUplinkPacketLossRate( | 
|  | 120       const rtc::Optional<float>& packet_loss_rate); | 
| 119 | 121 | 
| 120  private: | 122  private: | 
| 121   Channel* channel() const; | 123   Channel* channel() const; | 
| 122 | 124 | 
| 123   // Thread checkers document and lock usage of some methods on voe::Channel to | 125   // Thread checkers document and lock usage of some methods on voe::Channel to | 
| 124   // specific threads we know about. The goal is to eventually split up | 126   // specific threads we know about. The goal is to eventually split up | 
| 125   // voe::Channel into parts with single-threaded semantics, and thereby reduce | 127   // voe::Channel into parts with single-threaded semantics, and thereby reduce | 
| 126   // the need for locks. | 128   // the need for locks. | 
| 127   rtc::ThreadChecker worker_thread_checker_; | 129   rtc::ThreadChecker worker_thread_checker_; | 
| 128   rtc::ThreadChecker module_process_thread_checker_; | 130   rtc::ThreadChecker module_process_thread_checker_; | 
| 129   // Methods accessed from audio and video threads are checked for sequential- | 131   // Methods accessed from audio and video threads are checked for sequential- | 
| 130   // only access. We don't necessarily own and control these threads, so thread | 132   // only access. We don't necessarily own and control these threads, so thread | 
| 131   // checkers cannot be used. E.g. Chromium may transfer "ownership" from one | 133   // checkers cannot be used. E.g. Chromium may transfer "ownership" from one | 
| 132   // audio thread to another, but access is still sequential. | 134   // audio thread to another, but access is still sequential. | 
| 133   rtc::RaceChecker audio_thread_race_checker_; | 135   rtc::RaceChecker audio_thread_race_checker_; | 
| 134   rtc::RaceChecker video_capture_thread_race_checker_; | 136   rtc::RaceChecker video_capture_thread_race_checker_; | 
| 135   ChannelOwner channel_owner_; | 137   ChannelOwner channel_owner_; | 
| 136 | 138 | 
| 137   RTC_DISALLOW_COPY_AND_ASSIGN(ChannelProxy); | 139   RTC_DISALLOW_COPY_AND_ASSIGN(ChannelProxy); | 
| 138 }; | 140 }; | 
| 139 }  // namespace voe | 141 }  // namespace voe | 
| 140 }  // namespace webrtc | 142 }  // namespace webrtc | 
| 141 | 143 | 
| 142 #endif  // WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_ | 144 #endif  // WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_ | 
| OLD | NEW | 
|---|