Rename CaptureThread to EncodingThread.

webrtc/video/video_capture_input.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 22 matching lines @@
                                      VideoCaptureCallback* frame_callback,
                                      VideoRenderer* local_renderer,
                                      SendStatisticsProxy* stats_proxy,
                                      CpuOveruseObserver* overuse_observer)
     : capture_cs_(CriticalSectionWrapper::CreateCriticalSection()),
       module_process_thread_(module_process_thread),
       frame_callback_(frame_callback),
       local_renderer_(local_renderer),
       stats_proxy_(stats_proxy),
       incoming_frame_cs_(CriticalSectionWrapper::CreateCriticalSection()),
-      capture_thread_(ThreadWrapper::CreateThread(CaptureThreadFunction,
+      encoder_thread_(ThreadWrapper::CreateThread(EncoderThreadFunction,
                                                   this,
-                                                  "CaptureThread")),
-      capture_event_(*EventWrapper::Create()),
+                                                  "EncoderThread")),
+      capture_event_(EventWrapper::Create()),
       stop_(0),
       last_captured_timestamp_(0),
       delta_ntp_internal_ms_(
           Clock::GetRealTimeClock()->CurrentNtpInMilliseconds() -
           TickTime::MillisecondTimestamp()),
       overuse_detector_(new OveruseFrameDetector(Clock::GetRealTimeClock(),
                                                  CpuOveruseOptions(),
                                                  overuse_observer,
                                                  stats_proxy)) {
-  capture_thread_->Start();
-  capture_thread_->SetPriority(kHighPriority);
+  encoder_thread_->Start();
+  encoder_thread_->SetPriority(kHighPriority);
   module_process_thread_->RegisterModule(overuse_detector_.get());
 }
 
 VideoCaptureInput::~VideoCaptureInput() {
   module_process_thread_->DeRegisterModule(overuse_detector_.get());
 
   // Stop the thread.
   rtc::AtomicOps::ReleaseStore(&stop_, 1);
-  capture_event_.Set();
-
-  // Stop the camera input.
-  capture_thread_->Stop();
-  delete &capture_event_;
+  capture_event_->Set();
+  encoder_thread_->Stop();
 }
 
 void VideoCaptureInput::IncomingCapturedFrame(const VideoFrame& video_frame) {
   // TODO(pbos): Remove local rendering, it should be handled by the client code
   // if required.
   if (local_renderer_)
     local_renderer_->RenderFrame(video_frame, 0);
 
   stats_proxy_->OnIncomingFrame(video_frame.width(), video_frame.height());
 
@@ skipping 30 matching lines @@
   captured_frame_.ShallowCopy(incoming_frame);
   last_captured_timestamp_ = incoming_frame.ntp_time_ms();
 
   overuse_detector_->FrameCaptured(captured_frame_.width(),
                                    captured_frame_.height(),
                                    captured_frame_.render_time_ms());
 
   TRACE_EVENT_ASYNC_BEGIN1("webrtc", "Video", video_frame.render_time_ms(),
                            "render_time", video_frame.render_time_ms());
 
-  capture_event_.Set();
+  capture_event_->Set();
 }
 
-bool VideoCaptureInput::CaptureThreadFunction(void* obj) {
-  return static_cast<VideoCaptureInput*>(obj)->CaptureProcess();
+bool VideoCaptureInput::EncoderThreadFunction(void* obj) {
+  return static_cast<VideoCaptureInput*>(obj)->EncoderProcess();
 }
 
-bool VideoCaptureInput::CaptureProcess() {
+bool VideoCaptureInput::EncoderProcess() {
   static const int kThreadWaitTimeMs = 100;
   int64_t capture_time = -1;
-  if (capture_event_.Wait(kThreadWaitTimeMs) == kEventSignaled) {
+  if (capture_event_->Wait(kThreadWaitTimeMs) == kEventSignaled) {
     if (rtc::AtomicOps::AcquireLoad(&stop_))
       return false;
 
     int64_t encode_start_time = -1;
     VideoFrame deliver_frame;
     {
       CriticalSectionScoped cs(capture_cs_.get());
       if (!captured_frame_.IsZeroSize()) {
         deliver_frame = captured_frame_;
         captured_frame_.Reset();
@@ skipping 14 matching lines @@
   }
   // We're done!
   if (capture_time != -1) {
     overuse_detector_->FrameSent(capture_time);
   }
   return true;
 }
 
 }  // namespace internal
 }  // namespace webrtc