Index: webrtc/video_engine/vie_channel_group.h |
diff --git a/webrtc/video_engine/vie_channel_group.h b/webrtc/video_engine/vie_channel_group.h |
index ec1708318d023880e971e7db488a444589531849..1c4c732d07a94c7b30bf6a6c4c5cfdddfe62838f 100644 |
--- a/webrtc/video_engine/vie_channel_group.h |
+++ b/webrtc/video_engine/vie_channel_group.h |
@@ -19,6 +19,8 @@ |
#include "webrtc/base/criticalsection.h" |
#include "webrtc/base/scoped_ptr.h" |
#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" |
+#include "webrtc/video_receive_stream.h" |
+#include "webrtc/video_send_stream.h" |
namespace webrtc { |
@@ -30,6 +32,8 @@ class PacedSender; |
class PacketRouter; |
class ProcessThread; |
class RemoteBitrateEstimator; |
+class RemoteEstimatorProxy; |
+class TransportFeedbackAdapter; |
class ViEChannel; |
class ViEEncoder; |
class VieRemb; |
@@ -46,10 +50,11 @@ class ChannelGroup : public BitrateObserver { |
bool CreateSendChannel(int channel_id, |
Transport* transport, |
int number_of_cores, |
- const std::vector<uint32_t>& ssrcs); |
+ const VideoSendStream::Config& config); |
bool CreateReceiveChannel(int channel_id, |
Transport* transport, |
- int number_of_cores); |
+ int number_of_cores, |
+ const VideoReceiveStream::Config& config); |
void DeleteChannel(int channel_id); |
ViEChannel* GetChannel(int channel_id) const; |
ViEEncoder* GetEncoder(int channel_id) const; |
@@ -77,16 +82,19 @@ class ChannelGroup : public BitrateObserver { |
int number_of_cores, |
ViEEncoder* vie_encoder, |
size_t max_rtp_streams, |
- bool sender); |
+ bool sender, |
+ RemoteBitrateEstimator* bitrate_estimator, |
+ TransportFeedbackObserver* feedback_observer); |
ViEChannel* PopChannel(int channel_id); |
rtc::scoped_ptr<VieRemb> remb_; |
rtc::scoped_ptr<BitrateAllocator> bitrate_allocator_; |
rtc::scoped_ptr<CallStats> call_stats_; |
- rtc::scoped_ptr<RemoteBitrateEstimator> remote_bitrate_estimator_; |
- rtc::scoped_ptr<EncoderStateFeedback> encoder_state_feedback_; |
rtc::scoped_ptr<PacketRouter> packet_router_; |
rtc::scoped_ptr<PacedSender> pacer_; |
+ rtc::scoped_ptr<RemoteBitrateEstimator> remote_bitrate_estimator_; |
+ rtc::scoped_ptr<RemoteEstimatorProxy> remote_estimator_proxy_; |
+ rtc::scoped_ptr<EncoderStateFeedback> encoder_state_feedback_; |
ChannelMap channel_map_; |
// Maps Channel id -> ViEEncoder. |
mutable rtc::CriticalSection encoder_map_crit_; |
@@ -97,6 +105,7 @@ class ChannelGroup : public BitrateObserver { |
rtc::scoped_ptr<ProcessThread> pacer_thread_; |
rtc::scoped_ptr<BitrateController> bitrate_controller_; |
+ rtc::scoped_ptr<TransportFeedbackAdapter> transport_feedback_adapter_; |
}; |
} // namespace webrtc |