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

Unified Diff: webrtc/modules/rtp_rtcp/source/tmmbr_help.cc

Issue 1746773002: [rtp_rtcp] tmmbr helper simplified by moving set_to_send member out (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
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 da43204b0938b420898bc937810a9adaf9fd94f5..5ca01142fa882886138372348d6b69c940eed034 100644
--- a/webrtc/modules/rtp_rtcp/source/tmmbr_help.cc
+++ b/webrtc/modules/rtp_rtcp/source/tmmbr_help.cc
@@ -70,7 +70,6 @@ TMMBRHelp::TMMBRHelp()
: _criticalSection(CriticalSectionWrapper::CreateCriticalSection()),
_candidateSet(),
_boundingSet(),
- _boundingSetToSend(),
_ptrIntersectionBoundingSet(NULL),
_ptrMaxPRBoundingSet(NULL) {
}
@@ -107,39 +106,6 @@ TMMBRSet* TMMBRHelp::BoundingSet() {
return &_boundingSet;
}
-int32_t
-TMMBRHelp::SetTMMBRBoundingSetToSend(const TMMBRSet* boundingSetToSend)
-{
- CriticalSectionScoped lock(_criticalSection);
-
- if (boundingSetToSend == NULL)
- {
- _boundingSetToSend.clearSet();
- return 0;
- }
-
- VerifyAndAllocateBoundingSetToSend(boundingSetToSend->lengthOfSet());
- _boundingSetToSend.clearSet();
- for (uint32_t i = 0; i < boundingSetToSend->lengthOfSet(); i++)
- {
- // cap at our configured max bitrate
- uint32_t bitrate = boundingSetToSend->Tmmbr(i);
- _boundingSetToSend.SetEntry(i, bitrate,
- boundingSetToSend->PacketOH(i),
- boundingSetToSend->Ssrc(i));
- }
- return 0;
-}
-
-int32_t
-TMMBRHelp::VerifyAndAllocateBoundingSetToSend(uint32_t minimumSize)
-{
- CriticalSectionScoped lock(_criticalSection);
-
- _boundingSetToSend.VerifyAndAllocateSet(minimumSize);
- return 0;
-}
-
TMMBRSet*
TMMBRHelp::VerifyAndAllocateCandidateSet(uint32_t minimumSize)
{
@@ -155,12 +121,6 @@ TMMBRHelp::CandidateSet()
return &_candidateSet;
}
-TMMBRSet*
-TMMBRHelp::BoundingSetToSend()
-{
- return &_boundingSetToSend;
-}
-
int32_t
TMMBRHelp::FindTMMBRBoundingSet(TMMBRSet*& boundingSet)
{
« webrtc/modules/rtp_rtcp/source/rtcp_sender.h ('K') | « webrtc/modules/rtp_rtcp/source/tmmbr_help.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698