diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-08-01 12:59:39 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-04 12:40:43 +0000 |
| commit | 28b1110370900897ab652cb420c371fab8857ad4 (patch) | |
| tree | 41b32127d23b0df4f2add2a27e12dc87bddb260e /chromium/media/capture/video/win/video_capture_device_win.h | |
| parent | 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (diff) | |
| download | qtwebengine-chromium-28b1110370900897ab652cb420c371fab8857ad4.tar.gz | |
BASELINE: Update Chromium to 53.0.2785.41
Also adds a few extra files for extensions.
Change-Id: Iccdd55d98660903331cf8b7b29188da781830af4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/media/capture/video/win/video_capture_device_win.h')
| -rw-r--r-- | chromium/media/capture/video/win/video_capture_device_win.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/chromium/media/capture/video/win/video_capture_device_win.h b/chromium/media/capture/video/win/video_capture_device_win.h index 0db9c85f76f..9ef2b0fb0cc 100644 --- a/chromium/media/capture/video/win/video_capture_device_win.h +++ b/chromium/media/capture/video/win/video_capture_device_win.h @@ -5,8 +5,8 @@ // Windows specific implementation of VideoCaptureDevice. DirectShow is used for // capturing. DirectShow provide its own threads for capturing. -#ifndef MEDIA_VIDEO_CAPTURE_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_ -#define MEDIA_VIDEO_CAPTURE_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_ +#ifndef MEDIA_CAPTURE_VIDEO_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_ +#define MEDIA_CAPTURE_VIDEO_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_ // Avoid including strsafe.h via dshow as it will cause build warnings. #define NO_DSHOW_STRSAFE @@ -86,7 +86,7 @@ class VideoCaptureDeviceWin : public VideoCaptureDevice, // Implements SinkFilterObserver. void FrameReceived(const uint8_t* buffer, int length, - base::TimeTicks timestamp) override; + base::TimeDelta timestamp) override; bool CreateCapabilityMap(); void SetAntiFlickerInCaptureFilter(const VideoCaptureParams& params); @@ -112,6 +112,8 @@ class VideoCaptureDeviceWin : public VideoCaptureDevice, CapabilityList capabilities_; VideoCaptureFormat capture_format_; + base::TimeTicks first_ref_time_; + base::ThreadChecker thread_checker_; DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceWin); @@ -119,4 +121,4 @@ class VideoCaptureDeviceWin : public VideoCaptureDevice, } // namespace media -#endif // MEDIA_VIDEO_CAPTURE_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_ +#endif // MEDIA_CAPTURE_VIDEO_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_ |