| Index: media/capture/video/mac/video_capture_device_mac.h
|
| diff --git a/media/capture/video/mac/video_capture_device_mac.h b/media/capture/video/mac/video_capture_device_mac.h
|
| index c36248eb29323ef0837fc59b30788ad7e1080ca0..f22848dc7c9af9090b448f0c7484dab7cb5fe89e 100644
|
| --- a/media/capture/video/mac/video_capture_device_mac.h
|
| +++ b/media/capture/video/mac/video_capture_device_mac.h
|
| @@ -70,7 +70,8 @@ class VideoCaptureDeviceMac : public VideoCaptureDevice {
|
| int video_frame_length,
|
| const VideoCaptureFormat& frame_format,
|
| int aspect_numerator,
|
| - int aspect_denominator);
|
| + int aspect_denominator,
|
| + base::TimeDelta timestamp);
|
|
|
| // Forwarder to VideoCaptureDevice::Client::OnError().
|
| void ReceiveError(const std::string& reason);
|
| @@ -102,6 +103,9 @@ class VideoCaptureDeviceMac : public VideoCaptureDevice {
|
|
|
| id<PlatformVideoCapturingMac> capture_device_;
|
|
|
| + base::TimeDelta first_timestamp_;
|
| + base::TimeTicks first_aligned_timestamp_;
|
| +
|
| // Used with Bind and PostTask to ensure that methods aren't called after the
|
| // VideoCaptureDeviceMac is destroyed.
|
| // NOTE: Weak pointers must be invalidated before all other member variables.
|
|
|