Implement timestamp translation/filter in VideoCapturer.

webrtc/api/java/jni/androidvideocapturer_jni.cc

 /*
  *  Copyright 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 162 matching lines @@
   RTC_DCHECK(rotation == 0 || rotation == 90 || rotation == 180 ||
              rotation == 270);
   rtc::CritScope cs(&capturer_lock_);
 
   int adapted_width;
   int adapted_height;
   int crop_width;
   int crop_height;
   int crop_x;
   int crop_y;
+  int64_t time_us;

[pthatcher1, 2016/05/27 22:47:43]

Can you be a little more specific about what the timestamp is?  Capture time?  

[nisse-webrtc, 2016/05/30 08:57:29]

I changed it to translated_capture_time_us. Better?

 
   if (!capturer_->AdaptFrame(width, height, timestamp_ns,
                              &adapted_width, &adapted_height,
-                             &crop_width, &crop_height, &crop_x, &crop_y)) {
+                             &crop_width, &crop_height, &crop_x, &crop_y,
+                             &time_us)) {
     return;
   }
 
   int rotated_width = crop_width;
   int rotated_height = crop_height;
 
   if (capturer_->apply_rotation() && (rotation == 90 || rotation == 270)) {
     std::swap(adapted_width, adapted_height);
     std::swap(rotated_width, rotated_height);
   }
@@ skipping 32 matching lines @@
                           scaled->MutableDataY(), scaled->StrideY(),
                           scaled->MutableDataU(), scaled->StrideU(),
                           scaled->MutableDataV(), scaled->StrideV(),
                           adapted_width, adapted_height,
                           libyuv::kFilterBox) < 0) {
       LOG(LS_WARNING) << "I420Scale failed";
       return;
     }
     buffer = scaled;
   }
-  // TODO(nisse): Use microsecond time instead.
   capturer_->OnFrame(cricket::WebRtcVideoFrame(
-                         buffer, timestamp_ns,
+                         buffer,
                          capturer_->apply_rotation()
                              ? webrtc::kVideoRotation_0
-                             : static_cast<webrtc::VideoRotation>(rotation)),
+                             : static_cast<webrtc::VideoRotation>(rotation),
+                         time_us),
                      width, height);
 }
 
 void AndroidVideoCapturerJni::OnTextureFrame(int width,
                                              int height,
                                              int rotation,
                                              int64_t timestamp_ns,
                                              const NativeHandleImpl& handle) {
   RTC_DCHECK(rotation == 0 || rotation == 90 || rotation == 180 ||
              rotation == 270);
   rtc::CritScope cs(&capturer_lock_);
 
   int adapted_width;
   int adapted_height;
   int crop_width;
   int crop_height;
   int crop_x;
   int crop_y;
+  int64_t time_us;
 
   if (!capturer_->AdaptFrame(width, height, timestamp_ns,
                              &adapted_width, &adapted_height,
-                             &crop_width, &crop_height, &crop_x, &crop_y)) {
+                             &crop_width, &crop_height, &crop_x, &crop_y,
+                             &time_us)) {
     return;
   }
 
   Matrix matrix = handle.sampling_matrix;
 
   matrix.Crop(crop_width / static_cast<float>(width),
               crop_height / static_cast<float>(height),
               crop_x / static_cast<float>(width),
               crop_y / static_cast<float>(height));
 
   if (capturer_->apply_rotation()) {
     if (rotation == webrtc::kVideoRotation_90 ||
         rotation == webrtc::kVideoRotation_270) {
       std::swap(adapted_width, adapted_height);
     }
     matrix.Rotate(static_cast<webrtc::VideoRotation>(rotation));
   }
 
-  // TODO(nisse): Use microsecond time instead.
   capturer_->OnFrame(
       cricket::WebRtcVideoFrame(
           surface_texture_helper_->CreateTextureFrame(
               adapted_width, adapted_height,
               NativeHandleImpl(handle.oes_texture_id, matrix)),
-          timestamp_ns, capturer_->apply_rotation()
-                            ? webrtc::kVideoRotation_0
-                            : static_cast<webrtc::VideoRotation>(rotation)),
+          capturer_->apply_rotation()
+              ? webrtc::kVideoRotation_0
+              : static_cast<webrtc::VideoRotation>(rotation),
+          time_us),
       width, height);
 }
 
 void AndroidVideoCapturerJni::OnOutputFormatRequest(int width,
                                                     int height,
                                                     int fps) {
   AsyncCapturerInvoke("OnOutputFormatRequest",
                       &webrtc::AndroidVideoCapturer::OnOutputFormatRequest,
                       width, height, fps);
 }
@@ skipping 30 matching lines @@
 
 JOW(void, VideoCapturer_00024NativeObserver_nativeOnOutputFormatRequest)
     (JNIEnv* jni, jclass, jlong j_capturer, jint j_width, jint j_height,
         jint j_fps) {
   LOG(LS_INFO) << "NativeObserver_nativeOnOutputFormatRequest";
   reinterpret_cast<AndroidVideoCapturerJni*>(j_capturer)->OnOutputFormatRequest(
       j_width, j_height, j_fps);
 }
 
 }  // namespace webrtc_jni