generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove remains of WEBRTC_NO_STL.

Browse Source 
R=stefan@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/14899004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6641 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andresp@webrtc.org 2014-07-09 20:18:28 +00:00
parent 10ef8fe611
commit 47d1c98a4e
2 changed files with 0 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
webrtc/modules/rtp_rtcp/source/ssrc_database.cc
View File

@ -57,45 +57,12 @@ SSRCDatabase::CreateSSRC()
uint32_t ssrc = GenerateRandom(); uint32_t ssrc = GenerateRandom();
#ifndef WEBRTC_NO_STL
while(_ssrcMap.find(ssrc) != _ssrcMap.end()) while(_ssrcMap.find(ssrc) != _ssrcMap.end())
{ {
ssrc = GenerateRandom(); ssrc = GenerateRandom();
} }
_ssrcMap[ssrc] = 0; _ssrcMap[ssrc] = 0;
#else
if(_sizeOfSSRC <= _numberOfSSRC)
{
// allocate more space
const int newSize = _sizeOfSSRC + 10;
uint32_t* tempSSRCVector = new uint32_t[newSize];
memcpy(tempSSRCVector, _ssrcVector, _sizeOfSSRC*sizeof(uint32_t));
delete [] _ssrcVector;
_ssrcVector = tempSSRCVector;
_sizeOfSSRC = newSize;
}
// check if in DB
if(_ssrcVector)
{
for (int i=0; i<_numberOfSSRC; i++)
{
if (_ssrcVector[i] == ssrc)
{
// we have a match
i = 0; // start over with a new ssrc
ssrc = GenerateRandom();
}
}
// add to database
_ssrcVector[_numberOfSSRC] = ssrc;
_numberOfSSRC++;
}
#endif
return ssrc; return ssrc;
} }
@ -103,39 +70,7 @@ int32_t
SSRCDatabase::RegisterSSRC(const uint32_t ssrc) SSRCDatabase::RegisterSSRC(const uint32_t ssrc)
{ {
CriticalSectionScoped lock(_critSect); CriticalSectionScoped lock(_critSect);
#ifndef WEBRTC_NO_STL
_ssrcMap[ssrc] = 0; _ssrcMap[ssrc] = 0;
#else
if(_sizeOfSSRC <= _numberOfSSRC)
{
// allocate more space
const int newSize = _sizeOfSSRC + 10;
uint32_t* tempSSRCVector = new uint32_t[newSize];
memcpy(tempSSRCVector, _ssrcVector, _sizeOfSSRC*sizeof(uint32_t));
delete [] _ssrcVector;
_ssrcVector = tempSSRCVector;
_sizeOfSSRC = newSize;
}
// check if in DB
if(_ssrcVector)
{
for (int i=0; i<_numberOfSSRC; i++)
{
if (_ssrcVector[i] == ssrc)
{
// we have a match
return -1;
}
}
// add to database
_ssrcVector[_numberOfSSRC] = ssrc;
_numberOfSSRC++;
}
#endif
return 0; return 0;
} }
@ -143,26 +78,7 @@ int32_t
SSRCDatabase::ReturnSSRC(const uint32_t ssrc) SSRCDatabase::ReturnSSRC(const uint32_t ssrc)
{ {
CriticalSectionScoped lock(_critSect); CriticalSectionScoped lock(_critSect);
#ifndef WEBRTC_NO_STL
_ssrcMap.erase(ssrc); _ssrcMap.erase(ssrc);
#else
if(_ssrcVector)
{
for (int i=0; i<_numberOfSSRC; i++)
{
if (_ssrcVector[i] == ssrc)
{
// we have a match
// remove from database
_ssrcVector[i] = _ssrcVector[_numberOfSSRC-1];
_numberOfSSRC--;
break;
}
}
}
#endif
return 0; return 0;
} }
@ -178,22 +94,12 @@ SSRCDatabase::SSRCDatabase()
srand(tv.tv_usec); srand(tv.tv_usec);
#endif #endif
#ifdef WEBRTC_NO_STL
_sizeOfSSRC = 10;
_numberOfSSRC = 0;
_ssrcVector = new uint32_t[10];
#endif
_critSect = CriticalSectionWrapper::CreateCriticalSection(); _critSect = CriticalSectionWrapper::CreateCriticalSection();
} }
SSRCDatabase::~SSRCDatabase() SSRCDatabase::~SSRCDatabase()
{ {
#ifdef WEBRTC_NO_STL
delete [] _ssrcVector;
#else
_ssrcMap.clear(); _ssrcMap.clear();
#endif
delete _critSect;
} }
uint32_t SSRCDatabase::GenerateRandom() uint32_t SSRCDatabase::GenerateRandom()

9
webrtc/modules/rtp_rtcp/source/ssrc_database.h
View File

@ -11,9 +11,7 @@
#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_SSRC_DATABASE_H_ #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_SSRC_DATABASE_H_
#define WEBRTC_MODULES_RTP_RTCP_SOURCE_SSRC_DATABASE_H_ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_SSRC_DATABASE_H_
#ifndef WEBRTC_NO_STL
#include <map> #include <map>
#endif
#include "webrtc/system_wrappers/interface/static_instance.h" #include "webrtc/system_wrappers/interface/static_instance.h"
#include "webrtc/typedefs.h" #include "webrtc/typedefs.h"
@ -46,14 +44,7 @@ private:
uint32_t GenerateRandom(); uint32_t GenerateRandom();
#ifdef WEBRTC_NO_STL
int _numberOfSSRC;
int _sizeOfSSRC;
uint32_t* _ssrcVector;
#else
std::map<uint32_t, uint32_t> _ssrcMap; std::map<uint32_t, uint32_t> _ssrcMap;
#endif
CriticalSectionWrapper* _critSect; CriticalSectionWrapper* _critSect;
}; };