| Index: webrtc/api/videocapturertracksource.cc
|
| diff --git a/webrtc/api/videocapturertracksource.cc b/webrtc/api/videocapturertracksource.cc
|
| index b99a2d1edaf00a0a17d3332efa7aa29bdbe25b24..2321d83635d49e3f51450ad50d93b4d43a4036e7 100644
|
| --- a/webrtc/api/videocapturertracksource.cc
|
| +++ b/webrtc/api/videocapturertracksource.cc
|
| @@ -352,8 +352,8 @@ void VideoCapturerTrackSource::Initialize(
|
| format_ = GetBestCaptureFormat(formats);
|
| // Start the camera with our best guess.
|
| if (!worker_thread_->Invoke<bool>(
|
| - rtc::Bind(&cricket::VideoCapturer::StartCapturing,
|
| - video_capturer_.get(), format_))) {
|
| + RTC_FROM_HERE, rtc::Bind(&cricket::VideoCapturer::StartCapturing,
|
| + video_capturer_.get(), format_))) {
|
| SetState(kEnded);
|
| return;
|
| }
|
| @@ -372,6 +372,7 @@ void VideoCapturerTrackSource::Stop() {
|
| }
|
| started_ = false;
|
| worker_thread_->Invoke<void>(
|
| + RTC_FROM_HERE,
|
| rtc::Bind(&cricket::VideoCapturer::Stop, video_capturer_.get()));
|
| }
|
|
|
| @@ -380,8 +381,8 @@ void VideoCapturerTrackSource::Restart() {
|
| return;
|
| }
|
| if (!worker_thread_->Invoke<bool>(
|
| - rtc::Bind(&cricket::VideoCapturer::StartCapturing,
|
| - video_capturer_.get(), format_))) {
|
| + RTC_FROM_HERE, rtc::Bind(&cricket::VideoCapturer::StartCapturing,
|
| + video_capturer_.get(), format_))) {
|
| SetState(kEnded);
|
| return;
|
| }
|
| @@ -394,8 +395,9 @@ void VideoCapturerTrackSource::OnStateChange(
|
| cricket::CaptureState capture_state) {
|
| if (rtc::Thread::Current() != signaling_thread_) {
|
| invoker_.AsyncInvoke<void>(
|
| - signaling_thread_, rtc::Bind(&VideoCapturerTrackSource::OnStateChange,
|
| - this, capturer, capture_state));
|
| + RTC_FROM_HERE, signaling_thread_,
|
| + rtc::Bind(&VideoCapturerTrackSource::OnStateChange, this, capturer,
|
| + capture_state));
|
| return;
|
| }
|
|
|
|
|