1. Upgrade to CloudXR SDK v3.1.1, WaveSDK 4.3.0.

2. Remove "RecreateFramebuffer" function call to avoid potential crash.
3. Use 64bits ABI since CloudXR SDK 3.1.1 provides only 64 bits lib.

Author: howardhuanghtc

README.md

@@ -1,14 +1,14 @@
 
 # Wave CloudXR Sample Client
 
-Demonstrate how to program with NVIDIA CloudXR SDK 3.0 for VIVE Focus 3 headset. You can start to develop your own CloudXR application for VIVE Focus 3 based on this sample client. 
+Demonstrate how to program with NVIDIA CloudXR SDK 3.1.1 for VIVE Focus 3 headset. You can start to develop your own CloudXR application for VIVE Focus 3 based on this sample client. 
 
 Below are the instructions to build from source. Alternatively you can find a pre-built APK in the [Releases](https://github.com/ViveSoftware/Wave-CloudXR-Sample/releases) section.
 
 ## Requirements
 - HTC VIVE Focus 3
-- [Wave Native SDK 4.1.1](https://developer.vive.com/resources/vive-wave/download/latest/) or later
-- [CloudXR SDK 3.0](https://developer.nvidia.com/nvidia-cloudxr-sdk)
+- [Wave Native SDK 4.3.0](https://developer.vive.com/resources/vive-wave/download/latest/) or later
+- [CloudXR SDK 3.1.1](https://developer.nvidia.com/nvidia-cloudxr-sdk)
 - [Google OBOE SDK 1.5.0](https://github.com/google/oboe/releases/tag/1.5.0)
 - Android development environment
   - Android Studio 4.0 or later
@@ -18,13 +18,13 @@ Below are the instructions to build from source. Alternatively you can find a pr
   - OpenJDK 1.8n
 
 ## Build Instructions
-1. Download [CloudXR SDK 3.0](https://developer.nvidia.com/nvidia-cloudxr-sdk) and [Google OBOE SDK 1.5.0](https://github.com/google/oboe/releases/tag/1.5.0).
+1. Download [CloudXR SDK 3.1.1](https://developer.nvidia.com/nvidia-cloudxr-sdk) and [Google OBOE SDK 1.5.0](https://github.com/google/oboe/releases/tag/1.5.0).
 2. Put ***CloudXR.aar*** and ***oboe-1.5.0.aar*** in ***[ProjectRoot]/app/libs***
 3. Download Wave SDK and put in ***[ProjectRoot]/repo*** (paths can be modified in ***build_sdk.gradle***)
 4. You are ready to build.
 
 ## Installation & Usage
-1. Install CloudXR server 3.0 on your PC.
+1. Install CloudXR server 3.1.1 on your PC.
 2. Build Wave CloudXR Sample Client and install the apk to your VIVE Focus 3
 3. Modify the IP address in ***CloudXRLaunchOptions.txt*** and push it into ***/sdcard*** of your VIVE Focus 3. 
    - Please read [CloudXR Command-Line Options](https://docs.nvidia.com/cloudxr-sdk/usr_guide/cmd_line_options.html#command-line-options) for the format of ***CloudXRLaunchOptions.txt***)

app/build.gradle

@@ -7,8 +7,8 @@ android {
     ndkVersion '21.4.7075529'
     defaultConfig {
         applicationId "com.htc.vr.samples.wavecloudxr"
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.1"
     }
 
     signingConfigs {

app/build_sdk.gradle

@@ -34,7 +34,7 @@ android {
             arguments "CLOUDXR_SDK_ROOT=$CLOUDXR_SDK_ROOT"
         }}
         ndk {
-            abiFilters 'armeabi-v7a'
+            abiFilters 'arm64-v8a'
         }
     }
 

app/src/main/jni/WaveCloudXRApp.cpp

@@ -102,7 +102,7 @@ bool WaveCloudXRApp::initVR() {
 
     // Init Wave Render
     WVR_RenderInitParams_t param;
-    param = { WVR_GraphicsApiType_OpenGL, WVR_RenderConfig_Default };
+    param = { WVR_GraphicsApiType_OpenGL, WVR_RenderConfig_sRGB };
 
     WVR_RenderError pError = WVR_RenderInit(&param);
     if (pError != WVR_RenderError_None) {
@@ -129,13 +129,13 @@ bool WaveCloudXRApp::initGL() {
 
     mLeftEyeQ = WVR_ObtainTextureQueue(WVR_TextureTarget_2D, WVR_TextureFormat_RGBA, WVR_TextureType_UnsignedByte, mRenderWidth, mRenderHeight, 0);
     for (int i = 0; i < WVR_GetTextureQueueLength(mLeftEyeQ); i++) {
-        GLuint fbo = CreateGLFramebuffer((GLuint)WVR_GetTexture(mLeftEyeQ, i).id);
+        GLuint fbo = CreateGLFramebuffer((GLuint)(size_t)WVR_GetTexture(mLeftEyeQ, i).id);
         mLeftEyeFBO.push_back(fbo);
     }
 
     mRightEyeQ = WVR_ObtainTextureQueue(WVR_TextureTarget_2D, WVR_TextureFormat_RGBA, WVR_TextureType_UnsignedByte, mRenderWidth, mRenderHeight, 0);
     for (int i = 0; i < WVR_GetTextureQueueLength(mRightEyeQ); i++) {
-        GLuint fbo = CreateGLFramebuffer((GLuint)WVR_GetTexture(mRightEyeQ, i).id);
+        GLuint fbo = CreateGLFramebuffer((GLuint)(size_t)WVR_GetTexture(mRightEyeQ, i).id);
         mRightEyeFBO.push_back(fbo);
 	}
 
@@ -251,13 +251,13 @@ void WaveCloudXRApp::RecreateFramebuffer(const uint32_t width, const uint32_t he
 
     mLeftEyeQ = WVR_ObtainTextureQueue(WVR_TextureTarget_2D, WVR_TextureFormat_RGBA, WVR_TextureType_UnsignedByte, width, height, 0);
     for (int i = 0; i < WVR_GetTextureQueueLength(mLeftEyeQ); i++) {
-        GLuint fbo = CreateGLFramebuffer((GLuint)WVR_GetTexture(mLeftEyeQ, i).id);
+        GLuint fbo = CreateGLFramebuffer((GLuint)(size_t)WVR_GetTexture(mLeftEyeQ, i).id);
         mLeftEyeFBO.push_back(fbo);
     }
 
     mRightEyeQ = WVR_ObtainTextureQueue(WVR_TextureTarget_2D, WVR_TextureFormat_RGBA, WVR_TextureType_UnsignedByte, width, height, 0);
     for (int i = 0; i < WVR_GetTextureQueueLength(mRightEyeQ); i++) {
-        GLuint fbo = CreateGLFramebuffer((GLuint)WVR_GetTexture(mRightEyeQ, i).id);
+        GLuint fbo = CreateGLFramebuffer((GLuint)(size_t)WVR_GetTexture(mRightEyeQ, i).id);
         mRightEyeFBO.push_back(fbo);
     }
 
@@ -790,12 +790,20 @@ bool WaveCloudXRApp::UpdateFrame() {
                     LOGE("Error in LatchFrame [%0d] = %s", frameErr, cxrErrorString(frameErr));
             } else {
 
+                // If network condition is bad, e.g. bitrate usage down below ~5Mbps
+                // Frames received will vary frequently in size (~5 times in 1 second)
+                // and crash here due to no read/write protection
+
+                // You can add mutex to protect buffer recreation process and potentially increase latency
+                // or comment this function call to avoid crash caused by frequent size change
+                // Not recreating buffer to match incoming frame size might result in blurry display.
+                
                 if ( mFramesLatched.frames[0].widthFinal != mRenderWidth ||
                      mFramesLatched.frames[0].heightFinal != mRenderHeight ) {
                     LOGE("Receive frame %dx%d, buffer size %dx%d",
                          mFramesLatched.frames[0].widthFinal, mFramesLatched.frames[0].heightFinal,
                          mRenderWidth, mRenderHeight);
-                    RecreateFramebuffer(mFramesLatched.frames[0].widthFinal, mFramesLatched.frames[0].heightFinal);
+                    //RecreateFramebuffer(mFramesLatched.frames[0].widthFinal, mFramesLatched.frames[0].heightFinal);
                 }
             }
         }
@@ -1184,16 +1192,16 @@ void WaveCloudXRApp::HandleClientState(cxrClientState state, cxrStateReason reas
             mConnected = true;
             break;
         case cxrClientState_ConnectionAttemptFailed:
-            LOGE("Connection attempt failed. [%s]", cxrStateReasonString(reason));
+            LOGE("Connection attempt failed. Reason: [%d]", reason);
             state = cxrClientState_Disconnected;
             mConnected = false;
             break;
         case cxrClientState_Disconnected:
-            LOGE("Server disconnected with reason: [%s]", cxrStateReasonString(reason));
+            LOGE("Server disconnected with reason: [%d]", reason);
             mConnected = false;
             break;
         default:
-            LOGW("Client state updated: %s, reason: %s", cxrClientStateString(state), cxrStateReasonString(reason));
+            LOGW("Client state updated: %d to %d, reason: %d", mClientState, state, reason);
             break;
     }