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

Unified Diff: webrtc/video_engine/vie_channel_group.cc

Issue 1335353005: Remove channel ids from various interfaces. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: LoopBackTransport SSRC demuxing. Created 5 years, 3 months 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 side-by-side diff with in-line comments
Download patch
Index: webrtc/video_engine/vie_channel_group.cc
diff --git a/webrtc/video_engine/vie_channel_group.cc b/webrtc/video_engine/vie_channel_group.cc
index fc7a2d1a521f8c60493b752806c2fa651b5b8aac..07f030aa432ebdeb2724f165249508af33712837 100644
--- a/webrtc/video_engine/vie_channel_group.cc
+++ b/webrtc/video_engine/vie_channel_group.cc
@@ -186,7 +186,6 @@ ChannelGroup::~ChannelGroup() {
}
bool ChannelGroup::CreateSendChannel(int channel_id,
- int engine_id,
Transport* transport,
int number_of_cores,
const std::vector<uint32_t>& ssrcs) {
@@ -198,7 +197,7 @@ bool ChannelGroup::CreateSendChannel(int channel_id,
return false;
}
ViEEncoder* encoder = vie_encoder.get();
- if (!CreateChannel(channel_id, engine_id, transport, number_of_cores,
+ if (!CreateChannel(channel_id, transport, number_of_cores,
vie_encoder.release(), ssrcs.size(), true)) {
return false;
}
@@ -214,22 +213,20 @@ bool ChannelGroup::CreateSendChannel(int channel_id,
}
bool ChannelGroup::CreateReceiveChannel(int channel_id,
- int engine_id,
Transport* transport,
int number_of_cores) {
- return CreateChannel(channel_id, engine_id, transport, number_of_cores,
+ return CreateChannel(channel_id, transport, number_of_cores,
nullptr, 1, false);
}
bool ChannelGroup::CreateChannel(int channel_id,
- int engine_id,
Transport* transport,
int number_of_cores,
ViEEncoder* vie_encoder,
size_t max_rtp_streams,
bool sender) {
rtc::scoped_ptr<ViEChannel> channel(new ViEChannel(
- channel_id, engine_id, number_of_cores, transport, process_thread_,
+ number_of_cores, transport, process_thread_,
encoder_state_feedback_->GetRtcpIntraFrameObserver(),
bitrate_controller_->CreateRtcpBandwidthObserver(), nullptr,
remote_bitrate_estimator_.get(), call_stats_->rtcp_rtt_stats(),

Powered by Google App Engine
This is Rietveld 408576698