Index: webrtc/video/video_receive_stream.h |
diff --git a/webrtc/video/video_receive_stream.h b/webrtc/video/video_receive_stream.h |
index a16eab4529ea1e1ecd7a2c28da45573815fc1dd5..e42a419515d2aacfc275f46bc3bf76f564f3ac50 100644 |
--- a/webrtc/video/video_receive_stream.h |
+++ b/webrtc/video/video_receive_stream.h |
@@ -41,7 +41,8 @@ class VideoReceiveStream : public webrtc::VideoReceiveStream, |
ChannelGroup* channel_group, |
int channel_id, |
const VideoReceiveStream::Config& config, |
- webrtc::VoiceEngine* voice_engine); |
+ webrtc::VoiceEngine* voice_engine, |
+ ProcessThread* process_thread); |
~VideoReceiveStream() override; |
// webrtc::ReceiveStream implementation. |
@@ -74,9 +75,8 @@ class VideoReceiveStream : public webrtc::VideoReceiveStream, |
Clock* const clock_; |
ChannelGroup* const channel_group_; |
- const int channel_id_; |
- ViEChannel* vie_channel_; |
+ rtc::scoped_ptr<ViEChannel> vie_channel_; |
rtc::scoped_ptr<IncomingVideoStream> incoming_video_stream_; |
rtc::scoped_ptr<ReceiveStatisticsProxy> stats_proxy_; |
pbos-webrtc
2015/10/16 12:49:57
I think you can move this one to the top since it
mflodman
2015/10/16 13:31:57
Done.
|