| OLD | NEW | 
|---|
| 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_INCLUDE_PACKET_ROUTER_H_ | 11 #ifndef WEBRTC_MODULES_PACING_INCLUDE_PACKET_ROUTER_H_ | 
| 12 #define WEBRTC_MODULES_PACING_INCLUDE_PACKET_ROUTER_H_ | 12 #define WEBRTC_MODULES_PACING_INCLUDE_PACKET_ROUTER_H_ | 
| 13 | 13 | 
| 14 #include <list> | 14 #include <list> | 
| 15 | 15 | 
| 16 #include "webrtc/base/constructormagic.h" | 16 #include "webrtc/base/constructormagic.h" | 
| 17 #include "webrtc/base/criticalsection.h" | 17 #include "webrtc/base/criticalsection.h" | 
| 18 #include "webrtc/base/scoped_ptr.h" | 18 #include "webrtc/base/scoped_ptr.h" | 
| 19 #include "webrtc/base/thread_annotations.h" | 19 #include "webrtc/base/thread_annotations.h" | 
| 20 #include "webrtc/common_types.h" | 20 #include "webrtc/common_types.h" | 
| 21 #include "webrtc/modules/pacing/include/paced_sender.h" | 21 #include "webrtc/modules/pacing/include/paced_sender.h" | 
| 22 #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" | 22 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" | 
| 23 | 23 | 
| 24 namespace webrtc { | 24 namespace webrtc { | 
| 25 | 25 | 
| 26 class RtpRtcp; | 26 class RtpRtcp; | 
| 27 namespace rtcp { | 27 namespace rtcp { | 
| 28 class TransportFeedback; | 28 class TransportFeedback; | 
| 29 }  // namespace rtcp | 29 }  // namespace rtcp | 
| 30 | 30 | 
| 31 // PacketRouter routes outgoing data to the correct sending RTP module, based | 31 // PacketRouter routes outgoing data to the correct sending RTP module, based | 
| 32 // on the simulcast layer in RTPVideoHeader. | 32 // on the simulcast layer in RTPVideoHeader. | 
| (...skipping 24 matching lines...) Expand all  Loading... | 
| 57   rtc::CriticalSection modules_lock_; | 57   rtc::CriticalSection modules_lock_; | 
| 58   // Map from ssrc to sending rtp module. | 58   // Map from ssrc to sending rtp module. | 
| 59   std::list<RtpRtcp*> rtp_modules_ GUARDED_BY(modules_lock_); | 59   std::list<RtpRtcp*> rtp_modules_ GUARDED_BY(modules_lock_); | 
| 60 | 60 | 
| 61   volatile int transport_seq_; | 61   volatile int transport_seq_; | 
| 62 | 62 | 
| 63   RTC_DISALLOW_COPY_AND_ASSIGN(PacketRouter); | 63   RTC_DISALLOW_COPY_AND_ASSIGN(PacketRouter); | 
| 64 }; | 64 }; | 
| 65 }  // namespace webrtc | 65 }  // namespace webrtc | 
| 66 #endif  // WEBRTC_MODULES_PACING_INCLUDE_PACKET_ROUTER_H_ | 66 #endif  // WEBRTC_MODULES_PACING_INCLUDE_PACKET_ROUTER_H_ | 
| OLD | NEW | 
|---|