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

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

Issue 2086633002: Revert of Remove audio/video distinction for probe packets. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 6 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 void SetTransportFeedbackObserver( 68 void SetTransportFeedbackObserver(
69 TransportFeedbackObserver* feedback_observer) { 69 TransportFeedbackObserver* feedback_observer) {
70 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 70 RTC_DCHECK(thread_checker_.CalledOnValidThread());
71 rtc::CritScope lock(&crit_); 71 rtc::CritScope lock(&crit_);
72 feedback_observer_ = feedback_observer; 72 feedback_observer_ = feedback_observer;
73 } 73 }
74 74
75 // Implements TransportFeedbackObserver. 75 // Implements TransportFeedbackObserver.
76 void AddPacket(uint16_t sequence_number, 76 void AddPacket(uint16_t sequence_number,
77 size_t length, 77 size_t length,
78 bool was_paced,
78 int probe_cluster_id) override { 79 int probe_cluster_id) override {
79 RTC_DCHECK(pacer_thread_.CalledOnValidThread()); 80 RTC_DCHECK(pacer_thread_.CalledOnValidThread());
80 rtc::CritScope lock(&crit_); 81 rtc::CritScope lock(&crit_);
81 if (feedback_observer_) 82 if (feedback_observer_)
82 feedback_observer_->AddPacket(sequence_number, length, probe_cluster_id); 83 feedback_observer_->AddPacket(sequence_number, length, was_paced,
84 probe_cluster_id);
83 } 85 }
84 void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override { 86 void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override {
85 RTC_DCHECK(network_thread_.CalledOnValidThread()); 87 RTC_DCHECK(network_thread_.CalledOnValidThread());
86 rtc::CritScope lock(&crit_); 88 rtc::CritScope lock(&crit_);
87 if (feedback_observer_) 89 if (feedback_observer_)
88 feedback_observer_->OnTransportFeedback(feedback); 90 feedback_observer_->OnTransportFeedback(feedback);
89 } 91 }
90 92
91 private: 93 private:
92 rtc::CriticalSection crit_; 94 rtc::CriticalSection crit_;
(...skipping 3389 matching lines...) Expand 10 before | Expand all | Expand 10 after
3482 int64_t min_rtt = 0; 3484 int64_t min_rtt = 0;
3483 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != 3485 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) !=
3484 0) { 3486 0) {
3485 return 0; 3487 return 0;
3486 } 3488 }
3487 return rtt; 3489 return rtt;
3488 } 3490 }
3489 3491
3490 } // namespace voe 3492 } // namespace voe
3491 } // namespace webrtc 3493 } // 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