Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(336)

Unified Diff: media/capture/video/win/video_capture_device_win.cc

Issue 1983193002: Decouple capture timestamp and reference time (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolve Comments Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/capture/video/win/video_capture_device_win.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/capture/video/win/video_capture_device_win.cc
diff --git a/media/capture/video/win/video_capture_device_win.cc b/media/capture/video/win/video_capture_device_win.cc
index b6018cb4202a1ef8ae657b985cac66ed46bfa2bf..5f1b432dda795b4cf5c5e80cb03907fb1154761d 100644
--- a/media/capture/video/win/video_capture_device_win.cc
+++ b/media/capture/video/win/video_capture_device_win.cc
@@ -15,6 +15,7 @@
#include "base/strings/sys_string_conversions.h"
#include "base/win/scoped_co_mem.h"
#include "base/win/scoped_variant.h"
+#include "media/base/timestamp_constants.h"
using base::win::ScopedCoMem;
using base::win::ScopedComPtr;
@@ -451,9 +452,17 @@ void VideoCaptureDeviceWin::StopAndDeAllocate() {
// Implements SinkFilterObserver::SinkFilterObserver.
void VideoCaptureDeviceWin::FrameReceived(const uint8_t* buffer,
int length,
- base::TimeTicks timestamp) {
+ base::TimeDelta timestamp) {
+ if (first_ref_time_.is_null())
+ first_ref_time_ = base::TimeTicks::Now();
+
+ // There is a chance that the platform does not provide us with the timestamp,
+ // in which case, we use reference time to calculate a timestamp.
+ if (timestamp == media::kNoTimestamp())
+ timestamp = base::TimeTicks::Now() - first_ref_time_;
+
client_->OnIncomingCapturedData(buffer, length, capture_format_, 0,
- timestamp);
+ base::TimeTicks::Now(), timestamp);
}
bool VideoCaptureDeviceWin::CreateCapabilityMap() {
« no previous file with comments | « media/capture/video/win/video_capture_device_win.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698