Encode frame number in pixel data for pose sync

chrome/browser/android/vr_shell/vr_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_CONTROLLER_H_
 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_CONTROLLER_H_
 
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/android/vr_shell/vr_gesture.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"

[bajones, 2016/10/04 06:33:57]

I think you've gotten some changes in here that you didn't intend. Make sure
your branch has the right upstream.

[klausw, 2016/10/04 06:47:04]

This is intentional though messy. Top-of-tree is still on GVR 0.9.1 which isn't
very useful for testing, so I've based it on your earlier GVR 1.0.0 branch.
However, some files that were edited since then needed modification to work with
the new GVR API.

I can hide this part of the diff by rebasing it below the "git cl upload" base,
but we'll need these changes at some point.

[klausw, 2016/10/04 17:52:46]

Rebased, this should no longer be visible.

+#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 vr_shell {
 
 class VrController {
  public:
   // Controller API entry point.
   explicit VrController(gvr_context* gvr_context);
   ~VrController();
 
   // Must be called when the Activity gets OnResume().
@@ skipping 14 matching lines @@
   float TouchPosX();
 
   float TouchPosY();
 
   const gvr::Quatf Orientation();
 
   bool IsTouchDown();
 
   bool IsTouchUp();
 
-  bool IsButtonUp(const int32_t button);
-  bool IsButtonDown(const int32_t button);
+  bool IsButtonUp(const gvr::ControllerButton button);
+  bool IsButtonDown(const gvr::ControllerButton button);
 
   bool IsConnected();
 
  private:
   enum GestureDetectorState {
     WAITING,   // waiting for user to touch down
     TOUCHING,  // touching the touch pad but not scrolling
     SCROLLING  // scrolling on the touch pad
   };
 
@@ skipping 69 matching lines @@
 
   // Overall velocity
   gvr::Vec2f overall_velocity_;
 
   DISALLOW_COPY_AND_ASSIGN(VrController);
 };
 
 }  // namespace vr_shell
 
 #endif  // CHROME_BROWSER_ANDROID_VR_SHELL_VR_CONTROLLER_H_