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

Side by Side Diff: webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.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
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 25 matching lines...) Expand all
36 36
37 void RemoteEstimatorProxy::IncomingPacketFeedbackVector( 37 void RemoteEstimatorProxy::IncomingPacketFeedbackVector(
38 const std::vector<PacketInfo>& packet_feedback_vector) { 38 const std::vector<PacketInfo>& packet_feedback_vector) {
39 rtc::CritScope cs(&lock_); 39 rtc::CritScope cs(&lock_);
40 for (PacketInfo info : packet_feedback_vector) 40 for (PacketInfo info : packet_feedback_vector)
41 OnPacketArrival(info.sequence_number, info.arrival_time_ms); 41 OnPacketArrival(info.sequence_number, info.arrival_time_ms);
42 } 42 }
43 43
44 void RemoteEstimatorProxy::IncomingPacket(int64_t arrival_time_ms, 44 void RemoteEstimatorProxy::IncomingPacket(int64_t arrival_time_ms,
45 size_t payload_size, 45 size_t payload_size,
46 const RTPHeader& header) { 46 const RTPHeader& header,
47 bool was_paced) {
47 if (!header.extension.hasTransportSequenceNumber) { 48 if (!header.extension.hasTransportSequenceNumber) {
48 LOG(LS_WARNING) << "RemoteEstimatorProxy: Incoming packet " 49 LOG(LS_WARNING) << "RemoteEstimatorProxy: Incoming packet "
49 "is missing the transport sequence number extension!"; 50 "is missing the transport sequence number extension!";
50 return; 51 return;
51 } 52 }
52 rtc::CritScope cs(&lock_); 53 rtc::CritScope cs(&lock_);
53 media_ssrc_ = header.ssrc; 54 media_ssrc_ = header.ssrc;
54 55
55 OnPacketArrival(header.extension.transportSequenceNumber, arrival_time_ms); 56 OnPacketArrival(header.extension.transportSequenceNumber, arrival_time_ms);
56 } 57 }
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 // they need to be re-sent after a reordering. Removal will be handled 147 // they need to be re-sent after a reordering. Removal will be handled
147 // by OnPacketArrival once packets are too old. 148 // by OnPacketArrival once packets are too old.
148 } 149 }
149 if (it == packet_arrival_times_.end()) 150 if (it == packet_arrival_times_.end())
150 window_start_seq_ = -1; 151 window_start_seq_ = -1;
151 152
152 return true; 153 return true;
153 } 154 }
154 155
155 } // namespace webrtc 156 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698