bugfix2

bytedance · Dec 21, 2021 · 54770ec · 54770ec
1 parent 56bf649
commit 54770ec
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 47 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/alpha_player/src/main/java/com/ss/ugc/android/alpha_player/widget/GLTextureView.java b/alpha_player/src/main/java/com/ss/ugc/android/alpha_player/widget/GLTextureView.java
@@ -961,61 +961,65 @@ public void start() {
          * @return true if the surface was created successfully.
          */
         public boolean createSurface() {
-            if (LOG_EGL) {
-                Log.w("EglHelper", "createSurface()  tid=" + Thread.currentThread().getId());
-            }
-            /*
-             * Check preconditions.
-             */
-            if (mEgl == null) {
-                throw new RuntimeException("egl not initialized");
-            }
-            if (mEglDisplay == null) {
-                throw new RuntimeException("eglDisplay not initialized");
-            }
-            if (mEglConfig == null) {
-                throw new RuntimeException("mEglConfig not initialized");
-            }
+            try {
+                if (LOG_EGL) {
+                    Log.w("EglHelper", "createSurface()  tid=" + Thread.currentThread().getId());
+                }
+                /*
+                 * Check preconditions.
+                 */
+                if (mEgl == null) {
+                    throw new RuntimeException("egl not initialized");
+                }
+                if (mEglDisplay == null) {
+                    throw new RuntimeException("eglDisplay not initialized");
+                }
+                if (mEglConfig == null) {
+                    throw new RuntimeException("mEglConfig not initialized");
+                }
 
-            /*
-             *  The window size has changed, so we need to create a new
-             *  surface.
-             */
-            destroySurfaceImp();
+                /*
+                 *  The window size has changed, so we need to create a new
+                 *  surface.
+                 */
+                destroySurfaceImp();
 
-            /*
-             * Create an EGL surface we can render into.
-             */
-            GLTextureView view = mGLSurfaceViewWeakRef.get();
-            if (view != null) {
-                mEglSurface = view.mEGLWindowSurfaceFactory.createWindowSurface(mEgl,
-                        mEglDisplay, mEglConfig, view.getSurfaceTexture());
-            } else {
-                mEglSurface = null;
-            }
+                /*
+                 * Create an EGL surface we can render into.
+                 */
+                GLTextureView view = mGLSurfaceViewWeakRef.get();
+                if (view != null) {
+                    mEglSurface = view.mEGLWindowSurfaceFactory.createWindowSurface(mEgl,
+                            mEglDisplay, mEglConfig, view.getSurfaceTexture());
+                } else {
+                    mEglSurface = null;
+                }
 
-            if (mEglSurface == null || mEglSurface == EGL10.EGL_NO_SURFACE) {
-                int error = mEgl.eglGetError();
-                if (error == EGL10.EGL_BAD_NATIVE_WINDOW) {
-                    Log.e("EglHelper", "createWindowSurface returned EGL_BAD_NATIVE_WINDOW.");
+                if (mEglSurface == null || mEglSurface == EGL10.EGL_NO_SURFACE) {
+                    int error = mEgl.eglGetError();
+                    if (error == EGL10.EGL_BAD_NATIVE_WINDOW) {
+                        Log.e("EglHelper", "createWindowSurface returned EGL_BAD_NATIVE_WINDOW.");
+                    }
+                    return false;
                 }
-                return false;
-            }
 
-            /*
-             * Before we can issue GL commands, we need to make sure
-             * the context is current and bound to a surface.
-             */
-            if (!mEgl.eglMakeCurrent(mEglDisplay, mEglSurface, mEglSurface, mEglContext)) {
                 /*
-                 * Could not make the context current, probably because the underlying
-                 * SurfaceView surface has been destroyed.
+                 * Before we can issue GL commands, we need to make sure
+                 * the context is current and bound to a surface.
                  */
-                logEglErrorAsWarning("EGLHelper", "eglMakeCurrent", mEgl.eglGetError());
+                if (!mEgl.eglMakeCurrent(mEglDisplay, mEglSurface, mEglSurface, mEglContext)) {
+                    /*
+                     * Could not make the context current, probably because the underlying
+                     * SurfaceView surface has been destroyed.
+                     */
+                    logEglErrorAsWarning("EGLHelper", "eglMakeCurrent", mEgl.eglGetError());
+                    return false;
+                }
+
+                return true;
+            } catch (Exception e) {
                 return false;
             }
-
-            return true;
         }
 
         /**