| Index: media/capture/video/win/video_capture_device_mf_win.cc
|
| diff --git a/media/capture/video/win/video_capture_device_mf_win.cc b/media/capture/video/win/video_capture_device_mf_win.cc
|
| index 85ebd7e3bc699f821941504dc4f7663b9db34d18..17909a89be89c8d32f8941aa7be7ae442bf26e7c 100644
|
| --- a/media/capture/video/win/video_capture_device_mf_win.cc
|
| +++ b/media/capture/video/win/video_capture_device_mf_win.cc
|
| @@ -109,14 +109,17 @@ class MFReaderCallback final
|
| return 1U;
|
| }
|
|
|
| - STDMETHOD(OnReadSample)(HRESULT status,
|
| - DWORD stream_index,
|
| - DWORD stream_flags,
|
| - LONGLONG time_stamp,
|
| - IMFSample* sample) override {
|
| - base::TimeTicks stamp(base::TimeTicks::Now());
|
| + STDMETHOD(OnReadSample)
|
| + (HRESULT status,
|
| + DWORD stream_index,
|
| + DWORD stream_flags,
|
| + LONGLONG raw_time_stamp,
|
| + IMFSample* sample) override {
|
| + base::TimeTicks reference_time(base::TimeTicks::Now());
|
| + base::TimeDelta timestamp =
|
| + base::TimeDelta::FromMicroseconds(raw_time_stamp / 10);
|
| if (!sample) {
|
| - observer_->OnIncomingCapturedData(NULL, 0, 0, stamp);
|
| + observer_->OnIncomingCapturedData(NULL, 0, 0, reference_time, timestamp);
|
| return S_OK;
|
| }
|
|
|
| @@ -130,7 +133,8 @@ class MFReaderCallback final
|
| DWORD length = 0, max_length = 0;
|
| BYTE* data = NULL;
|
| buffer->Lock(&data, &max_length, &length);
|
| - observer_->OnIncomingCapturedData(data, length, 0, stamp);
|
| + observer_->OnIncomingCapturedData(data, length, 0, reference_time,
|
| + timestamp);
|
| buffer->Unlock();
|
| }
|
| }
|
| @@ -299,11 +303,12 @@ void VideoCaptureDeviceMFWin::OnIncomingCapturedData(
|
| const uint8_t* data,
|
| int length,
|
| int rotation,
|
| - const base::TimeTicks& time_stamp) {
|
| + base::TimeTicks reference_time,
|
| + base::TimeDelta timestamp) {
|
| base::AutoLock lock(lock_);
|
| if (data && client_.get()) {
|
| client_->OnIncomingCapturedData(data, length, capture_format_, rotation,
|
| - time_stamp);
|
| + reference_time, timestamp);
|
| }
|
|
|
| if (capture_) {
|
|
|