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

Side by Side Diff: webrtc/video_engine/vie_receiver.cc

Issue 1188823007: Only use paced packets for estimating bitrate probes. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Added unittest Created 5 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_engine/vie_channel_group.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 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 << ", arrival time: " << arrival_time_ms; 273 << ", arrival time: " << arrival_time_ms;
274 if (header.extension.hasTransmissionTimeOffset) 274 if (header.extension.hasTransmissionTimeOffset)
275 ss << ", toffset: " << header.extension.transmissionTimeOffset; 275 ss << ", toffset: " << header.extension.transmissionTimeOffset;
276 if (header.extension.hasAbsoluteSendTime) 276 if (header.extension.hasAbsoluteSendTime)
277 ss << ", abs send time: " << header.extension.absoluteSendTime; 277 ss << ", abs send time: " << header.extension.absoluteSendTime;
278 LOG(LS_INFO) << ss.str(); 278 LOG(LS_INFO) << ss.str();
279 last_packet_log_ms_ = now_ms; 279 last_packet_log_ms_ = now_ms;
280 } 280 }
281 } 281 }
282 282
283 remote_bitrate_estimator_->IncomingPacket(arrival_time_ms, 283 remote_bitrate_estimator_->IncomingPacket(arrival_time_ms, payload_length,
284 payload_length, header); 284 header, true);
285 header.payload_type_frequency = kVideoPayloadTypeFrequency; 285 header.payload_type_frequency = kVideoPayloadTypeFrequency;
286 286
287 bool in_order = IsPacketInOrder(header); 287 bool in_order = IsPacketInOrder(header);
288 rtp_payload_registry_->SetIncomingPayloadType(header); 288 rtp_payload_registry_->SetIncomingPayloadType(header);
289 int ret = ReceivePacket(rtp_packet, rtp_packet_length, header, in_order) 289 int ret = ReceivePacket(rtp_packet, rtp_packet_length, header, in_order)
290 ? 0 290 ? 0
291 : -1; 291 : -1;
292 // Update receive statistics after ReceivePacket. 292 // Update receive statistics after ReceivePacket.
293 // Receive statistics will be reset if the payload type changes (make sure 293 // Receive statistics will be reset if the payload type changes (make sure
294 // that the first packet is included in the stats). 294 // that the first packet is included in the stats).
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 rtp_receive_statistics_->GetStatistician(header.ssrc); 459 rtp_receive_statistics_->GetStatistician(header.ssrc);
460 if (!statistician) 460 if (!statistician)
461 return false; 461 return false;
462 // Check if this is a retransmission. 462 // Check if this is a retransmission.
463 int64_t min_rtt = 0; 463 int64_t min_rtt = 0;
464 rtp_rtcp_->RTT(rtp_receiver_->SSRC(), NULL, NULL, &min_rtt, NULL); 464 rtp_rtcp_->RTT(rtp_receiver_->SSRC(), NULL, NULL, &min_rtt, NULL);
465 return !in_order && 465 return !in_order &&
466 statistician->IsRetransmitOfOldPacket(header, min_rtt); 466 statistician->IsRetransmitOfOldPacket(header, min_rtt);
467 } 467 }
468 } // namespace webrtc 468 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video_engine/vie_channel_group.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698