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

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

Issue 1846433003: [rtcp] Sdes::Parse updated not to use RTCPUtility (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 8 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 | webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.cc » ('j') | 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) 2016 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_SDES_H_ 11 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_SDES_H_
12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_SDES_H_ 12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_SDES_H_
13 13
14 #include <string> 14 #include <string>
15 #include <vector> 15 #include <vector>
16 16
17 #include "webrtc/base/basictypes.h" 17 #include "webrtc/base/basictypes.h"
18 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" 18 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h"
19 #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h"
20 19
21 namespace webrtc { 20 namespace webrtc {
22 namespace rtcp { 21 namespace rtcp {
22 class CommonHeader;
23 // Source Description (SDES) (RFC 3550). 23 // Source Description (SDES) (RFC 3550).
24 class Sdes : public RtcpPacket { 24 class Sdes : public RtcpPacket {
25 public: 25 public:
26 struct Chunk { 26 struct Chunk {
27 uint32_t ssrc; 27 uint32_t ssrc;
28 std::string cname; 28 std::string cname;
29 }; 29 };
30 static const uint8_t kPacketType = 202; 30 static const uint8_t kPacketType = 202;
31 31
32 Sdes(); 32 Sdes();
33 ~Sdes() override; 33 ~Sdes() override;
34 34
35 // Parse assumes header is already parsed and validated. 35 // Parse assumes header is already parsed and validated.
36 bool Parse(const RTCPUtility::RtcpCommonHeader& header, 36 bool Parse(const CommonHeader& packet);
37 const uint8_t* payload); // Size of the payload is in the header.
38 37
39 bool WithCName(uint32_t ssrc, const std::string& cname); 38 bool WithCName(uint32_t ssrc, const std::string& cname);
40 39
41 const std::vector<Chunk>& chunks() const { return chunks_; } 40 const std::vector<Chunk>& chunks() const { return chunks_; }
42 41
43 size_t BlockLength() const override { return block_length_; } 42 size_t BlockLength() const override { return block_length_; }
44 43
45 protected: 44 protected:
46 bool Create(uint8_t* packet, 45 bool Create(uint8_t* packet,
47 size_t* index, 46 size_t* index,
48 size_t max_length, 47 size_t max_length,
49 RtcpPacket::PacketReadyCallback* callback) const override; 48 RtcpPacket::PacketReadyCallback* callback) const override;
50 49
51 private: 50 private:
52 static const size_t kMaxNumberOfChunks = 0x1f; 51 static const size_t kMaxNumberOfChunks = 0x1f;
53 52
54 std::vector<Chunk> chunks_; 53 std::vector<Chunk> chunks_;
55 size_t block_length_; 54 size_t block_length_;
56 55
57 RTC_DISALLOW_COPY_AND_ASSIGN(Sdes); 56 RTC_DISALLOW_COPY_AND_ASSIGN(Sdes);
58 }; 57 };
59 } // namespace rtcp 58 } // namespace rtcp
60 } // namespace webrtc 59 } // namespace webrtc
61 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_SDES_H_ 60 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_SDES_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698