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

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

Issue 1505993003: [rtp_rtcp] lint build/include errors fixed (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: 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 unified diff | Download patch
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 <assert.h> 13 #include <assert.h>
14 #include <stdlib.h> 14 #include <stdlib.h>
15 15
16 #include <string>
17
16 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" 18 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
17 19
18 #ifdef _WIN32 20 #ifdef _WIN32
21 #include <MMSystem.h> //timeGetTime
19 #include <windows.h> 22 #include <windows.h>
20 #include <MMSystem.h> //timeGetTime
21 23
22 // TODO(hellner): investigate if it is necessary to disable these warnings. 24 // TODO(hellner): investigate if it is necessary to disable these warnings.
23 #pragma warning(disable:4311) 25 #pragma warning(disable:4311)
24 #pragma warning(disable:4312) 26 #pragma warning(disable:4312)
25 #else 27 #else
26 #include <stdio.h> 28 #include <stdio.h>
27 #include <string.h> 29 #include <string.h>
30 #include <sys/time.h>
28 #include <time.h> 31 #include <time.h>
29 #include <sys/time.h>
30 #endif 32 #endif
31 33
32 namespace webrtc { 34 namespace webrtc {
33 SSRCDatabase* 35 SSRCDatabase*
34 SSRCDatabase::StaticInstance(CountOperation count_operation) 36 SSRCDatabase::StaticInstance(CountOperation count_operation)
35 { 37 {
36 SSRCDatabase* impl = 38 SSRCDatabase* impl =
37 GetStaticInstance<SSRCDatabase>(count_operation); 39 GetStaticInstance<SSRCDatabase>(count_operation);
38 return impl; 40 return impl;
39 } 41 }
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 { 112 {
111 ssrc = rand(); 113 ssrc = rand();
112 ssrc = ssrc <<16; 114 ssrc = ssrc <<16;
113 ssrc += rand(); 115 ssrc += rand();
114 116
115 } while (ssrc == 0 || ssrc == 0xffffffff); 117 } while (ssrc == 0 || ssrc == 0xffffffff);
116 118
117 return ssrc; 119 return ssrc;
118 } 120 }
119 } // namespace webrtc 121 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698