[Splitting] TMMBRHelp class simplifted (and disappear because become too simple)

webrtc/modules/rtp_rtcp/source/tmmbr_help.cc

Index: webrtc/modules/rtp_rtcp/source/tmmbr_help.cc
diff --git a/webrtc/modules/rtp_rtcp/source/tmmbr_help.cc b/webrtc/modules/rtp_rtcp/source/tmmbr_help.cc
index 43d3a82ab28b3f0570d43873b75e96b8f112c479..d869f4e46a374982d277d83fccce45fb0aa35f17 100644
--- a/webrtc/modules/rtp_rtcp/source/tmmbr_help.cc
+++ b/webrtc/modules/rtp_rtcp/source/tmmbr_help.cc
@@ -10,398 +10,134 @@
 
 #include "webrtc/modules/rtp_rtcp/source/tmmbr_help.h"
 
-#include <assert.h>
-#include <string.h>
-
 #include <limits>
+#include <list>
 
 #include "webrtc/base/checks.h"
-#include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h"
-
-namespace webrtc {
-void
-TMMBRSet::VerifyAndAllocateSet(uint32_t minimumSize)
-{
-  clear();
-  reserve(minimumSize);
-}
-
-void
-TMMBRSet::VerifyAndAllocateSetKeepingData(uint32_t minimumSize)
-{
-  reserve(minimumSize);
-}
-
-void TMMBRSet::SetEntry(unsigned int i,
-                         uint32_t tmmbrSet,
-                         uint32_t packetOHSet,
-                         uint32_t ssrcSet) {
-  RTC_DCHECK_LT(i, capacity());
-  if (i >= size()) {
-    resize(i+1);
-  }
-  (*this)[i].set_bitrate_bps(tmmbrSet * 1000);
-  (*this)[i].set_packet_overhead(packetOHSet);
-  (*this)[i].set_ssrc(ssrcSet);
-}
-
-void TMMBRSet::AddEntry(uint32_t tmmbrSet,
-                        uint32_t packetOHSet,
-                        uint32_t ssrcSet) {
-  RTC_DCHECK_LT(size(), capacity());
-  SetEntry(size(), tmmbrSet, packetOHSet, ssrcSet);
-}
-
-void TMMBRSet::RemoveEntry(uint32_t sourceIdx) {
-  RTC_DCHECK_LT(sourceIdx, size());
-  erase(begin() + sourceIdx);
-}
 
-void TMMBRSet::SwapEntries(uint32_t i, uint32_t j) {
-  using std::swap;
-  swap((*this)[i], (*this)[j]);
-}
-
-void TMMBRSet::ClearEntry(uint32_t idx) {
-  SetEntry(idx, 0, 0, 0);
-}
-
-TMMBRHelp::TMMBRHelp()
-    : _candidateSet(),
-      _boundingSet(),
-      _ptrIntersectionBoundingSet(NULL),
-      _ptrMaxPRBoundingSet(NULL) {
-}
-
-TMMBRHelp::~TMMBRHelp() {
-  delete [] _ptrIntersectionBoundingSet;
-  delete [] _ptrMaxPRBoundingSet;
-  _ptrIntersectionBoundingSet = 0;
-  _ptrMaxPRBoundingSet = 0;
-}
+using webrtc::rtcp::TmmbItem;
 
-TMMBRSet*
-TMMBRHelp::VerifyAndAllocateBoundingSet(uint32_t minimumSize)
-{
-    rtc::CritScope lock(&_criticalSection);
+namespace webrtc {
+namespace {
+struct Bounding {
+  Bounding() {}
+  Bounding(float max_pr, float inter)
+      : max_packet_rate(max_pr), intersection(inter) {}
 
-    if(minimumSize > _boundingSet.capacity())
-    {
-        // make sure that our buffers are big enough
-        if(_ptrIntersectionBoundingSet)
-        {
-            delete [] _ptrIntersectionBoundingSet;
-            delete [] _ptrMaxPRBoundingSet;
-        }
-        _ptrIntersectionBoundingSet = new float[minimumSize];
-        _ptrMaxPRBoundingSet = new float[minimumSize];
-    }
-    _boundingSet.VerifyAndAllocateSet(minimumSize);
-    return &_boundingSet;
-}
+  float max_packet_rate = 0.0;
+  float intersection = 0.0;
+};
 
-TMMBRSet* TMMBRHelp::BoundingSet() {
-  return &_boundingSet;
+float Ratio(uint32_t bitrate_bps, uint32_t packet_overhead) {
+  if (packet_overhead == 0)
+    return std::numeric_limits<float>::max();
+  return static_cast<float>(bitrate_bps) / packet_overhead;
 }
-
-TMMBRSet*
-TMMBRHelp::VerifyAndAllocateCandidateSet(uint32_t minimumSize)
-{
-    rtc::CritScope lock(&_criticalSection);
-
-    _candidateSet.VerifyAndAllocateSet(minimumSize);
-    return &_candidateSet;
+float MaximumPacketRate(const TmmbItem& entry) {
+  return Ratio(entry.bitrate_bps(), entry.packet_overhead());
 }
 
-TMMBRSet*
-TMMBRHelp::CandidateSet()
-{
-    return &_candidateSet;
+float Intersection(const TmmbItem& first, const TmmbItem& second) {
+  return Ratio(first.bitrate_bps() - second.bitrate_bps(),
+               first.packet_overhead() - second.packet_overhead());
 }
+}  // namespace
 
-int32_t
-TMMBRHelp::FindTMMBRBoundingSet(TMMBRSet*& boundingSet)
-{
-    rtc::CritScope lock(&_criticalSection);
+void FindTMMBRBoundingSet(std::vector<TmmbItem>* most_limiting) {
+  RTC_CHECK(most_limiting);
 
-    // Work on local variable, will be modified
-    TMMBRSet    candidateSet;
-    candidateSet.VerifyAndAllocateSet(_candidateSet.capacity());
+  if (most_limiting->size() <= 1)
+    return;
 
-    for (uint32_t i = 0; i < _candidateSet.size(); i++)
-    {
-        if(_candidateSet.Tmmbr(i))
-        {
-            candidateSet.AddEntry(_candidateSet.Tmmbr(i),
-                                  _candidateSet.PacketOH(i),
-                                  _candidateSet.Ssrc(i));
-        }
-        else
-        {
-            // make sure this is zero if tmmbr = 0
-            assert(_candidateSet.PacketOH(i) == 0);
-            // Old code:
-            // _candidateSet.ptrPacketOHSet[i] = 0;
-        }
-    }
+  // Work on local variable, will be modified
+  std::list<TmmbItem> candidates;
 
-    // Number of set candidates
-    int32_t numSetCandidates = candidateSet.lengthOfSet();
-    // Find bounding set
-    uint32_t numBoundingSet = 0;
-    if (numSetCandidates > 0)
-    {
-        numBoundingSet =  FindTMMBRBoundingSet(numSetCandidates, candidateSet);
-        if(numBoundingSet < 1 || (numBoundingSet > _candidateSet.size()))
-        {
-            return -1;
-        }
-        boundingSet = &_boundingSet;
+  // Copy and filter.
+  for (const TmmbItem& candidate : *most_limiting) {
+    if (candidate.bitrate_bps() > 0) {
+      candidates.push_back(candidate);
     }
-    return numBoundingSet;
-}
-
-
-int32_t
-TMMBRHelp::FindTMMBRBoundingSet(int32_t numCandidates, TMMBRSet& candidateSet)
-{
-    rtc::CritScope lock(&_criticalSection);
-
-    uint32_t numBoundingSet = 0;
-    VerifyAndAllocateBoundingSet(candidateSet.capacity());
+  }
 
-    if (numCandidates == 1)
-    {
-        for (uint32_t i = 0; i < candidateSet.size(); i++)
-        {
-            if (candidateSet.Tmmbr(i) > 0)
-            {
-                _boundingSet.AddEntry(candidateSet.Tmmbr(i),
-                                    candidateSet.PacketOH(i),
-                                    candidateSet.Ssrc(i));
-                numBoundingSet++;
-            }
-        }
-        return (numBoundingSet == 1) ? 1 : -1;
+  most_limiting->clear();
+
+  // Packet rates would have exactly same size as most_limiting.
+  // Unlike most_limiting, it will not be returned out of the function.
+  std::vector<Bounding> packet_rates;
+  packet_rates.reserve(candidates.size());
+
+  // 1. Sort by increasing packet_overhead.
+  candidates.sort([](const TmmbItem& first, const TmmbItem& second) {
+    return first.packet_overhead() < second.packet_overhead();
+  });
+
+  // 2. For tuples with same OH, keep the one w/ the lowest bitrate.
+  for (auto it = candidates.begin(); it != candidates.end(); ++it) {
+    // Get min bitrate for packets w/ same OH.
+    uint32_t packet_overhead = it->packet_overhead();
+    auto next_it = it;
+    ++next_it;
+    while (next_it != candidates.end() &&
+           next_it->packet_overhead() == packet_overhead) {
+      if (next_it->bitrate_bps() < it->bitrate_bps()) {
+        candidates.erase(it);
+        it = next_it;
+      } else {
+        candidates.erase(next_it);
+        next_it = it;
+      }
+      ++next_it;
     }
+  }
 
-    // 1. Sort by increasing packetOH
-    for (int i = candidateSet.size() - 1; i >= 0; i--)
-    {
-        for (int j = 1; j <= i; j++)
-        {
-            if (candidateSet.PacketOH(j-1) > candidateSet.PacketOH(j))
-            {
-                candidateSet.SwapEntries(j-1, j);
-            }
-        }
-    }
-    // 2. For tuples with same OH, keep the one w/ the lowest bitrate
-    for (uint32_t i = 0; i < candidateSet.size(); i++)
-    {
-        if (candidateSet.Tmmbr(i) > 0)
-        {
-            // get min bitrate for packets w/ same OH
-            uint32_t currentPacketOH = candidateSet.PacketOH(i);
-            uint32_t currentMinTMMBR = candidateSet.Tmmbr(i);
-            uint32_t currentMinIndexTMMBR = i;
-            for (uint32_t j = i+1; j < candidateSet.size(); j++)
-            {
-                if(candidateSet.PacketOH(j) == currentPacketOH)
-                {
-                    if(candidateSet.Tmmbr(j) < currentMinTMMBR)
-                    {
-                        currentMinTMMBR = candidateSet.Tmmbr(j);
-                        currentMinIndexTMMBR = j;
-                    }
-                }
-            }
-            // keep lowest bitrate
-            for (uint32_t j = 0; j < candidateSet.size(); j++)
-            {
-              if(candidateSet.PacketOH(j) == currentPacketOH
-                  && j != currentMinIndexTMMBR)
-                {
-                    candidateSet.ClearEntry(j);
-                    numCandidates--;
-                }
-            }
-        }
-    }
-    // 3. Select and remove tuple w/ lowest tmmbr.
-    // (If more than 1, choose the one w/ highest OH).
-    uint32_t minTMMBR = 0;
-    uint32_t minIndexTMMBR = 0;
-    for (uint32_t i = 0; i < candidateSet.size(); i++)
-    {
-        if (candidateSet.Tmmbr(i) > 0)
-        {
-            minTMMBR = candidateSet.Tmmbr(i);
-            minIndexTMMBR = i;
-            break;
-        }
-    }
+  // 3. Select and remove tuple w/ lowest bitrate.
+  // (If more than 1, choose the one w/ highest OH).
+  uint32_t min_bitrate = candidates.front().bitrate_bps();
+  auto min_bitrate_it = candidates.begin();
 
-    for (uint32_t i = 0; i < candidateSet.size(); i++)
-    {
-        if (candidateSet.Tmmbr(i) > 0 && candidateSet.Tmmbr(i) <= minTMMBR)
-        {
-            // get min bitrate
-            minTMMBR = candidateSet.Tmmbr(i);
-            minIndexTMMBR = i;
-        }
+  for (auto it = candidates.begin(); it != candidates.end(); it++) {
+    if (it->bitrate_bps() <= min_bitrate) {
+      // Get min bitrate.
+      min_bitrate = it->bitrate_bps();
+      min_bitrate_it = it;
     }
-    // first member of selected list
-    _boundingSet.SetEntry(numBoundingSet,
-                          candidateSet.Tmmbr(minIndexTMMBR),
-                          candidateSet.PacketOH(minIndexTMMBR),
-                          candidateSet.Ssrc(minIndexTMMBR));
+  }
+  // First member of selected list.
+  most_limiting->push_back(*min_bitrate_it);
+  packet_rates.push_back(Bounding(MaximumPacketRate(*min_bitrate_it), 0.0));
 
-    // set intersection value
-    _ptrIntersectionBoundingSet[numBoundingSet] = 0;
-    // calculate its maximum packet rate (where its line crosses x-axis)
-    uint32_t packet_overhead_bits = 8 * _boundingSet.PacketOH(numBoundingSet);
-    if (packet_overhead_bits == 0) {
-      // Avoid division by zero.
-      _ptrMaxPRBoundingSet[numBoundingSet] = std::numeric_limits<float>::max();
-    } else {
-      _ptrMaxPRBoundingSet[numBoundingSet] =
-          _boundingSet.Tmmbr(numBoundingSet) * 1000 /
-          static_cast<float>(packet_overhead_bits);
-    }
-    numBoundingSet++;
-    // remove from candidate list
-    candidateSet.ClearEntry(minIndexTMMBR);
-    numCandidates--;
+  // Remove from candidate list.
+  candidates.erase(min_bitrate_it);
 
+  for (const TmmbItem& candidate : candidates) {
     // 4. Discard from candidate list all tuple w/ lower OH
     // (next tuple must be steeper)
-    for (uint32_t i = 0; i < candidateSet.size(); i++)
-    {
-        if(candidateSet.Tmmbr(i) > 0
-            && candidateSet.PacketOH(i) < _boundingSet.PacketOH(0))
-        {
-            candidateSet.ClearEntry(i);
-            numCandidates--;
-        }
-    }
+    if (candidate.packet_overhead() < most_limiting->front().packet_overhead())
+      continue;
 
-    if (numCandidates == 0)
-    {
-        // Should be true already:_boundingSet.lengthOfSet = numBoundingSet;
-        assert(_boundingSet.lengthOfSet() == numBoundingSet);
-        return numBoundingSet;
-    }
+    // 5. Take next remaining tuple from candidate list.
 
-    bool getNewCandidate = true;
-    uint32_t curCandidateTMMBR = 0;
-    size_t curCandidateIndex = 0;
-    uint32_t curCandidatePacketOH = 0;
-    uint32_t curCandidateSSRC = 0;
-    do
-    {
-        if (getNewCandidate)
-        {
-            // 5. Remove first remaining tuple from candidate list
-            for (uint32_t i = 0; i < candidateSet.size(); i++)
-            {
-                if (candidateSet.Tmmbr(i) > 0)
-                {
-                    curCandidateTMMBR    = candidateSet.Tmmbr(i);
-                    curCandidatePacketOH = candidateSet.PacketOH(i);
-                    curCandidateSSRC     = candidateSet.Ssrc(i);
-                    curCandidateIndex    = i;
-                    candidateSet.ClearEntry(curCandidateIndex);
-                    break;
-                }
-            }
-        }
+    // 6. Calculate packet rate and intersection of the current
+    // line with line of last tuple in selected list.
+    float packet_rate = Intersection(candidate, most_limiting->back());
 
-        // 6. Calculate packet rate and intersection of the current
-        // line with line of last tuple in selected list
-        RTC_DCHECK_NE(curCandidatePacketOH,
-                      _boundingSet.PacketOH(numBoundingSet - 1));
-        float packetRate
-            = float(curCandidateTMMBR
-                    - _boundingSet.Tmmbr(numBoundingSet-1))*1000
-            / (8*(curCandidatePacketOH
-                  - _boundingSet.PacketOH(numBoundingSet-1)));
+    // 7. If the packet rate is equal or lower than intersection of
+    //    last tuple in selected list,
+    //    remove last tuple in selected list & go back to step 6.
+    while (packet_rate <= packet_rates.back().intersection) {
+      most_limiting->pop_back();
+      packet_rates.pop_back();
 
-        // 7. If the packet rate is equal or lower than intersection of
-        //    last tuple in selected list,
-        //    remove last tuple in selected list & go back to step 6
-        if(packetRate <= _ptrIntersectionBoundingSet[numBoundingSet-1])
-        {
-            // remove last tuple and goto step 6
-            numBoundingSet--;
-            _boundingSet.ClearEntry(numBoundingSet);
-            _ptrIntersectionBoundingSet[numBoundingSet] = 0;
-            _ptrMaxPRBoundingSet[numBoundingSet]        = 0;
-            getNewCandidate = false;
-        } else
-        {
-            // 8. If packet rate is lower than maximum packet rate of
-            // last tuple in selected list, add current tuple to selected
-            // list
-            if (packetRate < _ptrMaxPRBoundingSet[numBoundingSet-1])
-            {
-                _boundingSet.SetEntry(numBoundingSet,
-                                      curCandidateTMMBR,
-                                      curCandidatePacketOH,
-                                      curCandidateSSRC);
-                _ptrIntersectionBoundingSet[numBoundingSet] = packetRate;
-                float packet_overhead_bits =
-                    8 * _boundingSet.PacketOH(numBoundingSet);
-                RTC_DCHECK_NE(packet_overhead_bits, 0.0f);
-                _ptrMaxPRBoundingSet[numBoundingSet] =
-                    _boundingSet.Tmmbr(numBoundingSet) * 1000 /
-                    packet_overhead_bits;
-                numBoundingSet++;
-            }
-            numCandidates--;
-            getNewCandidate = true;
-        }
-
-        // 9. Go back to step 5 if any tuple remains in candidate list
-    } while (numCandidates > 0);
-
-    return numBoundingSet;
-}
-
-bool TMMBRHelp::IsOwner(const uint32_t ssrc,
-                        const uint32_t length) const {
-  rtc::CritScope lock(&_criticalSection);
-
-  if (length == 0) {
-    // Empty bounding set.
-    return false;
-  }
-  for(uint32_t i = 0;
-      (i < length) && (i < _boundingSet.size()); ++i) {
-    if(_boundingSet.Ssrc(i) == ssrc) {
-      return true;
+      packet_rate = Intersection(candidate, most_limiting->back());
     }
-  }
-  return false;
-}
-
-bool TMMBRHelp::CalcMinBitRate( uint32_t* minBitrateKbit) const {
-  rtc::CritScope lock(&_criticalSection);
-
-  if (_candidateSet.size() == 0) {
-    // Empty bounding set.
-    return false;
-  }
-  *minBitrateKbit = std::numeric_limits<uint32_t>::max();
-
-  for (uint32_t i = 0; i < _candidateSet.lengthOfSet(); ++i) {
-    uint32_t curNetBitRateKbit = _candidateSet.Tmmbr(i);
-    if (curNetBitRateKbit < MIN_VIDEO_BW_MANAGEMENT_BITRATE) {
-      curNetBitRateKbit = MIN_VIDEO_BW_MANAGEMENT_BITRATE;
+    // 8. If packet rate is lower than maximum packet rate of
+    // last tuple in selected list, add current tuple to selected
+    // list.
+    if (packet_rate < packet_rates.back().max_packet_rate) {
+      most_limiting->push_back(candidate);
+      packet_rates.push_back(
+          Bounding(MaximumPacketRate(candidate), packet_rate));
     }
-    *minBitrateKbit = curNetBitRateKbit < *minBitrateKbit ?
-        curNetBitRateKbit : *minBitrateKbit;
   }
-  return true;
 }
 }  // namespace webrtc