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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/ssrc_database.cc

Issue 1623543002: Refactor RtpSender and SSRCDatabase a bit. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Update comment and remove the one from ssrc_database.cc 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 unified diff | Download patch
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/ssrc_database.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/modules/rtp_rtcp/source/ssrc_database.h" 11 #include "webrtc/modules/rtp_rtcp/source/ssrc_database.h"
12 12
13 #include "webrtc/base/checks.h" 13 #include "webrtc/base/checks.h"
14 #include "webrtc/system_wrappers/include/clock.h" 14 #include "webrtc/system_wrappers/include/tick_util.h"
15 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
16 15
17 namespace webrtc { 16 namespace webrtc {
18 namespace {
19 uint64_t Seed() {
20 return Clock::GetRealTimeClock()->TimeInMicroseconds();
21 }
22 } // namespace
23 17
24 SSRCDatabase* SSRCDatabase::GetSSRCDatabase() { 18 SSRCDatabase* SSRCDatabase::GetSSRCDatabase() {
25 return GetStaticInstance<SSRCDatabase>(kAddRef); 19 return GetStaticInstance<SSRCDatabase>(kAddRef);
26 } 20 }
27 21
28 void SSRCDatabase::ReturnSSRCDatabase() { 22 void SSRCDatabase::ReturnSSRCDatabase() {
29 GetStaticInstance<SSRCDatabase>(kRelease); 23 GetStaticInstance<SSRCDatabase>(kRelease);
30 } 24 }
31 25
32 uint32_t SSRCDatabase::CreateSSRC() { 26 uint32_t SSRCDatabase::CreateSSRC() {
33 CriticalSectionScoped lock(crit_.get()); 27 rtc::CritScope lock(&crit_);
34 28
35 while (true) { // Try until get a new ssrc. 29 while (true) { // Try until get a new ssrc.
36 // 0 and 0xffffffff are invalid values for SSRC. 30 // 0 and 0xffffffff are invalid values for SSRC.
37 uint32_t ssrc = random_.Rand(1u, 0xfffffffe); 31 uint32_t ssrc = random_.Rand(1u, 0xfffffffe);
38 if (ssrcs_.insert(ssrc).second) { 32 if (ssrcs_.insert(ssrc).second) {
39 return ssrc; 33 return ssrc;
40 } 34 }
41 } 35 }
42 } 36 }
43 37
44 void SSRCDatabase::RegisterSSRC(uint32_t ssrc) { 38 void SSRCDatabase::RegisterSSRC(uint32_t ssrc) {
45 CriticalSectionScoped lock(crit_.get()); 39 rtc::CritScope lock(&crit_);
46 ssrcs_.insert(ssrc); 40 ssrcs_.insert(ssrc);
47 } 41 }
48 42
49 void SSRCDatabase::ReturnSSRC(uint32_t ssrc) { 43 void SSRCDatabase::ReturnSSRC(uint32_t ssrc) {
50 CriticalSectionScoped lock(crit_.get()); 44 rtc::CritScope lock(&crit_);
51 ssrcs_.erase(ssrc); 45 ssrcs_.erase(ssrc);
52 } 46 }
53 47
54 SSRCDatabase::SSRCDatabase() 48 SSRCDatabase::SSRCDatabase() : random_(TickTime::Now().Ticks()) {}
55 : crit_(CriticalSectionWrapper::CreateCriticalSection()), random_(Seed()) {}
56 49
57 SSRCDatabase::~SSRCDatabase() { 50 SSRCDatabase::~SSRCDatabase() {}
58 }
59 51
60 } // namespace webrtc 52 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/ssrc_database.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698