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

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

Issue 1544983002: [rtp_rtcp] rtcp::SenderReport moved into own file and got Parse function (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Added SenderReport::ClearReportBlocks to make SenderReport reusable Created 4 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
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
11 #include "webrtc/modules/rtp_rtcp/source/rtcp_sender.h" 11 #include "webrtc/modules/rtp_rtcp/source/rtcp_sender.h"
12 12
13 #include <assert.h> // assert 13 #include <assert.h> // assert
14 #include <string.h> // memcpy 14 #include <string.h> // memcpy
15 15
16 #include <algorithm> // min 16 #include <algorithm> // min
17 #include <limits> // max 17 #include <limits> // max
18 #include <utility> 18 #include <utility>
19 19
20 #include "webrtc/base/checks.h" 20 #include "webrtc/base/checks.h"
21 #include "webrtc/base/logging.h" 21 #include "webrtc/base/logging.h"
22 #include "webrtc/base/trace_event.h" 22 #include "webrtc/base/trace_event.h"
23 #include "webrtc/common_types.h" 23 #include "webrtc/common_types.h"
24 #include "webrtc/modules/rtp_rtcp/source/byte_io.h" 24 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
25 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h" 25 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h"
26 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h" 26 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h"
27 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/nack.h" 27 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/nack.h"
28 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/pli.h" 28 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/pli.h"
29 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" 29 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h"
30 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h"
30 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" 31 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
31 #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h" 32 #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h"
32 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" 33 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
33 34
34 namespace webrtc { 35 namespace webrtc {
35 36
36 using RTCPUtility::RTCPCnameInformation; 37 using RTCPUtility::RTCPCnameInformation;
37 38
38 NACKStringBuilder::NACKStringBuilder() 39 NACKStringBuilder::NACKStringBuilder()
39 : stream_(""), count_(0), prevNack_(0), consecutive_(false) {} 40 : stream_(""), count_(0), prevNack_(0), consecutive_(false) {}
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 // the frame being captured at this moment. We are calculating that 468 // the frame being captured at this moment. We are calculating that
468 // timestamp as the last frame's timestamp + the time since the last frame 469 // timestamp as the last frame's timestamp + the time since the last frame
469 // was captured. 470 // was captured.
470 uint32_t rtp_timestamp = 471 uint32_t rtp_timestamp =
471 start_timestamp_ + last_rtp_timestamp_ + 472 start_timestamp_ + last_rtp_timestamp_ +
472 (clock_->TimeInMilliseconds() - last_frame_capture_time_ms_) * 473 (clock_->TimeInMilliseconds() - last_frame_capture_time_ms_) *
473 (ctx.feedback_state_.frequency_hz / 1000); 474 (ctx.feedback_state_.frequency_hz / 1000);
474 475
475 rtcp::SenderReport* report = new rtcp::SenderReport(); 476 rtcp::SenderReport* report = new rtcp::SenderReport();
476 report->From(ssrc_); 477 report->From(ssrc_);
477 report->WithNtpSec(ctx.ntp_sec_); 478 report->WithNtp(NtpTime(ctx.ntp_sec_, ctx.ntp_frac_));
478 report->WithNtpFrac(ctx.ntp_frac_);
479 report->WithRtpTimestamp(rtp_timestamp); 479 report->WithRtpTimestamp(rtp_timestamp);
480 report->WithPacketCount(ctx.feedback_state_.packets_sent); 480 report->WithPacketCount(ctx.feedback_state_.packets_sent);
481 report->WithOctetCount(ctx.feedback_state_.media_bytes_sent); 481 report->WithOctetCount(ctx.feedback_state_.media_bytes_sent);
482 482
483 for (auto it : report_blocks_) 483 for (auto it : report_blocks_)
484 report->WithReportBlock(it.second); 484 report->WithReportBlock(it.second);
485 485
486 report_blocks_.clear(); 486 report_blocks_.clear();
487 487
488 return rtc::scoped_ptr<rtcp::SenderReport>(report); 488 return rtc::scoped_ptr<rtcp::SenderReport>(report);
(...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after
1051 Transport* const transport_; 1051 Transport* const transport_;
1052 bool send_failure_; 1052 bool send_failure_;
1053 } sender(transport_); 1053 } sender(transport_);
1054 1054
1055 uint8_t buffer[IP_PACKET_SIZE]; 1055 uint8_t buffer[IP_PACKET_SIZE];
1056 return packet.BuildExternalBuffer(buffer, IP_PACKET_SIZE, &sender) && 1056 return packet.BuildExternalBuffer(buffer, IP_PACKET_SIZE, &sender) &&
1057 !sender.send_failure_; 1057 !sender.send_failure_;
1058 } 1058 }
1059 1059
1060 } // namespace webrtc 1060 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698