| Index: webrtc/video/video_capture_input.h
|
| diff --git a/webrtc/video/video_capture_input.h b/webrtc/video/video_capture_input.h
|
| index 6cbcac5e9055cf971ad11b81119814d2a456900c..e2ef07ec6501582e7a91a11f29929f006660c2ca 100644
|
| --- a/webrtc/video/video_capture_input.h
|
| +++ b/webrtc/video/video_capture_input.h
|
| @@ -62,8 +62,8 @@ class VideoCaptureInput : public webrtc::VideoCaptureInput {
|
|
|
| private:
|
| // Thread functions for deliver captured frames to receivers.
|
| - static bool CaptureThreadFunction(void* obj);
|
| - bool CaptureProcess();
|
| + static bool EncoderThreadFunction(void* obj);
|
| + bool EncoderProcess();
|
|
|
| void DeliverI420Frame(VideoFrame* video_frame);
|
|
|
| @@ -78,10 +78,8 @@ class VideoCaptureInput : public webrtc::VideoCaptureInput {
|
| rtc::scoped_ptr<CriticalSectionWrapper> incoming_frame_cs_;
|
| VideoFrame incoming_frame_;
|
|
|
| - // Capture thread.
|
| - rtc::scoped_ptr<ThreadWrapper> capture_thread_;
|
| - // TODO(pbos): scoped_ptr
|
| - EventWrapper& capture_event_;
|
| + rtc::scoped_ptr<ThreadWrapper> encoder_thread_;
|
| + rtc::scoped_ptr<EventWrapper> capture_event_;
|
|
|
| volatile int stop_;
|
|
|
|
|