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

Unified Diff: webrtc/video_engine/vie_channel.h

Issue 1251163002: Remove base channel for video receivers. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: fix data race Created 5 years, 5 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.h
diff --git a/webrtc/video_engine/vie_channel.h b/webrtc/video_engine/vie_channel.h
index 188fe3c3a41dba958ab7eaf011a141ea07e48f49..f18ada5d444e4ef2518eb7542853711ae37f16cd 100644
--- a/webrtc/video_engine/vie_channel.h
+++ b/webrtc/video_engine/vie_channel.h
@@ -109,8 +109,7 @@ class ViEChannel : public VCMFrameTypeCallback,
PacedSender* paced_sender,
PacketRouter* packet_router,
size_t max_rtp_streams,
- bool sender,
- bool disable_default_encoder);
+ bool sender);
~ViEChannel();
int32_t Init();
@@ -478,9 +477,6 @@ class ViEChannel : public VCMFrameTypeCallback,
VideoCodec receive_codec_ GUARDED_BY(crit_);
rtc::scoped_ptr<ThreadWrapper> decode_thread_;
- // Used to skip default encoder in the new API.
- const bool disable_default_encoder_;
-
int nack_history_size_sender_;
int max_nack_reordering_threshold_;
I420FrameCallback* pre_render_callback_ GUARDED_BY(crit_);

Powered by Google App Engine
This is Rietveld 408576698