Mac Video Capture: Sending the timestamps provided by the driver to the capture pipeline

media/capture/video/mac/video_capture_device_avfoundation_mac.mm

Index: media/capture/video/mac/video_capture_device_avfoundation_mac.mm
diff --git a/media/capture/video/mac/video_capture_device_avfoundation_mac.mm b/media/capture/video/mac/video_capture_device_avfoundation_mac.mm
index deb14080cfd2f2cb16709c9dd473df7cd809d2fd..abbbeb75186ce6efc18f9dd6a2b1ac3ba13e0abb 100644
--- a/media/capture/video/mac/video_capture_device_avfoundation_mac.mm
+++ b/media/capture/video/mac/video_capture_device_avfoundation_mac.mm
@@ -5,6 +5,7 @@
 #import "media/capture/video/mac/video_capture_device_avfoundation_mac.h"
 
 #import <CoreVideo/CoreVideo.h>
+#import <CoreMedia/CoreMedia.h>

[mcasas, 2015/11/02 18:59:18]

Imports, same as includes, should follow alphabetical
order. So, swap l.7 and 8.

[qiangchen, 2015/11/02 21:35:47]

Done.

 
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
@@ -328,9 +329,21 @@ didOutputSampleBuffer:(CoreMediaGlue::CMSampleBufferRef)sampleBuffer
 
   {
     base::AutoLock lock(lock_);
+    const CoreMediaGlue::CMTime cm_timestamp =
+        CoreMediaGlue::CMSampleBufferGetPresentationTimeStamp(sampleBuffer);
+    base::TimeTicks timestamp;
+    if ((cm_timestamp.flags & kCMTimeFlags_Valid) && cm_timestamp.timescale) {

[mcasas, 2015/11/02 18:59:18]

What about 

  const base::TimeTicks timestamp =
      CMTIME_IS_INVALID(cm_timestamp)
          ? base::TimeTicks::Now()
          : base::TimeTicks() + base::TimeDelta::FromMicroseconds(
                                    cm_timestamp.value *
                                    base::TimeTicks::kMicrosecondsPerSecond /
                                    cm_timestamp.timescale);

I would think that |cm_timestamp.timescale != 0| 
is included in the validity.

Or even better:

  const base::TimeTicks timestamp =
      CMTIME_IS_VALID(cm_timestamp)
          ? base::TimeTicks() +
                base::TimeDelta::FromSecondsD(CMTimeGetSeconds(cm_timestamp))
          : base::TimeTicks::Now();

Which is more readable IMHO, WDYT?

[qiangchen, 2015/11/02 21:35:47]

Done.

But not using CMTimeGetSeconds, because CoreMediaGlue::CMTime is not the apple
defined CMTime, but we redefined the same struct in coremedia_glue.h. Not sure
why, but in order to use a CM*** function, we have to expose it from the library
in coremedia_glue.h(and .cc) in a tedious way as we did for
CMGetPresentationTime, which I do not think necessary for just time format
conversion.

+      timestamp =
+          base::TimeTicks() +
+          base::TimeDelta::FromMicroseconds(
+              cm_timestamp.value * base::TimeTicks::kMicrosecondsPerSecond /
+              cm_timestamp.timescale);
+    } else {
+      timestamp = base::TimeTicks::Now();
+    }
     if (frameReceiver_ && baseAddress) {
       frameReceiver_->ReceiveFrame(reinterpret_cast<uint8_t*>(baseAddress),
-                                   frameSize, captureFormat, 0, 0);
+                                   frameSize, captureFormat, 0, 0, timestamp);
     }
   }