sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix passing of invalid surface to video renderers

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=158684924
This commit is contained in:
olly 2017-06-12 01:11:17 -07:00 committed by Oliver Woodman
parent cb5b6fba01
commit 5cd3a9baa0
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
View file

@ -221,8 +221,9 @@ public class SimpleExoPlayer implements ExoPlayer {
if (surfaceHolder == null) { if (surfaceHolder == null) {
setVideoSurfaceInternal(null, false); setVideoSurfaceInternal(null, false);
} else { } else {
setVideoSurfaceInternal(surfaceHolder.getSurface(), false);
surfaceHolder.addCallback(componentListener); 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) { if (textureView.getSurfaceTextureListener() != null) {
Log.w(TAG, "Replacing existing SurfaceTextureListener."); Log.w(TAG, "Replacing existing SurfaceTextureListener.");
} }
textureView.setSurfaceTextureListener(componentListener);
SurfaceTexture surfaceTexture = textureView.getSurfaceTexture(); SurfaceTexture surfaceTexture = textureView.getSurfaceTexture();
setVideoSurfaceInternal(surfaceTexture == null ? null : new Surface(surfaceTexture), true); setVideoSurfaceInternal(surfaceTexture == null ? null : new Surface(surfaceTexture), true);
textureView.setSurfaceTextureListener(componentListener);
} }
} }