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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtp_sender.cc

Issue 2610873002: Temporarily remove SSRC DCHECK in RTPSender::SendToNetwork. (Closed)
Patch Set: Created 3 years, 11 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 863 matching lines...) Expand 10 before | Expand all | Expand 10 after
874 if (sent) { 874 if (sent) {
875 { 875 {
876 rtc::CritScope lock(&send_critsect_); 876 rtc::CritScope lock(&send_critsect_);
877 media_has_been_sent_ = true; 877 media_has_been_sent_ = true;
878 } 878 }
879 UpdateRtpStats(*packet, false, false); 879 UpdateRtpStats(*packet, false, false);
880 } 880 }
881 881
882 // To support retransmissions, we store the media packet as sent in the 882 // To support retransmissions, we store the media packet as sent in the
883 // packet history (even if send failed). 883 // packet history (even if send failed).
884 if (storage == kAllowRetransmission) { 884 if (storage == kAllowRetransmission && ssrc == SSRC()) {
danilchap 2017/01/05 12:23:36 alternatively to clearing packet_history/having ss
885 RTC_DCHECK_EQ(ssrc, SSRC());
886 packet_history_.PutRtpPacket(std::move(packet), storage, true); 885 packet_history_.PutRtpPacket(std::move(packet), storage, true);
887 } 886 }
888 887
889 return sent; 888 return sent;
890 } 889 }
891 890
892 void RTPSender::UpdateDelayStatistics(int64_t capture_time_ms, int64_t now_ms) { 891 void RTPSender::UpdateDelayStatistics(int64_t capture_time_ms, int64_t now_ms) {
893 if (!send_side_delay_observer_ || capture_time_ms <= 0) 892 if (!send_side_delay_observer_ || capture_time_ms <= 0)
894 return; 893 return;
895 894
(...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after
1293 return; 1292 return;
1294 } 1293 }
1295 rtp_overhead_bytes_per_packet_ = packet.headers_size(); 1294 rtp_overhead_bytes_per_packet_ = packet.headers_size();
1296 overhead_bytes_per_packet = 1295 overhead_bytes_per_packet =
1297 rtp_overhead_bytes_per_packet_ + transport_overhead_bytes_per_packet_; 1296 rtp_overhead_bytes_per_packet_ + transport_overhead_bytes_per_packet_;
1298 } 1297 }
1299 overhead_observer_->OnOverheadChanged(overhead_bytes_per_packet); 1298 overhead_observer_->OnOverheadChanged(overhead_bytes_per_packet);
1300 } 1299 }
1301 1300
1302 } // namespace webrtc 1301 } // 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