Commit 5cd3a9ba by olly Committed by Oliver Woodman

Fix passing of invalid surface to video renderers

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=158684924
parent cb5b6fba
......@@ -221,8 +221,9 @@ public class SimpleExoPlayer implements ExoPlayer {
if (surfaceHolder == null) {
setVideoSurfaceInternal(null, false);
} else {
setVideoSurfaceInternal(surfaceHolder.getSurface(), false);
surfaceHolder.addCallback(componentListener);
Surface surface = surfaceHolder.getSurface();
setVideoSurfaceInternal(surface != null && surface.isValid() ? surface : null, false);
}
}
......@@ -273,9 +274,9 @@ public class SimpleExoPlayer implements ExoPlayer {
if (textureView.getSurfaceTextureListener() != null) {
Log.w(TAG, "Replacing existing SurfaceTextureListener.");
}
textureView.setSurfaceTextureListener(componentListener);
SurfaceTexture surfaceTexture = textureView.getSurfaceTexture();
setVideoSurfaceInternal(surfaceTexture == null ? null : new Surface(surfaceTexture), true);
textureView.setSurfaceTextureListener(componentListener);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment