Release external VR surfaces when leaving VR.

Author: daoshengmu

app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java

@@ -889,14 +889,16 @@ public void confirm(int button) {
     }
 
     public void setExternalVRSurface(int aIndex, Surface aSurface) {
-       // Calling GeckoVRManager ...
         if (aSurface == null) {
             Log.e(LOGTAG, "aSurface is null in setExternalVRSurface...");
         }
-        Log.i(LOGTAG, "setExternalVRSurface...");
         GeckoVRManager.insertExternalSurface(aIndex, aSurface);
     }
 
+    public void releaseExternalVRSurfaces() {
+        GeckoVRManager.releaseExternalSurfaces();
+    }
+
     void createOffscreenDisplay() {
         int[] ids = new int[1];
         GLES20.glGenTextures(1, ids, 0);

app/src/main/cpp/VRBrowser.cpp

@@ -51,7 +51,9 @@ const char* kHaltActivitySignature = "(I)V";
 const char* kHandlePoorPerformance = "handlePoorPerformance";
 const char* kHandlePoorPerformanceSignature = "()V";
 const char* kSetExternalVRSurface = "setExternalVRSurface";
-const char* kSetExternalVRSurfaceSignature = "(ILandroid/view/Surface;)V";//"(ILandroid/view/Surface;)Z";
+const char* kSetExternalVRSurfaceSignature = "(ILandroid/view/Surface;)V";
+const char* kReleaseExternalSurfaces = "releaseExternalVRSurfaces";
+const char* kReleaseExternalSurfacesSignature = "()V";
 
 JNIEnv* sEnv = nullptr;
 jclass sBrowserClass = nullptr;
@@ -76,7 +78,8 @@ jmethodID sAreLayersEnabled = nullptr;
 jmethodID sSetDeviceType = nullptr;
 jmethodID sHaltActivity = nullptr;
 jmethodID sHandlePoorPerformance = nullptr;
-jmethodID sSetExternalVRSurface;
+jmethodID sSetExternalVRSurface = nullptr;
+jmethodID sReleaseExternalSurfaces = nullptr;
 }
 
 namespace crow {
@@ -117,6 +120,7 @@ VRBrowser::InitializeJava(JNIEnv* aEnv, jobject aActivity) {
   sHaltActivity = FindJNIMethodID(sEnv, sBrowserClass, kHaltActivity, kHaltActivitySignature);
   sHandlePoorPerformance = FindJNIMethodID(sEnv, sBrowserClass, kHandlePoorPerformance, kHandlePoorPerformanceSignature);
   sSetExternalVRSurface = FindJNIMethodID(sEnv, sBrowserClass, kSetExternalVRSurface, kSetExternalVRSurfaceSignature);
+  sReleaseExternalSurfaces = FindJNIMethodID(sEnv, sBrowserClass, kReleaseExternalSurfaces, kReleaseExternalSurfacesSignature);
 }
 
 void
@@ -338,4 +342,11 @@ VRBrowser::SetExternalVRSurface(jint aIndex, jobject aSurface) {
   sEnv->CallVoidMethod(sActivity, sSetExternalVRSurface, aIndex, aSurface);
   CheckJNIException(sEnv, __FUNCTION__);
 }
+
+void
+VRBrowser::ReleaseExternalVRSurfaces() {
+  if (!ValidateMethodID(sEnv, sActivity, sReleaseExternalSurfaces, __FUNCTION__)) { return; }
+  sEnv->CallVoidMethod(sActivity, sReleaseExternalSurfaces);
+  CheckJNIException(sEnv, __FUNCTION__);
+}
 } // namespace crow

app/src/main/cpp/VRBrowser.h

@@ -39,6 +39,7 @@ void SetDeviceType(const jint aType);
 void HaltActivity(const jint aReason);
 void HandlePoorPerformance();
 void SetExternalVRSurface(jint aIndex, jobject aSurface);
+void ReleaseExternalVRSurfaces();
 } // namespace VRBrowser;
 
 } // namespace crow

app/src/oculusvr/cpp/DeviceDelegateOculusVR.cpp

@@ -1698,6 +1698,7 @@ DeviceDelegateOculusVR::LeaveVR() {
     if (m.eyeSurfaceSwapChain[i]) {
       vrapi_DestroyTextureSwapChain(m.eyeSurfaceSwapChain[i]);
       m.eyeSurfaceSwapChain[i] = nullptr;
+      VRBrowser::ReleaseExternalVRSurfaces();
     }
   }
   if (m.cubeLayer) {