Remove Sync GetPose VRService call, implement VRVSyncProvider

device/vr/android/gvr/gvr_device.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "device/vr/android/gvr/gvr_device.h"
 
 #include <math.h>
 #include <algorithm>
 
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
 #include "device/vr/android/gvr/gvr_delegate.h"
 #include "device/vr/android/gvr/gvr_device_provider.h"
 #include "device/vr/vr_device_manager.h"
 #include "third_party/gvr-android-sdk/src/libraries/headers/vr/gvr/capi/include/gvr.h"
 #include "third_party/gvr-android-sdk/src/libraries/headers/vr/gvr/capi/include/gvr_types.h"
 #include "ui/gfx/transform.h"
 #include "ui/gfx/transform_util.h"
 
 namespace device {
 
-namespace {
-
-static const uint64_t kPredictionTimeWithoutVsyncNanos = 50000000;
-
-}  // namespace
-
 GvrDevice::GvrDevice(GvrDeviceProvider* provider, GvrDelegate* delegate)
     : VRDevice(), delegate_(delegate), gvr_provider_(provider) {}
 
 GvrDevice::~GvrDevice() {}
 
 mojom::VRDisplayInfoPtr GvrDevice::GetVRDevice() {
   TRACE_EVENT0("input", "GvrDevice::GetVRDevice");
 
   mojom::VRDisplayInfoPtr device = mojom::VRDisplayInfo::New();
 
@@ skipping 105 matching lines @@
   right_eye->offset[2] = -right_eye_mat.m[2][3];
 
   if (delegate_) {
     delegate_->SetWebVRRenderSurfaceSize(2 * left_eye->renderWidth,
                                          left_eye->renderHeight);
   }
 
   return device;
 }
 
-mojom::VRPosePtr GvrDevice::GetPose() {
-  TRACE_EVENT0("input", "GvrDevice::GetSensorState");
-
-  mojom::VRPosePtr pose = mojom::VRPose::New();
-
-  pose->timestamp = base::Time::Now().ToJsTime();
-
-  // Increment pose frame counter always, even if it's a faked pose.
-  pose->poseIndex = ++pose_index_;
-
-  pose->orientation.emplace(4);
-
-  gvr::GvrApi* gvr_api = GetGvrApi();
-  if (!gvr_api) {
-    // If we don't have a GvrApi instance return a static forward orientation.
-    pose->orientation.value()[0] = 0.0;
-    pose->orientation.value()[1] = 0.0;
-    pose->orientation.value()[2] = 0.0;
-    pose->orientation.value()[3] = 1.0;
-
-    return pose;
-  }
-
-  if (!delegate_)
-    return nullptr;
-
-  gvr::ClockTimePoint target_time = gvr::GvrApi::GetTimePointNow();
-  target_time.monotonic_system_time_nanos += kPredictionTimeWithoutVsyncNanos;
-
-  gvr::Mat4f head_mat =
-      gvr_api->GetHeadSpaceFromStartSpaceRotation(target_time);
-  head_mat = gvr_api->ApplyNeckModel(head_mat, 1.0f);
-
-  gfx::Transform inv_transform(
-      head_mat.m[0][0], head_mat.m[0][1], head_mat.m[0][2], head_mat.m[0][3],
-      head_mat.m[1][0], head_mat.m[1][1], head_mat.m[1][2], head_mat.m[1][3],
-      head_mat.m[2][0], head_mat.m[2][1], head_mat.m[2][2], head_mat.m[2][3],
-      head_mat.m[3][0], head_mat.m[3][1], head_mat.m[3][2], head_mat.m[3][3]);
-
-  gfx::Transform transform;
-  if (inv_transform.GetInverse(&transform)) {
-    gfx::DecomposedTransform decomposed_transform;
-    gfx::DecomposeTransform(&decomposed_transform, transform);
-
-    pose->orientation.value()[0] = decomposed_transform.quaternion[0];
-    pose->orientation.value()[1] = decomposed_transform.quaternion[1];
-    pose->orientation.value()[2] = decomposed_transform.quaternion[2];
-    pose->orientation.value()[3] = decomposed_transform.quaternion[3];
-
-    pose->position.emplace(3);
-    pose->position.value()[0] = decomposed_transform.translate[0];
-    pose->position.value()[1] = decomposed_transform.translate[1];
-    pose->position.value()[2] = decomposed_transform.translate[2];
-  }
-
-  // Save the underlying GVR pose for use by rendering. It can't use a
-  // VRPosePtr since that's a different data type.
-  delegate_->SetGvrPoseForWebVr(head_mat, pose_index_);
-
-  return pose;
-}
-
 void GvrDevice::ResetPose() {
   gvr::GvrApi* gvr_api = GetGvrApi();
 
   // Should never call RecenterTracking when using with Daydream viewers. On
   // those devices recentering should only be done via the controller.
   if (gvr_api && gvr_api->GetViewerType() == GVR_VIEWER_TYPE_CARDBOARD)
     gvr_api->RecenterTracking();
 }
 
 void GvrDevice::RequestPresent(const base::Callback<void(bool)>& callback) {
@@ skipping 29 matching lines @@
 
   gvr::Rectf right_gvr_bounds;
   right_gvr_bounds.left = right_bounds->left;
   right_gvr_bounds.top = 1.0f - right_bounds->top;
   right_gvr_bounds.right = right_bounds->left + right_bounds->width;
   right_gvr_bounds.bottom = 1.0f - (right_bounds->top + right_bounds->height);
 
   delegate_->UpdateWebVRTextureBounds(left_gvr_bounds, right_gvr_bounds);
 }
 
+void GvrDevice::GetVRVSyncProvider(mojom::VRVSyncProviderRequest request) {
+  if (delegate_)
+    delegate_->OnVRVsyncProviderRequest(std::move(request));
+}
+
 void GvrDevice::SetDelegate(GvrDelegate* delegate) {
   delegate_ = delegate;
 
   // Notify the clients that this device has changed
   if (delegate_) {
     delegate_->SetWebVRSecureOrigin(secure_origin_);
     OnChanged();
   }
 }
 
 gvr::GvrApi* GvrDevice::GetGvrApi() {
   if (!delegate_)
     return nullptr;
 
   return delegate_->gvr_api();
 }
 
 }  // namespace device