Index: webrtc/modules/rtp_rtcp/source/tmmbr_help.h |
diff --git a/webrtc/modules/rtp_rtcp/source/tmmbr_help.h b/webrtc/modules/rtp_rtcp/source/tmmbr_help.h |
index 08b2438f2b83e22a1a4d7748248493e5a6fd3f96..f901b37531190410ad844481d3a2d42de155318a 100644 |
--- a/webrtc/modules/rtp_rtcp/source/tmmbr_help.h |
+++ b/webrtc/modules/rtp_rtcp/source/tmmbr_help.h |
@@ -16,71 +16,47 @@ |
#include "webrtc/typedefs.h" |
namespace webrtc { |
-class TMMBRSet : public std::vector<rtcp::TmmbItem> |
-{ |
-public: |
- void VerifyAndAllocateSet(uint32_t minimumSize); |
- void VerifyAndAllocateSetKeepingData(uint32_t minimumSize); |
- // Number of valid data items in set. |
- uint32_t lengthOfSet() const { return size(); } |
- // Presently allocated max size of set. |
- uint32_t sizeOfSet() const { return capacity(); } |
- void clearSet() { clear(); } |
- uint32_t Tmmbr(int i) const { |
- return (*this)[i].bitrate_bps() / 1000; |
- } |
- uint32_t PacketOH(int i) const { |
- return (*this)[i].packet_overhead(); |
- } |
- uint32_t Ssrc(int i) const { |
- return (*this)[i].ssrc(); |
- } |
- void SetEntry(unsigned int i, |
- uint32_t tmmbrSet, |
- uint32_t packetOHSet, |
- uint32_t ssrcSet); |
- |
- void AddEntry(uint32_t tmmbrSet, |
- uint32_t packetOHSet, |
- uint32_t ssrcSet); |
- |
- // Remove one entry from table, and move all others down. |
- void RemoveEntry(uint32_t sourceIdx); |
- |
- void SwapEntries(uint32_t firstIdx, |
- uint32_t secondIdx); |
- |
- // Set entry data to zero, but keep it in table. |
- void ClearEntry(uint32_t idx); |
+class TMMBRSet : public std::vector<rtcp::TmmbItem> { |
+ public: |
+ void VerifyAndAllocateSet(uint32_t minimumSize); |
+ void VerifyAndAllocateSetKeepingData(uint32_t minimumSize); |
+ // Number of valid data items in set. |
+ uint32_t lengthOfSet() const { return size(); } |
+ // Presently allocated max size of set. |
+ uint32_t sizeOfSet() const { return capacity(); } |
+ void clearSet() { clear(); } |
+ uint32_t Tmmbr(int i) const { return (*this)[i].bitrate_bps() / 1000; } |
+ uint32_t PacketOH(int i) const { return (*this)[i].packet_overhead(); } |
+ uint32_t Ssrc(int i) const { return (*this)[i].ssrc(); } |
+ void SetEntry(unsigned int i, |
+ uint32_t tmmbrSet, |
+ uint32_t packetOHSet, |
+ uint32_t ssrcSet); |
+ |
+ void AddEntry(uint32_t tmmbrSet, uint32_t packetOHSet, uint32_t ssrcSet); |
+ |
+ // Remove one entry from table, and move all others down. |
+ void RemoveEntry(uint32_t sourceIdx); |
}; |
-class TMMBRHelp |
-{ |
-public: |
- TMMBRHelp(); |
- virtual ~TMMBRHelp(); |
- |
- TMMBRSet* BoundingSet(); // used for debuging |
- TMMBRSet* CandidateSet(); |
- |
- TMMBRSet* VerifyAndAllocateCandidateSet(const uint32_t minimumSize); |
- int32_t FindTMMBRBoundingSet(TMMBRSet*& boundingSet); |
+class TMMBRHelp { |
+ public: |
+ TMMBRSet* CandidateSet(); |
- bool IsOwner(const uint32_t ssrc, const uint32_t length) const; |
+ TMMBRSet* VerifyAndAllocateCandidateSet(const uint32_t minimumSize); |
+ int32_t FindTMMBRBoundingSet(TMMBRSet*& boundingSet); |
- bool CalcMinBitRate(uint32_t* minBitrateKbit) const; |
+ bool IsOwner(const uint32_t ssrc, const uint32_t length) const; |
-protected: |
- TMMBRSet* VerifyAndAllocateBoundingSet(uint32_t minimumSize); |
- int32_t FindTMMBRBoundingSet(int32_t numCandidates, TMMBRSet& candidateSet); |
+ bool CalcMinBitRate(uint32_t* minBitrateKbit) const; |
-private: |
- TMMBRSet _candidateSet; |
- TMMBRSet _boundingSet; |
+ static void FindBoundingSet(std::vector<rtcp::TmmbItem> candidates, |
+ std::vector<rtcp::TmmbItem>* bounding_set); |
- float* _ptrIntersectionBoundingSet; |
- float* _ptrMaxPRBoundingSet; |
+ private: |
+ TMMBRSet _candidateSet; |
+ TMMBRSet _boundingSet; |
}; |
} // namespace webrtc |
-#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_TMMBR_HELP_H_ |
+#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_TMMBR_HELP_H_ |