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

Side by Side Diff: webrtc/modules/pacing/packet_router.h

Issue 1505053002: Revert of "Create rtc::AtomicInt POD struct." (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) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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 #ifndef WEBRTC_MODULES_PACING_PACKET_ROUTER_H_ 11 #ifndef WEBRTC_MODULES_PACING_PACKET_ROUTER_H_
12 #define WEBRTC_MODULES_PACING_PACKET_ROUTER_H_ 12 #define WEBRTC_MODULES_PACING_PACKET_ROUTER_H_
13 13
14 #include <list> 14 #include <list>
15 15
16 #include "webrtc/base/atomicops.h"
17 #include "webrtc/base/constructormagic.h" 16 #include "webrtc/base/constructormagic.h"
18 #include "webrtc/base/criticalsection.h" 17 #include "webrtc/base/criticalsection.h"
19 #include "webrtc/base/scoped_ptr.h" 18 #include "webrtc/base/scoped_ptr.h"
20 #include "webrtc/base/thread_annotations.h" 19 #include "webrtc/base/thread_annotations.h"
21 #include "webrtc/common_types.h" 20 #include "webrtc/common_types.h"
22 #include "webrtc/modules/pacing/paced_sender.h" 21 #include "webrtc/modules/pacing/paced_sender.h"
23 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" 22 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
24 23
25 namespace webrtc { 24 namespace webrtc {
26 25
(...skipping 25 matching lines...) Expand all
52 uint16_t AllocateSequenceNumber() override; 51 uint16_t AllocateSequenceNumber() override;
53 52
54 // Send transport feedback packet to send-side. 53 // Send transport feedback packet to send-side.
55 virtual bool SendFeedback(rtcp::TransportFeedback* packet); 54 virtual bool SendFeedback(rtcp::TransportFeedback* packet);
56 55
57 private: 56 private:
58 rtc::CriticalSection modules_lock_; 57 rtc::CriticalSection modules_lock_;
59 // Map from ssrc to sending rtp module. 58 // Map from ssrc to sending rtp module.
60 std::list<RtpRtcp*> rtp_modules_ GUARDED_BY(modules_lock_); 59 std::list<RtpRtcp*> rtp_modules_ GUARDED_BY(modules_lock_);
61 60
62 rtc::AtomicInt transport_seq_; 61 volatile int transport_seq_;
63 62
64 RTC_DISALLOW_COPY_AND_ASSIGN(PacketRouter); 63 RTC_DISALLOW_COPY_AND_ASSIGN(PacketRouter);
65 }; 64 };
66 } // namespace webrtc 65 } // namespace webrtc
67 #endif // WEBRTC_MODULES_PACING_PACKET_ROUTER_H_ 66 #endif // WEBRTC_MODULES_PACING_PACKET_ROUTER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698