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 ffafb1409b8c44ce6545c7f90259500f6a46d3d6..418bc187a4645aa48cb187228e3747f3f70d629f 100644 |
--- a/webrtc/modules/rtp_rtcp/source/tmmbr_help.h |
+++ b/webrtc/modules/rtp_rtcp/source/tmmbr_help.h |
@@ -47,21 +47,14 @@ public: |
// 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 TMMBRHelp |
{ |
public: |
- TMMBRHelp(); |
- virtual ~TMMBRHelp(); |
+ TMMBRHelp() {} |
+ ~TMMBRHelp() {} |
- TMMBRSet* BoundingSet(); // used for debuging |
TMMBRSet* CandidateSet(); |
TMMBRSet* VerifyAndAllocateCandidateSet(const uint32_t minimumSize); |
@@ -71,17 +64,13 @@ public: |
bool CalcMinBitRate(uint32_t* minBitrateKbit) const; |
-protected: |
- TMMBRSet* VerifyAndAllocateBoundingSet(uint32_t minimumSize); |
- int32_t FindTMMBRBoundingSet(int32_t numCandidates, TMMBRSet& candidateSet); |
+ static void FindBoundingSet(std::vector<rtcp::TmmbItem> candidates, |
+ std::vector<rtcp::TmmbItem>* bounding_set); |
private: |
rtc::CriticalSection _criticalSection; |
TMMBRSet _candidateSet; |
TMMBRSet _boundingSet; |
- |
- float* _ptrIntersectionBoundingSet; |
- float* _ptrMaxPRBoundingSet; |
}; |
} // namespace webrtc |