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

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

Issue 2404233004: Call OnTransportFeedback just when feedback_observer exist. (Closed)
Patch Set: Created 4 years, 2 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 | « no previous file | 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 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 size_t length, 204 size_t length,
205 int probe_cluster_id) override { 205 int probe_cluster_id) override {
206 RTC_DCHECK(pacer_thread_.CalledOnValidThread()); 206 RTC_DCHECK(pacer_thread_.CalledOnValidThread());
207 rtc::CritScope lock(&crit_); 207 rtc::CritScope lock(&crit_);
208 if (feedback_observer_) 208 if (feedback_observer_)
209 feedback_observer_->AddPacket(sequence_number, length, probe_cluster_id); 209 feedback_observer_->AddPacket(sequence_number, length, probe_cluster_id);
210 } 210 }
211 void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override { 211 void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override {
212 RTC_DCHECK(network_thread_.CalledOnValidThread()); 212 RTC_DCHECK(network_thread_.CalledOnValidThread());
213 rtc::CritScope lock(&crit_); 213 rtc::CritScope lock(&crit_);
214 feedback_observer_->OnTransportFeedback(feedback); 214 if (feedback_observer_)
215 feedback_observer_->OnTransportFeedback(feedback);
215 } 216 }
216 std::vector<PacketInfo> GetTransportFeedbackVector() const override { 217 std::vector<PacketInfo> GetTransportFeedbackVector() const override {
217 RTC_NOTREACHED(); 218 RTC_NOTREACHED();
218 return std::vector<PacketInfo>(); 219 return std::vector<PacketInfo>();
219 } 220 }
220 221
221 private: 222 private:
222 rtc::CriticalSection crit_; 223 rtc::CriticalSection crit_;
223 rtc::ThreadChecker thread_checker_; 224 rtc::ThreadChecker thread_checker_;
224 rtc::ThreadChecker pacer_thread_; 225 rtc::ThreadChecker pacer_thread_;
(...skipping 3030 matching lines...) Expand 10 before | Expand all | Expand 10 after
3255 int64_t min_rtt = 0; 3256 int64_t min_rtt = 0;
3256 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != 3257 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) !=
3257 0) { 3258 0) {
3258 return 0; 3259 return 0;
3259 } 3260 }
3260 return rtt; 3261 return rtt;
3261 } 3262 }
3262 3263
3263 } // namespace voe 3264 } // namespace voe
3264 } // namespace webrtc 3265 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698