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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h

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: rebase 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) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 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 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RECEIVER_REPORT_H_ 11 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_SENDER_REPORT_H_
12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RECEIVER_REPORT_H_ 12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_SENDER_REPORT_H_
13 13
14 #include <vector> 14 #include <vector>
15 15
16 #include "webrtc/base/basictypes.h"
17 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" 16 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h"
18 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block.h" 17 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block.h"
19 #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h" 18 #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h"
19 #include "webrtc/system_wrappers/include/ntp_time.h"
20 20
21 namespace webrtc { 21 namespace webrtc {
22 namespace rtcp { 22 namespace rtcp {
23 23
24 class ReceiverReport : public RtcpPacket { 24 class SenderReport : public RtcpPacket {
25 public: 25 public:
26 static const uint8_t kPacketType = 201; 26 static const uint8_t kPacketType = 200;
27 ReceiverReport() : sender_ssrc_(0) {}
28 27
29 virtual ~ReceiverReport() {} 28 SenderReport();
29 virtual ~SenderReport() {}
30 30
31 // Parse assumes header is already parsed and validated. 31 // Parse assumes header is already parsed and validated.
32 bool Parse(const RTCPUtility::RtcpCommonHeader& header, 32 bool Parse(const RTCPUtility::RtcpCommonHeader& header,
33 const uint8_t* payload); // Size of the payload is in the header. 33 const uint8_t* payload); // Size of the payload is in the header.
34 34
35 void From(uint32_t ssrc) { sender_ssrc_ = ssrc; } 35 void From(uint32_t ssrc) { sender_ssrc_ = ssrc; }
36 void WithNtp(NtpTime ntp) { ntp_ = ntp; }
37 void WithRtpTimestamp(uint32_t rtp_timestamp) {
38 rtp_timestamp_ = rtp_timestamp;
39 }
40 void WithPacketCount(uint32_t packet_count) {
41 sender_packet_count_ = packet_count;
42 }
43 void WithOctetCount(uint32_t octet_count) {
44 sender_octet_count_ = octet_count;
45 }
36 bool WithReportBlock(const ReportBlock& block); 46 bool WithReportBlock(const ReportBlock& block);
47 void ClearReportBlocks() { report_blocks_.clear(); }
37 48
38 uint32_t sender_ssrc() const { return sender_ssrc_; } 49 uint32_t sender_ssrc() const { return sender_ssrc_; }
50 NtpTime ntp() const { return ntp_; }
51 uint32_t rtp_timestamp() const { return rtp_timestamp_; }
52 uint32_t sender_packet_count() const { return sender_packet_count_; }
53 uint32_t sender_octet_count() const { return sender_octet_count_; }
54
39 const std::vector<ReportBlock>& report_blocks() const { 55 const std::vector<ReportBlock>& report_blocks() const {
40 return report_blocks_; 56 return report_blocks_;
41 } 57 }
42 58
43 protected: 59 protected:
44 bool Create(uint8_t* packet, 60 bool Create(uint8_t* packet,
45 size_t* index, 61 size_t* index,
46 size_t max_length, 62 size_t max_length,
47 RtcpPacket::PacketReadyCallback* callback) const override; 63 RtcpPacket::PacketReadyCallback* callback) const override;
48 64
49 private: 65 private:
50 static const size_t kRrBaseLength = 4; 66 static const size_t kMaxNumberOfReportBlocks = 0x1f;
51 static const size_t kMaxNumberOfReportBlocks = 0x1F; 67 const size_t kSenderBaseLength = 24;
52 68
53 size_t BlockLength() const { 69 size_t BlockLength() const override {
54 return kHeaderLength + kRrBaseLength + 70 return kHeaderLength + kSenderBaseLength +
55 report_blocks_.size() * ReportBlock::kLength; 71 report_blocks_.size() * ReportBlock::kLength;
56 } 72 }
57 73
58 uint32_t sender_ssrc_; 74 uint32_t sender_ssrc_;
75 NtpTime ntp_;
76 uint32_t rtp_timestamp_;
77 uint32_t sender_packet_count_;
78 uint32_t sender_octet_count_;
59 std::vector<ReportBlock> report_blocks_; 79 std::vector<ReportBlock> report_blocks_;
60 80
61 RTC_DISALLOW_COPY_AND_ASSIGN(ReceiverReport); 81 RTC_DISALLOW_COPY_AND_ASSIGN(SenderReport);
62 }; 82 };
63 83
64 } // namespace rtcp 84 } // namespace rtcp
65 } // namespace webrtc 85 } // namespace webrtc
66 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RECEIVER_REPORT_H_ 86 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_SENDER_REPORT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698