Updated to GVR 1.0 SDK

BUG=389343

Review-Url: https://codereview.chromium.org/2367673002
Cr-Commit-Position: refs/heads/master@{#420686}

DEPS

@@ -488,7 +488,7 @@ deps_os = {
       Var('chromium_git') + '/external/github.com/GoogleChrome/custom-tabs-client.git' + '@' + 'c51efbddc4f976c88d15c730a79feba65ca857af',
 
     'src/third_party/gvr-android-sdk/src':
-      Var('chromium_git') + '/external/github.com/googlevr/gvr-android-sdk.git' + '@' + 'cff15311c7c1abbe77b3c714135dccc2009ee473',
+      Var('chromium_git') + '/external/github.com/googlevr/gvr-android-sdk.git' + '@' + '25e7e14413229d4644a66be77e8f8ddeb3f91fe7',
   },
 }
 

chrome/browser/android/vr_shell/ui_elements.h

@@ -10,7 +10,7 @@
 
 #include "base/logging.h"
 #include "chrome/browser/android/vr_shell/vr_math.h"
-#include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/gvr_types.h"
+#include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_types.h"
 
 namespace vr_shell {
 

chrome/browser/android/vr_shell/vr_gl_util.h

@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_GL_UTIL_H_
 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_GL_UTIL_H_
 
-#include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/gvr_types.h"
+#include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_types.h"
 #include "ui/gl/gl_bindings.h"
 
 namespace vr_shell {

chrome/browser/android/vr_shell/vr_math.cc

@@ -7,7 +7,7 @@
 #include <array>
 #include <cmath>
 
-#include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/gvr_types.h"
+#include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_types.h"
 
 namespace vr_shell {
 

chrome/browser/android/vr_shell/vr_math.h

@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/gvr_types.h"
+#include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_types.h"
 
 namespace vr_shell {
 

chrome/browser/android/vr_shell/vr_shell.cc

@@ -142,7 +142,7 @@ void VrShell::InitializeGl(JNIEnv* env,
   std::vector<gvr::BufferSpec> specs;
   specs.push_back(gvr_api_->CreateBufferSpec());
   render_size_ = specs[0].GetSize();
-  swap_chain_.reset(new gvr::SwapChain(gvr_api_->CreateSwapchain(specs)));
+  swap_chain_.reset(new gvr::SwapChain(gvr_api_->CreateSwapChain(specs)));
 
   vr_shell_renderer_.reset(new VrShellRenderer());
   buffer_viewport_list_.reset(
@@ -223,38 +223,14 @@ void VrShell::UpdateController() {
   // TODO(mthiesse): Create input events for CVC using pixel_x/y.
 }
 
-void ApplyNeckModel(gvr::Mat4f& mat_forward) {
-  // This assumes that the input matrix is a pure rotation matrix. The
-  // input object_from_reference matrix has the inverse rotation of
-  // the head rotation. Invert it (this is just a transpose).
-  gvr::Mat4f mat = MatrixTranspose(mat_forward);
-
-  // Position of the point between the eyes, relative to the neck pivot:
-  const float kNeckHorizontalOffset = -0.080f;  // meters in Z
-  const float kNeckVerticalOffset = 0.075f;     // meters in Y
-
-  std::array<float, 4> neckOffset = {
-      {0.0f, kNeckVerticalOffset, kNeckHorizontalOffset, 1.0f}};
-
-  // Rotate eyes around neck pivot point.
-  auto offset = MatrixVectorMul(mat, neckOffset);
-
-  // Measure new position relative to original center of head, because
-  // applying a neck model should not elevate the camera.
-  offset[1] -= kNeckVerticalOffset;
-
-  // Right-multiply the inverse translation onto the
-  // object_from_reference_matrix.
-  TranslateMRight(mat_forward, mat_forward, -offset[0], -offset[1], -offset[2]);
-}
-
 void VrShell::DrawFrame(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   buffer_viewport_list_->SetToRecommendedBufferViewports();
 
   gvr::Frame frame = swap_chain_->AcquireFrame();
   gvr::ClockTimePoint target_time = gvr::GvrApi::GetTimePointNow();
   target_time.monotonic_system_time_nanos += kPredictionTimeWithoutVsyncNanos;
-  head_pose_ = gvr_api_->GetHeadPoseInStartSpace(target_time);
+  head_pose_ = gvr_api_->GetHeadSpaceFromStartSpaceRotation(target_time);
+  head_pose_ = gvr_api_->ApplyNeckModel(head_pose_, 1.0f);
 
   // Bind back to the default framebuffer.
   frame.BindBuffer(0);
@@ -272,16 +248,6 @@ void VrShell::DrawFrame(JNIEnv* env, const JavaParamRef<jobject>& obj) {
 void VrShell::DrawVrShell(int64_t time) {
   float screen_tilt = desktop_screen_tilt_ * M_PI / 180.0f;
 
-  gvr::Vec3f headPos = getTranslation(head_pose_);
-  if (headPos.x == 0.0f && headPos.y == 0.0f && headPos.z == 0.0f) {
-    // This appears to be a 3DOF pose without a neck model. Add one.
-    // The head pose has redundant data. Assume we're only using the
-    // object_from_reference_matrix, we're not updating position_external.
-    // TODO: Not sure what object_from_reference_matrix is. The new api removed
-    // it. For now, removing it seems working fine.
-    ApplyNeckModel(head_pose_);
-  }
-
   forward_vector_ = getForwardVector(head_pose_);
 
   desktop_plane_->translation = desktop_position_;
@@ -422,6 +388,7 @@ void VrShell::DrawWebVr() {
   glDisable(GL_POLYGON_OFFSET_FILL);
 
   // Don't need to clear, since we're drawing over the entire render target.
+  glClear(GL_COLOR_BUFFER_BIT);
 
   glViewport(0, 0, render_size_.width, render_size_.height);
   vr_shell_renderer_->GetWebVrRenderer()->Draw(content_texture_id_);

chrome/browser/android/vr_shell/vr_shell.h

@@ -15,8 +15,8 @@
 #include "chrome/browser/android/vr_shell/ui_elements.h"
 #include "chrome/browser/android/vr_shell/ui_scene.h"
 #include "device/vr/android/gvr/gvr_delegate.h"
-#include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/gvr.h"
-#include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/gvr_types.h"
+#include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr.h"
+#include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_types.h"
 
 namespace content {
 class ContentViewCore;

chrome/browser/android/vr_shell/vr_shell_renderer.h

@@ -11,8 +11,8 @@
 
 #include "base/macros.h"
 #include "chrome/browser/android/vr_shell/vr_math.h"
-#include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/gvr.h"
-#include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/gvr_types.h"
+#include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr.h"
+#include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_types.h"
 #include "ui/gl/gl_bindings.h"
 
 namespace vr_shell {

device/vr/android/gvr/gvr_device.cc

@@ -11,8 +11,8 @@
 #include "base/trace_event/trace_event.h"
 #include "device/vr/android/gvr/gvr_delegate.h"
 #include "device/vr/vr_device_manager.h"
-#include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/gvr.h"
-#include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/gvr_types.h"
+#include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr.h"
+#include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_types.h"
 #include "ui/gfx/transform.h"
 #include "ui/gfx/transform_util.h"
 
@@ -150,7 +150,9 @@ VRPosePtr GvrDevice::GetPose() {
   gvr::ClockTimePoint target_time = gvr::GvrApi::GetTimePointNow();
   target_time.monotonic_system_time_nanos += kPredictionTimeWithoutVsyncNanos;
 
-  gvr::Mat4f head_mat = gvr_api->GetHeadPoseInStartSpace(target_time);
+  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],

device/vr/android/gvr/gvr_device_provider.cc

@@ -15,9 +15,9 @@
 #include "device/vr/android/gvr/gvr_gamepad_data_fetcher.h"
 #include "device/vr/vr_device_manager.h"
 #include "jni/GvrDeviceProvider_jni.h"
-#include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/gvr.h"
-#include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/gvr_controller.h"
-#include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/gvr_types.h"
+#include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr.h"
+#include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_controller.h"
+#include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_types.h"
 
 using base::android::AttachCurrentThread;
 using base::android::GetApplicationContext;
@@ -77,9 +77,6 @@ GvrDeviceProvider::GvrDeviceProvider()
       main_thread_task_runner_(base::ThreadTaskRunnerHandle::Get()) {}
 
 GvrDeviceProvider::~GvrDeviceProvider() {
-  GamepadDataFetcherManager::GetInstance()->RemoveSourceFactory(
-      GAMEPAD_SOURCE_GVR);
-
   ExitPresent();
 }
 
@@ -96,16 +93,9 @@ void GvrDeviceProvider::SetClient(VRClientDispatcher* client) {
 }
 
 void GvrDeviceProvider::Initialize() {
-  if (!non_presenting_delegate_) {
-    non_presenting_delegate_.reset(new GvrNonPresentingDelegate());
-    if (non_presenting_delegate_->gvr_api()) {
-      vr_device_.reset(new GvrDevice(this, non_presenting_delegate_.get()));
-      client_->OnDeviceConnectionStatusChanged(vr_device_.get(), true);
-
-      GamepadDataFetcherManager::GetInstance()->AddFactory(
-          new GvrGamepadDataFetcher::Factory(non_presenting_delegate_.get(),
-                                             vr_device_->id()));
-    }
+  if (!vr_device_) {
+    vr_device_.reset(new GvrDevice(this, nullptr));
+    client_->OnDeviceConnectionStatusChanged(vr_device_.get(), true);
   }
 }
 
@@ -123,7 +113,10 @@ void GvrDeviceProvider::ExitPresent() {
   if (!vr_device_)
     return;
 
-  vr_device_->SetDelegate(non_presenting_delegate_.get());
+  vr_device_->SetDelegate(nullptr);
+
+  GamepadDataFetcherManager::GetInstance()->RemoveSourceFactory(
+      GAMEPAD_SOURCE_GVR);
 
   GvrDelegateProvider* delegate_provider = GvrDelegateProvider::GetInstance();
   if (delegate_provider)
@@ -153,6 +146,8 @@ void GvrDeviceProvider::GvrDelegateReady(GvrDelegate* delegate) {
   DCHECK(main_thread_task_runner_->BelongsToCurrentThread());
 
   vr_device_->SetDelegate(delegate);
+  GamepadDataFetcherManager::GetInstance()->AddFactory(
+      new GvrGamepadDataFetcher::Factory(delegate, vr_device_->id()));
 }
 
 }  // namespace device

device/vr/android/gvr/gvr_device_provider.h

@@ -44,7 +44,6 @@ class DEVICE_VR_EXPORT GvrDeviceProvider : public VRDeviceProvider {
 
   std::unique_ptr<VRClientDispatcher> client_;
   std::unique_ptr<GvrDevice> vr_device_;
-  std::unique_ptr<GvrNonPresentingDelegate> non_presenting_delegate_;
 
   scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
 

device/vr/android/gvr/gvr_gamepad_data_fetcher.cc

@@ -54,6 +54,8 @@ GvrGamepadDataFetcher::GvrGamepadDataFetcher(GvrDelegate* delegate,
   bool success = controller_api_->Init(options, gvr_api->GetContext());
   if (!success)
     controller_api_.reset(nullptr);
+
+  user_prefs_.reset(new gvr::UserPrefs(gvr_api->GetUserPrefs().cobj()));
 }
 
 GvrGamepadDataFetcher::~GvrGamepadDataFetcher() {}
@@ -94,7 +96,9 @@ void GvrGamepadDataFetcher::GetGamepadData(bool devices_changed_hint) {
   pad.timestamp = controller_state_.GetLastOrientationTimestamp();
 
   // TODO: Query from API if avaialable.
-  pad.hand = GamepadHandRight;
+  gvr::ControllerHandedness handedness = user_prefs_->GetControllerHandedness();
+  pad.hand = (handedness == GVR_CONTROLLER_RIGHT_HANDED) ? GamepadHandRight
+                                                         : GamepadHandLeft;
 
   if (controller_state_.IsTouching()) {
     gvr_vec2f touch_position = controller_state_.GetTouchPos();

device/vr/android/gvr/gvr_gamepad_data_fetcher.h

@@ -8,8 +8,8 @@
 #include <string>
 
 #include "device/gamepad/gamepad_data_fetcher.h"
-#include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/gvr_controller.h"
-#include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/gvr_types.h"
+#include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_controller.h"
+#include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_types.h"
 
 namespace device {
 
@@ -40,6 +40,7 @@ class GvrGamepadDataFetcher : public GamepadDataFetcher {
 
  private:
   std::unique_ptr<gvr::ControllerApi> controller_api_;
+  std::unique_ptr<gvr::UserPrefs> user_prefs_;
   gvr::ControllerState controller_state_;
   unsigned int display_id_;
 

third_party/gvr-android-sdk/BUILD.gn

@@ -10,13 +10,12 @@ if (gvr_arch == "x64") {
 }
 
 android_aar_prebuilt("gvr_common_java") {
-  aar_path = "src/ndk-beta/lib/common_library.aar"
-  jar_excluded_patterns = [ "*/protobuf/*" ]
+  aar_path = "src/ndk/lib/common_library.aar"
 }
 
 android_aar_prebuilt("gvr_base_java") {
   aar_path = "src/libraries/base/base.aar"
-  proguard_configs = [ "proguard/base.flags" ]
+  proguard_configs = [ "src/proguard-gvr.txt" ]
   ignore_manifest = true  # Ignored because manifest merging is not supported (http://crbug.com/643967)
   ignore_native_libraries = true
 }
@@ -37,7 +36,7 @@ source_set("libgvr") {
 if (gvr_arch != "mipsel") {
   copy("libgvr_copy") {
     sources = [
-      "src/ndk-beta/lib/android_${gvr_arch}/libgvr.so",
+      "src/ndk/lib/android_${gvr_arch}/libgvr.so",
     ]
     outputs = [
       "${root_out_dir}/libgvr.so",
@@ -46,5 +45,5 @@ if (gvr_arch != "mipsel") {
 }
 
 config("libgvr_config") {
-  include_dirs = [ "src/ndk-beta/include/" ]
+  include_dirs = [ "src/ndk/include/" ]
 }

third_party/gvr-android-sdk/README.chromium

 Name: Google VR SDK
 Short Name: gvr
 URL: https://github.com/googlevr/gvr-android-sdk
-Version: 0.9.0
-Date: 3 Aug 2016
-Revision: cff15311c7c1abbe77b3c714135dccc2009ee473
+Version: 1.0.0
+Date: 23 Sep 2016
+Revision: 25e7e14413229d4644a66be77e8f8ddeb3f91fe7
 License: Apache 2.0
 License File: LICENSE
 Security Critical: yes

third_party/gvr-android-sdk/proguard/base.flags

-# Proguard rules for commonly-shared libraries in gvr.
-
--keepattributes *Annotation*
-
-# Keep natively accessed methods used by GVR.
--keep class com.google.vr.cardboard.UsedByNative
--keep @com.google.vr.cardboard.UsedByNative class *
--keepclassmembers class * {
-    @com.google.vr.cardboard.UsedByNative *;
-}