Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: webrtc/voice_engine/channel_proxy.h

Issue 2672583002: Remove VoEVideoSync interface. (Closed)
Patch Set: rebase Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/voice_engine/channel.cc ('k') | webrtc/voice_engine/channel_proxy.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 int max_frame_length_ms); 98 int max_frame_length_ms);
99 virtual AudioMixer::Source::AudioFrameInfo GetAudioFrameWithInfo( 99 virtual AudioMixer::Source::AudioFrameInfo GetAudioFrameWithInfo(
100 int sample_rate_hz, 100 int sample_rate_hz,
101 AudioFrame* audio_frame); 101 AudioFrame* audio_frame);
102 virtual int NeededFrequency() const; 102 virtual int NeededFrequency() const;
103 virtual void SetTransportOverhead(int transport_overhead_per_packet); 103 virtual void SetTransportOverhead(int transport_overhead_per_packet);
104 virtual void AssociateSendChannel(const ChannelProxy& send_channel_proxy); 104 virtual void AssociateSendChannel(const ChannelProxy& send_channel_proxy);
105 virtual void DisassociateSendChannel(); 105 virtual void DisassociateSendChannel();
106 virtual void GetRtpRtcp(RtpRtcp** rtp_rtcp, 106 virtual void GetRtpRtcp(RtpRtcp** rtp_rtcp,
107 RtpReceiver** rtp_receiver) const; 107 RtpReceiver** rtp_receiver) const;
108 virtual void GetDelayEstimate(int* jitter_buffer_delay_ms,
109 int* playout_buffer_delay_ms) const;
110 virtual uint32_t GetPlayoutTimestamp() const; 108 virtual uint32_t GetPlayoutTimestamp() const;
111 virtual void SetMinimumPlayoutDelay(int delay_ms); 109 virtual void SetMinimumPlayoutDelay(int delay_ms);
112 virtual void SetRtcpRttStats(RtcpRttStats* rtcp_rtt_stats); 110 virtual void SetRtcpRttStats(RtcpRttStats* rtcp_rtt_stats);
113 virtual bool GetRecCodec(CodecInst* codec_inst) const; 111 virtual bool GetRecCodec(CodecInst* codec_inst) const;
114 virtual bool GetSendCodec(CodecInst* codec_inst) const; 112 virtual bool GetSendCodec(CodecInst* codec_inst) const;
115 virtual bool SetVADStatus(bool enable); 113 virtual bool SetVADStatus(bool enable);
116 virtual bool SetCodecFECStatus(bool enable); 114 virtual bool SetCodecFECStatus(bool enable);
117 virtual bool SetOpusDtx(bool enable); 115 virtual bool SetOpusDtx(bool enable);
118 virtual bool SetOpusMaxPlaybackRate(int frequency_hz); 116 virtual bool SetOpusMaxPlaybackRate(int frequency_hz);
119 virtual bool SetSendCodec(const CodecInst& codec_inst); 117 virtual bool SetSendCodec(const CodecInst& codec_inst);
120 virtual bool SetSendCNPayloadType(int type, PayloadFrequencies frequency); 118 virtual bool SetSendCNPayloadType(int type, PayloadFrequencies frequency);
121 119
122 private: 120 private:
123 Channel* channel() const; 121 Channel* channel() const;
124 122
125 rtc::ThreadChecker thread_checker_; 123 // Thread checkers document and lock usage of some methods on voe::Channel to
126 rtc::RaceChecker race_checker_; 124 // specific threads we know about. The goal is to eventually split up
125 // voe::Channel into parts with single-threaded semantics, and thereby reduce
126 // the need for locks.
127 rtc::ThreadChecker worker_thread_checker_;
128 rtc::ThreadChecker module_process_thread_checker_;
129 // 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
131 // checkers cannot be used. E.g. Chromium may transfer "ownership" from one
132 // audio thread to another, but access is still sequential.
133 rtc::RaceChecker audio_thread_race_checker_;
134 rtc::RaceChecker video_capture_thread_race_checker_;
127 ChannelOwner channel_owner_; 135 ChannelOwner channel_owner_;
128 136
129 RTC_DISALLOW_COPY_AND_ASSIGN(ChannelProxy); 137 RTC_DISALLOW_COPY_AND_ASSIGN(ChannelProxy);
130 }; 138 };
131 } // namespace voe 139 } // namespace voe
132 } // namespace webrtc 140 } // namespace webrtc
133 141
134 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_ 142 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_
OLDNEW
« no previous file with comments | « webrtc/voice_engine/channel.cc ('k') | webrtc/voice_engine/channel_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698