Revert "fix(android): video flickering add playback start (#3746)" (#3748)

This reverts commit b1cd52bc58.

s
This commit is contained in:
Zakir Bangash 2024-05-10 17:23:30 +05:00 committed by GitHub
parent aef7879dc1
commit d25629bb62
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1,12 +1,13 @@
package com.brentvatne.exoplayer;
import android.content.Context;
import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat;
import androidx.media3.common.AdViewProvider;
import androidx.media3.common.C;
import androidx.media3.common.PlaybackException;
import androidx.media3.common.PlaybackParameters;
import androidx.media3.common.Player;
import androidx.media3.common.Timeline;
import androidx.media3.common.Tracks;
import androidx.media3.common.VideoSize;
import androidx.media3.common.text.Cue;
@ -37,8 +38,8 @@ public final class ExoPlayerView extends FrameLayout implements AdViewProvider {
private final AspectRatioFrameLayout layout;
private final ComponentListener componentListener;
private ExoPlayer player;
final private Context context;
final private ViewGroup.LayoutParams layoutParams;
private Context context;
private ViewGroup.LayoutParams layoutParams;
private final FrameLayout adOverlayFrameLayout;
private boolean useTextureView = true;
@ -112,7 +113,7 @@ public final class ExoPlayerView extends FrameLayout implements AdViewProvider {
}
public void setSubtitleStyle(SubtitleStyle style) {
// ensure we reset subtitle style before reapplying it
// ensure we reset subtile style before reapplying it
subtitleLayout.setUserDefaultStyle();
subtitleLayout.setUserDefaultTextSize();
@ -210,6 +211,16 @@ public final class ExoPlayerView extends FrameLayout implements AdViewProvider {
}
}
/**
* Get the view onto which video is rendered. This is either a {@link SurfaceView} (default)
* or a {@link TextureView} if the {@code use_texture_view} view attribute has been set to true.
*
* @return either a {@link SurfaceView} or a {@link TextureView}.
*/
public View getVideoSurfaceView() {
return surfaceView;
}
public void setUseTextureView(boolean useTextureView) {
if (useTextureView != this.useTextureView) {
this.useTextureView = useTextureView;
@ -252,24 +263,15 @@ public final class ExoPlayerView extends FrameLayout implements AdViewProvider {
shutterView.setVisibility(this.hideShutterView ? View.INVISIBLE : View.VISIBLE);
}
Runnable hideShutterViewRunnable = new Runnable() {
@Override
public void run() {
shutterView.setVisibility(INVISIBLE);
}
};
public void invalidateAspectRatio() {
// Resetting aspect ratio will force layout refresh on next video size changed
layout.invalidateAspectRatio();
removeCallbacks(hideShutterViewRunnable);
}
private final class ComponentListener implements Player.Listener {
@Override
public void onCues(@NonNull List<Cue> cues) {
public void onCues(List<Cue> cues) {
subtitleLayout.setCues(cues);
}
@ -286,16 +288,11 @@ public final class ExoPlayerView extends FrameLayout implements AdViewProvider {
@Override
public void onRenderedFirstFrame() {
// The shutter view is use to hide dirty resizing issue when starting playback.
// In case video doesn't match your View aspect ratio, at playback startup you may have flickering during resize.
// we saw that onRenderedFirstFrame is called before first resizing
// Then hiding the shutterView directly may not hide the flickering.
// This small delay avoid the flickering
postDelayed(hideShutterViewRunnable, 15);
shutterView.setVisibility(INVISIBLE);
}
@Override
public void onTracksChanged(@NonNull Tracks tracks) {
public void onTracksChanged(Tracks tracks) {
updateForCurrentTrackSelections();
}
}