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

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

Issue 2112643005: Remove audio/video distinction for probe packets. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@52
Patch Set: rebase errors Created 4 years, 5 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/video/rtp_stream_receiver.cc ('k') | no next file » | 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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 } 65 }
66 66
67 void SetTransportFeedbackObserver( 67 void SetTransportFeedbackObserver(
68 TransportFeedbackObserver* feedback_observer) { 68 TransportFeedbackObserver* feedback_observer) {
69 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 69 RTC_DCHECK(thread_checker_.CalledOnValidThread());
70 rtc::CritScope lock(&crit_); 70 rtc::CritScope lock(&crit_);
71 feedback_observer_ = feedback_observer; 71 feedback_observer_ = feedback_observer;
72 } 72 }
73 73
74 // Implements TransportFeedbackObserver. 74 // Implements TransportFeedbackObserver.
75 void AddPacket(uint16_t sequence_number, 75 void AddPacket(uint16_t sequence_number, size_t length) override {
76 size_t length,
77 bool was_paced) override {
78 RTC_DCHECK(pacer_thread_.CalledOnValidThread()); 76 RTC_DCHECK(pacer_thread_.CalledOnValidThread());
79 rtc::CritScope lock(&crit_); 77 rtc::CritScope lock(&crit_);
80 if (feedback_observer_) 78 if (feedback_observer_)
81 feedback_observer_->AddPacket(sequence_number, length, was_paced); 79 feedback_observer_->AddPacket(sequence_number, length);
82 } 80 }
83 void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override { 81 void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override {
84 RTC_DCHECK(network_thread_.CalledOnValidThread()); 82 RTC_DCHECK(network_thread_.CalledOnValidThread());
85 rtc::CritScope lock(&crit_); 83 rtc::CritScope lock(&crit_);
86 if (feedback_observer_) 84 if (feedback_observer_)
87 feedback_observer_->OnTransportFeedback(feedback); 85 feedback_observer_->OnTransportFeedback(feedback);
88 } 86 }
89 87
90 private: 88 private:
91 rtc::CriticalSection crit_; 89 rtc::CriticalSection crit_;
(...skipping 3467 matching lines...) Expand 10 before | Expand all | Expand 10 after
3559 int64_t min_rtt = 0; 3557 int64_t min_rtt = 0;
3560 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != 3558 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) !=
3561 0) { 3559 0) {
3562 return 0; 3560 return 0;
3563 } 3561 }
3564 return rtt; 3562 return rtt;
3565 } 3563 }
3566 3564
3567 } // namespace voe 3565 } // namespace voe
3568 } // namespace webrtc 3566 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/rtp_stream_receiver.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698