loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate GL demo from deprecated ExoPlayer.VideoComponent to ExoPlayer

Browse Source 
#minor-release

PiperOrigin-RevId: 408304187
This commit is contained in:
ibaker 2021-11-08 12:08:04 +00:00 committed by Ian Baker
parent 54af82a23f
commit fc7b66706f
2 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
demos/gl/src/main/java/androidx/media3/demo/gl/MainActivity.java
View File

@ -179,8 +179,7 @@ public final class MainActivity extends Activity {
player.play();
VideoProcessingGLSurfaceView videoProcessingGLSurfaceView =
Assertions.checkNotNull(this.videoProcessingGLSurfaceView);
videoProcessingGLSurfaceView.setVideoComponent(
Assertions.checkNotNull(player.getVideoComponent()));
videoProcessingGLSurfaceView.setPlayer(player);
Assertions.checkNotNull(playerView).setPlayer(player);
player.addAnalyticsListener(new EventLogger(/* trackSelector= */ null));
this.player = player;
@ -188,9 +187,9 @@ public final class MainActivity extends Activity {
private void releasePlayer() {
Assertions.checkNotNull(playerView).setPlayer(null);
Assertions.checkNotNull(videoProcessingGLSurfaceView).setPlayer(null);
if (player != null) {
player.release();
Assertions.checkNotNull(videoProcessingGLSurfaceView).setVideoComponent(null);
player = null;
}
}

33
demos/gl/src/main/java/androidx/media3/demo/gl/VideoProcessingGLSurfaceView.java
View File

@ -73,7 +73,7 @@ public final class VideoProcessingGLSurfaceView extends GLSurfaceView {
@Nullable private SurfaceTexture surfaceTexture;
@Nullable private Surface surface;
@Nullable private ExoPlayer.VideoComponent videoComponent;
@Nullable private ExoPlayer player;
/**
* Creates a new instance. Pass {@code true} for {@code requireSecureContext} if the {@link
@ -147,25 +147,24 @@ public final class VideoProcessingGLSurfaceView extends GLSurfaceView {
}
/**
* Attaches or detaches (if {@code newVideoComponent} is {@code null}) this view from the video
* component of the player.
* Attaches or detaches (if {@code player} is {@code null}) this view from the player.
*
* @param newVideoComponent The new video component, or {@code null} to detach this view.
* @param player The new player, or {@code null} to detach this view.
*/
public void setVideoComponent(@Nullable ExoPlayer.VideoComponent newVideoComponent) {
if (newVideoComponent == videoComponent) {
public void setPlayer(@Nullable ExoPlayer player) {
if (player == this.player) {
return;
}
if (videoComponent != null) {
if (this.player != null) {
if (surface != null) {
videoComponent.clearVideoSurface(surface);
this.player.clearVideoSurface(surface);
}
videoComponent.clearVideoFrameMetadataListener(renderer);
this.player.clearVideoFrameMetadataListener(renderer);
}
videoComponent = newVideoComponent;
if (videoComponent != null) {
videoComponent.setVideoFrameMetadataListener(renderer);
videoComponent.setVideoSurface(surface);
this.player = player;
if (this.player != null) {
this.player.setVideoFrameMetadataListener(renderer);
this.player.setVideoSurface(surface);
}
}
@ -176,8 +175,8 @@ public final class VideoProcessingGLSurfaceView extends GLSurfaceView {
mainHandler.post(
() -> {
if (surface != null) {
if (videoComponent != null) {
videoComponent.setVideoSurface(null);
if (player != null) {
player.setVideoSurface(null);
}
releaseSurface(surfaceTexture, surface);
surfaceTexture = null;
@ -194,8 +193,8 @@ public final class VideoProcessingGLSurfaceView extends GLSurfaceView {
this.surfaceTexture = surfaceTexture;
this.surface = new Surface(surfaceTexture);
releaseSurface(oldSurfaceTexture, oldSurface);
if (videoComponent != null) {
videoComponent.setVideoSurface(surface);
if (player != null) {
player.setVideoSurface(surface);
}
});
}