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

Unified Diff: webrtc/video_engine/vie_channel_group.cc

Issue 1354143004: Remove callback_cs_ in ViEEncoder. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: 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
« no previous file with comments | « webrtc/video_engine/vie_channel_group.h ('k') | webrtc/video_engine/vie_encoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 42f6c852f0fd4ba548d4092b6579dbe28fb11113..42ffafb7d01ad384cad787a37946beb78d4e6884 100644
--- a/webrtc/video_engine/vie_channel_group.cc
+++ b/webrtc/video_engine/vie_channel_group.cc
@@ -187,12 +187,14 @@ ChannelGroup::~ChannelGroup() {
bool ChannelGroup::CreateSendChannel(int channel_id,
Transport* transport,
+ SendStatisticsProxy* stats_proxy,
+ I420FrameCallback* pre_encode_callback,
int number_of_cores,
const std::vector<uint32_t>& ssrcs) {
RTC_DCHECK(!ssrcs.empty());
- rtc::scoped_ptr<ViEEncoder> vie_encoder(
- new ViEEncoder(channel_id, number_of_cores, *process_thread_,
- pacer_.get(), bitrate_allocator_.get()));
+ rtc::scoped_ptr<ViEEncoder> vie_encoder(new ViEEncoder(
+ channel_id, number_of_cores, process_thread_, stats_proxy,
+ pre_encode_callback, pacer_.get(), bitrate_allocator_.get()));
if (!vie_encoder->Init()) {
return false;
}
« no previous file with comments | « webrtc/video_engine/vie_channel_group.h ('k') | webrtc/video_engine/vie_encoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698