Index: content/renderer/media/webrtc/webrtc_video_track_adapter.cc |
diff --git a/content/renderer/media/webrtc/webrtc_video_track_adapter.cc b/content/renderer/media/webrtc/webrtc_video_track_adapter.cc |
index 1d9920f1b205f3f680d6b5fe8b671ce2c7566586..6a9c2f4d30d5e7d86e5ee072f64f0b2ea20e57c5 100644 |
--- a/content/renderer/media/webrtc/webrtc_video_track_adapter.cc |
+++ b/content/renderer/media/webrtc/webrtc_video_track_adapter.cc |
@@ -44,11 +44,14 @@ class WebRtcVideoTrackAdapter::WebRtcVideoSourceAdapter |
void ReleaseSourceOnMainThread(); |
void OnVideoFrameOnIO(const scoped_refptr<media::VideoFrame>& frame, |
- const media::VideoCaptureFormat& format); |
+ const media::VideoCaptureFormat& format, |
+ const base::TimeTicks& estimated_capture_time); |
private: |
- void OnVideoFrameOnWorkerThread(const scoped_refptr<media::VideoFrame>& frame, |
- const media::VideoCaptureFormat& format); |
+ void OnVideoFrameOnWorkerThread( |
+ const scoped_refptr<media::VideoFrame>& frame, |
+ const media::VideoCaptureFormat& format, |
+ const base::TimeTicks& estimated_capture_time); |
friend class base::RefCountedThreadSafe<WebRtcVideoSourceAdapter>; |
virtual ~WebRtcVideoSourceAdapter(); |
@@ -110,18 +113,20 @@ ReleaseSourceOnMainThread() { |
void WebRtcVideoTrackAdapter::WebRtcVideoSourceAdapter::OnVideoFrameOnIO( |
const scoped_refptr<media::VideoFrame>& frame, |
- const media::VideoCaptureFormat& format) { |
+ const media::VideoCaptureFormat& format, |
+ const base::TimeTicks& estimated_capture_time) { |
DCHECK(io_thread_checker_.CalledOnValidThread()); |
libjingle_worker_thread_->PostTask( |
FROM_HERE, |
base::Bind(&WebRtcVideoSourceAdapter::OnVideoFrameOnWorkerThread, |
- this, frame, format)); |
+ this, frame, format, estimated_capture_time)); |
} |
void |
WebRtcVideoTrackAdapter::WebRtcVideoSourceAdapter::OnVideoFrameOnWorkerThread( |
const scoped_refptr<media::VideoFrame>& frame, |
- const media::VideoCaptureFormat& format) { |
+ const media::VideoCaptureFormat& format, |
+ const base::TimeTicks& estimated_capture_time) { |
DCHECK(libjingle_worker_thread_->BelongsToCurrentThread()); |
base::AutoLock auto_lock(capture_adapter_stop_lock_); |
if (capture_adapter_) |