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

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

Issue 1512493002: [rtp_rtcp] lint whitespace warning removed from most source/ files (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 years 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/ssrc_database.cc
diff --git a/webrtc/modules/rtp_rtcp/source/ssrc_database.cc b/webrtc/modules/rtp_rtcp/source/ssrc_database.cc
index 6fb7c4701a39daf168ea16e78033ebce61395093..c9572cd1b7c26ae6617031043a521a55f2b7a7c7 100644
--- a/webrtc/modules/rtp_rtcp/source/ssrc_database.cc
+++ b/webrtc/modules/rtp_rtcp/source/ssrc_database.cc
@@ -16,104 +16,86 @@
#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
#ifdef _WIN32
- #include <windows.h>
- #include <MMSystem.h> //timeGetTime
+#include <windows.h>
+#include <MMSystem.h> // timeGetTime
// TODO(hellner): investigate if it is necessary to disable these warnings.
- #pragma warning(disable:4311)
- #pragma warning(disable:4312)
+#pragma warning(disable : 4311)
+#pragma warning(disable : 4312)
#else
- #include <stdio.h>
- #include <string.h>
- #include <time.h>
- #include <sys/time.h>
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+#include <sys/time.h>
#endif
namespace webrtc {
-SSRCDatabase*
-SSRCDatabase::StaticInstance(CountOperation count_operation)
-{
- SSRCDatabase* impl =
- GetStaticInstance<SSRCDatabase>(count_operation);
+SSRCDatabase* SSRCDatabase::StaticInstance(CountOperation count_operation) {
+ SSRCDatabase* impl = GetStaticInstance<SSRCDatabase>(count_operation);
return impl;
}
-SSRCDatabase*
-SSRCDatabase::GetSSRCDatabase()
-{
- return StaticInstance(kAddRef);
+SSRCDatabase* SSRCDatabase::GetSSRCDatabase() {
+ return StaticInstance(kAddRef);
}
-void
-SSRCDatabase::ReturnSSRCDatabase()
-{
- StaticInstance(kRelease);
+void SSRCDatabase::ReturnSSRCDatabase() {
+ StaticInstance(kRelease);
}
-uint32_t
-SSRCDatabase::CreateSSRC()
-{
- CriticalSectionScoped lock(_critSect);
+uint32_t SSRCDatabase::CreateSSRC() {
+ CriticalSectionScoped lock(_critSect);
- uint32_t ssrc = GenerateRandom();
+ uint32_t ssrc = GenerateRandom();
- while(_ssrcMap.find(ssrc) != _ssrcMap.end())
- {
- ssrc = GenerateRandom();
- }
- _ssrcMap[ssrc] = 0;
+ while (_ssrcMap.find(ssrc) != _ssrcMap.end()) {
+ ssrc = GenerateRandom();
+ }
+ _ssrcMap[ssrc] = 0;
- return ssrc;
+ return ssrc;
}
-int32_t
-SSRCDatabase::RegisterSSRC(const uint32_t ssrc)
-{
- CriticalSectionScoped lock(_critSect);
- _ssrcMap[ssrc] = 0;
- return 0;
+int32_t SSRCDatabase::RegisterSSRC(const uint32_t ssrc) {
+ CriticalSectionScoped lock(_critSect);
+ _ssrcMap[ssrc] = 0;
+ return 0;
}
-int32_t
-SSRCDatabase::ReturnSSRC(const uint32_t ssrc)
-{
- CriticalSectionScoped lock(_critSect);
- _ssrcMap.erase(ssrc);
- return 0;
+int32_t SSRCDatabase::ReturnSSRC(const uint32_t ssrc) {
+ CriticalSectionScoped lock(_critSect);
+ _ssrcMap.erase(ssrc);
+ return 0;
}
-SSRCDatabase::SSRCDatabase()
-{
- // we need to seed the random generator, otherwise we get 26500 each time, hardly a random value :)
+SSRCDatabase::SSRCDatabase() {
+// we need to seed the random generator, otherwise we get 26500 each time,
+// hardly a random value :)
#ifdef _WIN32
- srand(timeGetTime());
+ srand(timeGetTime());
#else
- struct timeval tv;
- struct timezone tz;
- gettimeofday(&tv, &tz);
- srand(tv.tv_usec);
+ struct timeval tv;
+ struct timezone tz;
+ gettimeofday(&tv, &tz);
+ srand(tv.tv_usec);
#endif
- _critSect = CriticalSectionWrapper::CreateCriticalSection();
+ _critSect = CriticalSectionWrapper::CreateCriticalSection();
}
-SSRCDatabase::~SSRCDatabase()
-{
- _ssrcMap.clear();
- delete _critSect;
+SSRCDatabase::~SSRCDatabase() {
+ _ssrcMap.clear();
+ delete _critSect;
}
-uint32_t SSRCDatabase::GenerateRandom()
-{
- uint32_t ssrc = 0;
- do
- {
- ssrc = rand();
- ssrc = ssrc <<16;
- ssrc += rand();
+uint32_t SSRCDatabase::GenerateRandom() {
+ uint32_t ssrc = 0;
+ do {
+ ssrc = rand();
+ ssrc = ssrc << 16;
+ ssrc += rand();
+ } while (ssrc == 0 || ssrc == 0xffffffff);
- } while (ssrc == 0 || ssrc == 0xffffffff);
-
- return ssrc;
+ return ssrc;
}
} // namespace webrtc
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/ssrc_database.h ('k') | webrtc/modules/rtp_rtcp/source/video_codec_information.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698