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 e133d1a0b61a089174f160409a422b27b3473176..91f949085a3809d1dd6472988d7f573054e9c044 100644 |
--- a/webrtc/video_engine/vie_channel_group.h |
+++ b/webrtc/video_engine/vie_channel_group.h |
@@ -19,8 +19,6 @@ |
#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 { |
@@ -54,11 +52,10 @@ class ChannelGroup : public BitrateObserver { |
SendStatisticsProxy* stats_proxy, |
I420FrameCallback* pre_encode_callback, |
int number_of_cores, |
- const VideoSendStream::Config& config); |
+ const std::vector<uint32_t>& ssrcs); |
bool CreateReceiveChannel(int channel_id, |
Transport* transport, |
- int number_of_cores, |
- const VideoReceiveStream::Config& config); |
+ int number_of_cores); |
void DeleteChannel(int channel_id); |
ViEChannel* GetChannel(int channel_id) const; |
ViEEncoder* GetEncoder(int channel_id) const; |
@@ -86,19 +83,16 @@ class ChannelGroup : public BitrateObserver { |
int number_of_cores, |
ViEEncoder* vie_encoder, |
size_t max_rtp_streams, |
- bool sender, |
- RemoteBitrateEstimator* bitrate_estimator, |
- TransportFeedbackObserver* feedback_observer); |
+ bool sender); |
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<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_; |
+ rtc::scoped_ptr<PacketRouter> packet_router_; |
+ rtc::scoped_ptr<PacedSender> pacer_; |
ChannelMap channel_map_; |
// Maps Channel id -> ViEEncoder. |
mutable rtc::CriticalSection encoder_map_crit_; |
@@ -109,7 +103,6 @@ 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 |