Chromium Code Reviews| Index: talk/media/webrtc/webrtcvideocapturer.cc |
| diff --git a/talk/media/webrtc/webrtcvideocapturer.cc b/talk/media/webrtc/webrtcvideocapturer.cc |
| index 9f1f32af4fe8bfed81726e7e293f2f7a9c60f0d4..5ba5fb9ba25001f03871d563fa2313d777801acf 100644 |
| --- a/talk/media/webrtc/webrtcvideocapturer.cc |
| +++ b/talk/media/webrtc/webrtcvideocapturer.cc |
| @@ -382,10 +382,12 @@ void WebRtcVideoCapturer::OnIncomingCapturedFrame( |
| // consistency with other capturers such as in Chrome, we need to do a |
| // thread hop. |
| // Note that Stop() can cause the async invoke call to be cancelled. |
| - async_invoker_->AsyncInvoke<void>(start_thread_, |
| - // Note that this results in a shallow copying of the frame. |
| - rtc::Bind(&WebRtcVideoCapturer::SignalFrameCapturedOnStartThread, |
| - this, sample)); |
| + async_invoker_->AsyncInvoke<void>( |
| + start_thread_, |
|
noahric
2015/10/23 06:02:16
FYI, this is from git cl format.
|
| + // Note that Bind captures by value, so there's an intermediate copy |
| + // of sample. |
| + rtc::Bind(&WebRtcVideoCapturer::SignalFrameCapturedOnStartThread, this, |
| + sample)); |
| } |
| } |
| @@ -395,7 +397,7 @@ void WebRtcVideoCapturer::OnCaptureDelayChanged(const int32_t id, |
| } |
| void WebRtcVideoCapturer::SignalFrameCapturedOnStartThread( |
| - const webrtc::VideoFrame frame) { |
| + const webrtc::VideoFrame& frame) { |
| // This can only happen between Start() and Stop(). |
| RTC_DCHECK(start_thread_); |
| RTC_DCHECK(start_thread_->IsCurrent()); |