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

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

Issue 2452163004: Stop using VoEVideoSync in Call/VideoReceiveStream. (Closed)
Patch Set: fixed build error Created 3 years, 11 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
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 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 const ChannelProxy& send_channel_proxy) { 242 const ChannelProxy& send_channel_proxy) {
243 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 243 RTC_DCHECK(thread_checker_.CalledOnValidThread());
244 channel()->set_associate_send_channel(send_channel_proxy.channel_owner_); 244 channel()->set_associate_send_channel(send_channel_proxy.channel_owner_);
245 } 245 }
246 246
247 void ChannelProxy::DisassociateSendChannel() { 247 void ChannelProxy::DisassociateSendChannel() {
248 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 248 RTC_DCHECK(thread_checker_.CalledOnValidThread());
249 channel()->set_associate_send_channel(ChannelOwner(nullptr)); 249 channel()->set_associate_send_channel(ChannelOwner(nullptr));
250 } 250 }
251 251
252 void ChannelProxy::GetRtpRtcp(RtpRtcp** rtp_rtcp,
253 RtpReceiver** rtp_receiver) const {
254 RTC_DCHECK(thread_checker_.CalledOnValidThread());
255 RTC_DCHECK(rtp_rtcp);
256 RTC_DCHECK(rtp_receiver);
257 int error = channel()->GetRtpRtcp(rtp_rtcp, rtp_receiver);
258 RTC_DCHECK_EQ(0, error);
259 }
260
261 void ChannelProxy::GetDelayEstimate(int* jitter_buffer_delay_ms,
262 int* playout_buffer_delay_ms) const {
263 // Called on Call's module_process_thread_.
264 RTC_DCHECK(jitter_buffer_delay_ms);
265 RTC_DCHECK(playout_buffer_delay_ms);
266 bool error = channel()->GetDelayEstimate(jitter_buffer_delay_ms,
267 playout_buffer_delay_ms);
268 RTC_DCHECK(error);
269 }
270
271 uint32_t ChannelProxy::GetPlayoutTimestamp() const {
272 // Called on video capture thread.
273 unsigned int timestamp = 0;
274 int error = channel()->GetPlayoutTimestamp(timestamp);
275 RTC_DCHECK(!error || timestamp == 0);
276 return timestamp;
277 }
278
279 void ChannelProxy::SetMinimumPlayoutDelay(int delay_ms) {
280 // Called on Call's module_process_thread_.
281 // Limit to range accepted by both VoE and ACM, so we're at least getting as
282 // close as possible, instead of failing.
283 delay_ms = std::max(0, std::min(delay_ms, 10000));
284 int error = channel()->SetMinimumPlayoutDelay(delay_ms);
285 RTC_DCHECK_EQ(0, error);
286 }
287
252 void ChannelProxy::SetRtcpRttStats(RtcpRttStats* rtcp_rtt_stats) { 288 void ChannelProxy::SetRtcpRttStats(RtcpRttStats* rtcp_rtt_stats) {
253 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 289 RTC_DCHECK(thread_checker_.CalledOnValidThread());
254 channel()->SetRtcpRttStats(rtcp_rtt_stats); 290 channel()->SetRtcpRttStats(rtcp_rtt_stats);
255 } 291 }
256 292
257 Channel* ChannelProxy::channel() const { 293 Channel* ChannelProxy::channel() const {
258 RTC_DCHECK(channel_owner_.channel()); 294 RTC_DCHECK(channel_owner_.channel());
259 return channel_owner_.channel(); 295 return channel_owner_.channel();
260 } 296 }
261 297
262 } // namespace voe 298 } // namespace voe
263 } // namespace webrtc 299 } // namespace webrtc
OLDNEW
« webrtc/video/rtp_streams_synchronizer.cc ('K') | « webrtc/voice_engine/channel_proxy.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698