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

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

Issue 2360053003: Fixig issues in bwe plot dynamics. (Closed)
Patch Set: removing not useful check 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 | « webrtc/modules/rtp_rtcp/source/receive_statistics_impl.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 884 matching lines...) Expand 10 before | Expand all | Expand 10 after
895 // |capture_time_ms| <= 0 is considered invalid. 895 // |capture_time_ms| <= 0 is considered invalid.
896 // TODO(holmer): This should be changed all over Video Engine so that negative 896 // TODO(holmer): This should be changed all over Video Engine so that negative
897 // time is consider invalid, while 0 is considered a valid time. 897 // time is consider invalid, while 0 is considered a valid time.
898 if (packet->capture_time_ms() > 0) { 898 if (packet->capture_time_ms() > 0) {
899 packet->SetExtension<TransmissionOffset>( 899 packet->SetExtension<TransmissionOffset>(
900 kTimestampTicksPerMs * (now_ms - packet->capture_time_ms())); 900 kTimestampTicksPerMs * (now_ms - packet->capture_time_ms()));
901 } 901 }
902 packet->SetExtension<AbsoluteSendTime>(now_ms); 902 packet->SetExtension<AbsoluteSendTime>(now_ms);
903 903
904 if (video_) { 904 if (video_) {
905 BWE_TEST_LOGGING_PLOT_WITH_SSRC(1, "VideoTotBitrate[kbps]", now_ms, 905 BWE_TEST_LOGGING_PLOT_WITH_SSRC(1, "VideoTotBitrate_kbps", now_ms,
906 ActualSendBitrateKbit(), packet->Ssrc()); 906 ActualSendBitrateKbit(), packet->Ssrc());
907 BWE_TEST_LOGGING_PLOT_WITH_SSRC(1, "VideoFecBitrate[Kbps]", now_ms, 907 BWE_TEST_LOGGING_PLOT_WITH_SSRC(1, "VideoFecBitrate_kbps", now_ms,
908 FecOverheadRate() / 1000, packet->Ssrc()); 908 FecOverheadRate() / 1000, packet->Ssrc());
909 BWE_TEST_LOGGING_PLOT_WITH_SSRC(1, "VideoNackBitrate[Kbps]", now_ms, 909 BWE_TEST_LOGGING_PLOT_WITH_SSRC(1, "VideoNackBitrate_kbps", now_ms,
910 NackOverheadRate() / 1000, packet->Ssrc()); 910 NackOverheadRate() / 1000, packet->Ssrc());
911 } else { 911 } else {
912 BWE_TEST_LOGGING_PLOT_WITH_SSRC(1, "AudioTotBitrate[kbps]", now_ms, 912 BWE_TEST_LOGGING_PLOT_WITH_SSRC(1, "AudioTotBitrate_kbps", now_ms,
913 ActualSendBitrateKbit(), packet->Ssrc()); 913 ActualSendBitrateKbit(), packet->Ssrc());
914 BWE_TEST_LOGGING_PLOT_WITH_SSRC(1, "AudioNackBitrate[Kbps]", now_ms, 914 BWE_TEST_LOGGING_PLOT_WITH_SSRC(1, "AudioNackBitrate_kbps", now_ms,
915 NackOverheadRate() / 1000, packet->Ssrc()); 915 NackOverheadRate() / 1000, packet->Ssrc());
916 } 916 }
917 917
918 if (paced_sender_) { 918 if (paced_sender_) {
919 uint16_t seq_no = packet->SequenceNumber(); 919 uint16_t seq_no = packet->SequenceNumber();
920 uint32_t ssrc = packet->Ssrc(); 920 uint32_t ssrc = packet->Ssrc();
921 // Correct offset between implementations of millisecond time stamps in 921 // Correct offset between implementations of millisecond time stamps in
922 // TickTime and Clock. 922 // TickTime and Clock.
923 int64_t corrected_time_ms = packet->capture_time_ms() + clock_delta_ms_; 923 int64_t corrected_time_ms = packet->capture_time_ms() + clock_delta_ms_;
924 size_t payload_length = packet->payload_size(); 924 size_t payload_length = packet->payload_size();
(...skipping 838 matching lines...) Expand 10 before | Expand all | Expand 10 after
1763 rtc::CritScope lock(&send_critsect_); 1763 rtc::CritScope lock(&send_critsect_);
1764 1764
1765 RtpState state; 1765 RtpState state;
1766 state.sequence_number = sequence_number_rtx_; 1766 state.sequence_number = sequence_number_rtx_;
1767 state.start_timestamp = timestamp_offset_; 1767 state.start_timestamp = timestamp_offset_;
1768 1768
1769 return state; 1769 return state;
1770 } 1770 }
1771 1771
1772 } // namespace webrtc 1772 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698