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

Unified Diff: webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h

Issue 1439553003: [rtp_rtcp] rtcp::Sdes cleaned and got Parse function (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h
index 5520e3486a0e394c719e6cf97dd1a3e0f2467d7d..eb2a06e6be637eb76499a158e193b56929ea8143 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h
@@ -6,7 +6,6 @@
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
- *
*/
#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_SDES_H_
@@ -24,17 +23,24 @@ namespace rtcp {
// Source Description (SDES) (RFC 3550).
class Sdes : public RtcpPacket {
public:
- Sdes() : RtcpPacket() {}
+ struct Chunk {
+ uint32_t ssrc;
+ std::string cname;
+ };
+ static const uint8_t kPacketType = 202;
+
+ Sdes();
+ ~Sdes() override;
- virtual ~Sdes() {}
+ // Parse assumes header is already parsed and validated.
+ bool Parse(const RTCPUtility::RtcpCommonHeader& header,
+ const uint8_t* payload); // Size of the payload is in the header.
bool WithCName(uint32_t ssrc, const std::string& cname);
- struct Chunk {
- uint32_t ssrc;
- std::string name;
- int null_octets;
- };
+ const std::vector<Chunk>& chunks() const { return chunks_; }
+
+ size_t BlockLength() const override { return block_length_; }
protected:
bool Create(uint8_t* packet,
@@ -43,11 +49,10 @@ class Sdes : public RtcpPacket {
RtcpPacket::PacketReadyCallback* callback) const override;
private:
- static const int kMaxNumberOfChunks = 0x1f;
-
- size_t BlockLength() const;
+ static const size_t kMaxNumberOfChunks = 0x1f;
std::vector<Chunk> chunks_;
+ size_t block_length_;
RTC_DISALLOW_COPY_AND_ASSIGN(Sdes);
};
« 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