commit 5ac876bae08611e3f4f75d12eb9d33b825a76453
author andresp@webrtc.org <andresp@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Jul 10 07:41:59 2014 +0000
committer andresp@webrtc.org <andresp@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Jul 10 07:41:59 2014 +0000
tree bd87a0b015ed3eed51b7aec18c511f7b15c355e3
parent e91ba268e3b33474d53029f5e21181058814204f

Revert "Remove remains of WEBRTC_NO_STL." (rev 6641).
Reason breaks linux_memcheck.

TBR=stefan@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6645 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/modules/rtp_rtcp/source/ssrc_database.cc

diff --git a/webrtc/modules/rtp_rtcp/source/ssrc_database.cc b/webrtc/modules/rtp_rtcp/source/ssrc_database.cc
index 1594a17..df09b01 100644
--- a/webrtc/modules/rtp_rtcp/source/ssrc_database.cc
+++ b/webrtc/modules/rtp_rtcp/source/ssrc_database.cc
@@ -57,12 +57,45 @@
 
     uint32_t ssrc = GenerateRandom();
 
+#ifndef WEBRTC_NO_STL
+
     while(_ssrcMap.find(ssrc) != _ssrcMap.end())
     {
         ssrc = GenerateRandom();
     }
     _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;
 }
 
@@ -70,7 +103,39 @@
 SSRCDatabase::RegisterSSRC(const uint32_t ssrc)
 {
     CriticalSectionScoped lock(_critSect);
+
+#ifndef WEBRTC_NO_STL
+
     _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;
 }
 
@@ -78,7 +143,26 @@
 SSRCDatabase::ReturnSSRC(const uint32_t ssrc)
 {
     CriticalSectionScoped lock(_critSect);
+
+#ifndef WEBRTC_NO_STL
     _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;
 }
 
@@ -94,12 +178,22 @@
     srand(tv.tv_usec);
 #endif
 
+#ifdef WEBRTC_NO_STL
+    _sizeOfSSRC = 10;
+    _numberOfSSRC = 0;
+    _ssrcVector = new uint32_t[10];
+#endif
     _critSect = CriticalSectionWrapper::CreateCriticalSection();
 }
 
 SSRCDatabase::~SSRCDatabase()
 {
+#ifdef WEBRTC_NO_STL
+    delete [] _ssrcVector;
+#else
     _ssrcMap.clear();
+#endif
+    delete _critSect;
 }
 
 uint32_t SSRCDatabase::GenerateRandom()

webrtc/modules/rtp_rtcp/source/ssrc_database.h

diff --git a/webrtc/modules/rtp_rtcp/source/ssrc_database.h b/webrtc/modules/rtp_rtcp/source/ssrc_database.h
index 2d4932a..e1f90e7 100644
--- a/webrtc/modules/rtp_rtcp/source/ssrc_database.h
+++ b/webrtc/modules/rtp_rtcp/source/ssrc_database.h
@@ -11,7 +11,9 @@
 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_SSRC_DATABASE_H_
 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_SSRC_DATABASE_H_
 
+#ifndef WEBRTC_NO_STL
 #include <map>
+#endif
 
 #include "webrtc/system_wrappers/interface/static_instance.h"
 #include "webrtc/typedefs.h"
@@ -44,7 +46,14 @@
 
     uint32_t GenerateRandom();
 
+#ifdef WEBRTC_NO_STL
+    int _numberOfSSRC;
+    int _sizeOfSSRC;
+
+    uint32_t* _ssrcVector;
+#else
     std::map<uint32_t, uint32_t>    _ssrcMap;
+#endif
 
     CriticalSectionWrapper* _critSect;
 };