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

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

Issue 2372713005: Revert of Unify rtcp packet setters (Closed)
Patch Set: 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
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_REMB_H_ 11 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_REMB_H_
12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_REMB_H_ 12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_REMB_H_
13 13
14 #include <vector> 14 #include <vector>
15 15
16 #include "webrtc/base/basictypes.h" 16 #include "webrtc/base/basictypes.h"
17 #include "webrtc/base/constructormagic.h" 17 #include "webrtc/base/constructormagic.h"
18 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h" 18 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h"
19 19
20 namespace webrtc { 20 namespace webrtc {
21 namespace rtcp { 21 namespace rtcp {
22 class CommonHeader; 22 class CommonHeader;
23 23
24 // Receiver Estimated Max Bitrate (REMB) (draft-alvestrand-rmcat-remb). 24 // Receiver Estimated Max Bitrate (REMB) (draft-alvestrand-rmcat-remb).
25 class Remb : public Psfb { 25 class Remb : public Psfb {
26 public: 26 public:
27 static constexpr uint8_t kFeedbackMessageType = 15; 27 static constexpr uint8_t kFeedbackMessageType = 15;
28 static constexpr size_t kMaxNumberOfSsrcs = 0xff;
29 28
30 Remb() : bitrate_bps_(0) {} 29 Remb() : bitrate_bps_(0) {}
31 ~Remb() override {} 30 ~Remb() override {}
32 31
33 // Parse assumes header is already parsed and validated. 32 // Parse assumes header is already parsed and validated.
34 bool Parse(const CommonHeader& packet); 33 bool Parse(const CommonHeader& packet);
35 34
36 bool SetSsrcs(std::vector<uint32_t> ssrcs); 35 bool AppliesTo(uint32_t ssrc);
37 void SetBitrateBps(uint64_t bitrate_bps) { bitrate_bps_ = bitrate_bps; } 36 bool AppliesToMany(const std::vector<uint32_t>& ssrcs);
37 void WithBitrateBps(uint64_t bitrate_bps) { bitrate_bps_ = bitrate_bps; }
38 38
39 uint64_t bitrate_bps() const { return bitrate_bps_; } 39 uint64_t bitrate_bps() const { return bitrate_bps_; }
40 const std::vector<uint32_t>& ssrcs() const { return ssrcs_; } 40 const std::vector<uint32_t>& ssrcs() const { return ssrcs_; }
41 41
42 protected: 42 protected:
43 bool Create(uint8_t* packet, 43 bool Create(uint8_t* packet,
44 size_t* index, 44 size_t* index,
45 size_t max_length, 45 size_t max_length,
46 RtcpPacket::PacketReadyCallback* callback) const override; 46 RtcpPacket::PacketReadyCallback* callback) const override;
47 47
48 size_t BlockLength() const override { 48 size_t BlockLength() const override {
49 return kHeaderLength + kCommonFeedbackLength + (2 + ssrcs_.size()) * 4; 49 return kHeaderLength + kCommonFeedbackLength + (2 + ssrcs_.size()) * 4;
50 } 50 }
51 51
52 private: 52 private:
53 static constexpr size_t kMaxNumberOfSsrcs = 0xff;
53 static constexpr uint32_t kUniqueIdentifier = 0x52454D42; // 'R' 'E' 'M' 'B'. 54 static constexpr uint32_t kUniqueIdentifier = 0x52454D42; // 'R' 'E' 'M' 'B'.
54 55
55 // Media ssrc is unused, shadow base class setter and getter. 56 // Media ssrc is unused, shadow base class setter and getter.
56 void SetMediaSsrc(uint32_t); 57 void To(uint32_t);
57 uint32_t media_ssrc() const; 58 uint32_t media_ssrc() const;
58 59
59 uint64_t bitrate_bps_; 60 uint64_t bitrate_bps_;
60 std::vector<uint32_t> ssrcs_; 61 std::vector<uint32_t> ssrcs_;
61 62
62 RTC_DISALLOW_COPY_AND_ASSIGN(Remb); 63 RTC_DISALLOW_COPY_AND_ASSIGN(Remb);
63 }; 64 };
64 } // namespace rtcp 65 } // namespace rtcp
65 } // namespace webrtc 66 } // namespace webrtc
66 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_REMB_H_ 67 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_REMB_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698