| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 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_VIDEO_ENGINE_VIE_CHANNEL_GROUP_H_ | 11 #ifndef WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_GROUP_H_ |
| 12 #define WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_GROUP_H_ | 12 #define WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_GROUP_H_ |
| 13 | 13 |
| 14 #include <list> | 14 #include <list> |
| 15 #include <map> | 15 #include <map> |
| 16 #include <set> | 16 #include <set> |
| 17 #include <vector> | 17 #include <vector> |
| 18 | 18 |
| 19 #include "webrtc/base/criticalsection.h" | 19 #include "webrtc/base/criticalsection.h" |
| 20 #include "webrtc/base/scoped_ptr.h" | 20 #include "webrtc/base/scoped_ptr.h" |
| 21 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" | 21 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" |
| 22 | 22 |
| 23 namespace webrtc { | 23 namespace webrtc { |
| 24 | 24 |
| 25 class AdaptedSendTimeHistory; | |
| 26 class BitrateAllocator; | 25 class BitrateAllocator; |
| 27 class CallStats; | 26 class CallStats; |
| 28 class Config; | 27 class Config; |
| 29 class EncoderStateFeedback; | 28 class EncoderStateFeedback; |
| 30 class PacedSender; | 29 class PacedSender; |
| 31 class PacketRouter; | 30 class PacketRouter; |
| 32 class ProcessThread; | 31 class ProcessThread; |
| 33 class RemoteBitrateEstimator; | 32 class RemoteBitrateEstimator; |
| 34 class ViEChannel; | 33 class ViEChannel; |
| 35 class ViEEncoder; | 34 class ViEEncoder; |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 rtc::scoped_ptr<RemoteBitrateEstimator> remote_bitrate_estimator_; | 89 rtc::scoped_ptr<RemoteBitrateEstimator> remote_bitrate_estimator_; |
| 91 rtc::scoped_ptr<EncoderStateFeedback> encoder_state_feedback_; | 90 rtc::scoped_ptr<EncoderStateFeedback> encoder_state_feedback_; |
| 92 rtc::scoped_ptr<PacketRouter> packet_router_; | 91 rtc::scoped_ptr<PacketRouter> packet_router_; |
| 93 rtc::scoped_ptr<PacedSender> pacer_; | 92 rtc::scoped_ptr<PacedSender> pacer_; |
| 94 ChannelMap channel_map_; | 93 ChannelMap channel_map_; |
| 95 // Maps Channel id -> ViEEncoder. | 94 // Maps Channel id -> ViEEncoder. |
| 96 mutable rtc::CriticalSection encoder_map_crit_; | 95 mutable rtc::CriticalSection encoder_map_crit_; |
| 97 EncoderMap vie_encoder_map_ GUARDED_BY(encoder_map_crit_); | 96 EncoderMap vie_encoder_map_ GUARDED_BY(encoder_map_crit_); |
| 98 | 97 |
| 99 // Registered at construct time and assumed to outlive this class. | 98 // Registered at construct time and assumed to outlive this class. |
| 100 ProcessThread* process_thread_; | 99 ProcessThread* const process_thread_; |
| 101 rtc::scoped_ptr<ProcessThread> pacer_thread_; | 100 rtc::scoped_ptr<ProcessThread> pacer_thread_; |
| 102 | 101 |
| 103 rtc::scoped_ptr<BitrateController> bitrate_controller_; | 102 rtc::scoped_ptr<BitrateController> bitrate_controller_; |
| 104 rtc::scoped_ptr<AdaptedSendTimeHistory> send_time_history_; | |
| 105 }; | 103 }; |
| 106 | 104 |
| 107 } // namespace webrtc | 105 } // namespace webrtc |
| 108 | 106 |
| 109 #endif // WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_GROUP_H_ | 107 #endif // WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_GROUP_H_ |
| OLD | NEW |