Skip to content

SDK / exoplayer

Go to a project
Commit aec098a2 by huangdarwin Committed by Tofunmi Adigun-Hameed
Options

Rollback of https://github.com/google/ExoPlayer/commit/703923d196934fdcc019ffd610b6f778f8fa043d 

*** Original commit ***

ExoPlayer: Add setVideoFrameProcessorFactory().

This allows apps to use a custom VideoFrameProcessor implementation for video
playback. This may be useful, for example, when outputting to a texture.
***

PiperOrigin-RevId: 536391597
(cherry picked from commit dbbb0919075a9c95f45d51307b434eda4c4744bd)
parent a984e295
Inline Side-by-side
Showing with 63 additions and 123 deletions
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
...@@ -61,7 +61,6 @@ import com.google.android.exoplayer2.util.Clock; ...@@ -61,7 +61,6 @@ import com.google.android.exoplayer2.util.Clock;
import com.google.android.exoplayer2.util.Effect; import com.google.android.exoplayer2.util.Effect;
import com.google.android.exoplayer2.util.PriorityTaskManager; import com.google.android.exoplayer2.util.PriorityTaskManager;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import com.google.android.exoplayer2.util.VideoFrameProcessor;
import com.google.android.exoplayer2.video.MediaCodecVideoRenderer; import com.google.android.exoplayer2.video.MediaCodecVideoRenderer;
import com.google.android.exoplayer2.video.VideoFrameMetadataListener; import com.google.android.exoplayer2.video.VideoFrameMetadataListener;
import com.google.android.exoplayer2.video.VideoSize; import com.google.android.exoplayer2.video.VideoSize;
...@@ -1489,18 +1488,6 @@ public interface ExoPlayer extends Player { ...@@ -1489,18 +1488,6 @@ public interface ExoPlayer extends Player {
void setVideoEffects(List<Effect> videoEffects); void setVideoEffects(List<Effect> videoEffects);
/** /**
* Sets a {@link VideoFrameProcessor.Factory} to create the {@link VideoFrameProcessor} that
* applies video effects set in {@link #setVideoEffects}.
*
* <p>See {@link #setVideoEffects} for limitations.
*
* @param videoFrameProcessorFactory The {@link VideoFrameProcessor.Factory} to use to apply the
* video effects.
*/
@RequiresApi(18)
void setVideoFrameProcessorFactory(VideoFrameProcessor.Factory videoFrameProcessorFactory);
/**
* Sets the {@link C.VideoScalingMode}. * Sets the {@link C.VideoScalingMode}.
* *
* <p>The scaling mode only applies if a {@link MediaCodec}-based video {@link Renderer} is * <p>The scaling mode only applies if a {@link MediaCodec}-based video {@link Renderer} is
......
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
...@@ -28,7 +28,6 @@ import static com.google.android.exoplayer2.Renderer.MSG_SET_SCALING_MODE; ...@@ -28,7 +28,6 @@ import static com.google.android.exoplayer2.Renderer.MSG_SET_SCALING_MODE;
import static com.google.android.exoplayer2.Renderer.MSG_SET_SKIP_SILENCE_ENABLED; import static com.google.android.exoplayer2.Renderer.MSG_SET_SKIP_SILENCE_ENABLED;
import static com.google.android.exoplayer2.Renderer.MSG_SET_VIDEO_EFFECTS; import static com.google.android.exoplayer2.Renderer.MSG_SET_VIDEO_EFFECTS;
import static com.google.android.exoplayer2.Renderer.MSG_SET_VIDEO_FRAME_METADATA_LISTENER; import static com.google.android.exoplayer2.Renderer.MSG_SET_VIDEO_FRAME_METADATA_LISTENER;
import static com.google.android.exoplayer2.Renderer.MSG_SET_VIDEO_FRAME_PROCESSOR_FACTORY;
import static com.google.android.exoplayer2.Renderer.MSG_SET_VIDEO_OUTPUT; import static com.google.android.exoplayer2.Renderer.MSG_SET_VIDEO_OUTPUT;
import static com.google.android.exoplayer2.Renderer.MSG_SET_VIDEO_OUTPUT_RESOLUTION; import static com.google.android.exoplayer2.Renderer.MSG_SET_VIDEO_OUTPUT_RESOLUTION;
import static com.google.android.exoplayer2.Renderer.MSG_SET_VOLUME; import static com.google.android.exoplayer2.Renderer.MSG_SET_VOLUME;
...@@ -95,7 +94,6 @@ import com.google.android.exoplayer2.util.Log; ...@@ -95,7 +94,6 @@ import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.PriorityTaskManager; import com.google.android.exoplayer2.util.PriorityTaskManager;
import com.google.android.exoplayer2.util.Size; import com.google.android.exoplayer2.util.Size;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import com.google.android.exoplayer2.util.VideoFrameProcessor;
import com.google.android.exoplayer2.video.VideoDecoderOutputBufferRenderer; import com.google.android.exoplayer2.video.VideoDecoderOutputBufferRenderer;
import com.google.android.exoplayer2.video.VideoFrameMetadataListener; import com.google.android.exoplayer2.video.VideoFrameMetadataListener;
import com.google.android.exoplayer2.video.VideoRendererEventListener; import com.google.android.exoplayer2.video.VideoRendererEventListener;
...@@ -1255,14 +1253,6 @@ import java.util.concurrent.TimeoutException; ...@@ -1255,14 +1253,6 @@ import java.util.concurrent.TimeoutException;
} }
@Override @Override
public void setVideoFrameProcessorFactory(
VideoFrameProcessor.Factory videoFrameProcessorFactory) {
verifyApplicationThread();
sendRendererMessage(
TRACK_TYPE_VIDEO, MSG_SET_VIDEO_FRAME_PROCESSOR_FACTORY, videoFrameProcessorFactory);
}
@Override
public void setVideoScalingMode(@C.VideoScalingMode int videoScalingMode) { public void setVideoScalingMode(@C.VideoScalingMode int videoScalingMode) {
verifyApplicationThread(); verifyApplicationThread();
this.videoScalingMode = videoScalingMode; this.videoScalingMode = videoScalingMode;
......
library/core/src/main/java/com/google/android/exoplayer2/Renderer.java
...@@ -29,7 +29,6 @@ import com.google.android.exoplayer2.util.Effect; ...@@ -29,7 +29,6 @@ import com.google.android.exoplayer2.util.Effect;
import com.google.android.exoplayer2.util.MediaClock; import com.google.android.exoplayer2.util.MediaClock;
import com.google.android.exoplayer2.util.Size; import com.google.android.exoplayer2.util.Size;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import com.google.android.exoplayer2.util.VideoFrameProcessor;
import com.google.android.exoplayer2.video.VideoDecoderOutputBufferRenderer; import com.google.android.exoplayer2.video.VideoDecoderOutputBufferRenderer;
import com.google.android.exoplayer2.video.VideoFrameMetadataListener; import com.google.android.exoplayer2.video.VideoFrameMetadataListener;
import com.google.android.exoplayer2.video.spherical.CameraMotionListener; import com.google.android.exoplayer2.video.spherical.CameraMotionListener;
...@@ -87,9 +86,9 @@ public interface Renderer extends PlayerMessage.Target { ...@@ -87,9 +86,9 @@ public interface Renderer extends PlayerMessage.Target {
* #MSG_SET_SCALING_MODE}, {@link #MSG_SET_CHANGE_FRAME_RATE_STRATEGY}, {@link * #MSG_SET_SCALING_MODE}, {@link #MSG_SET_CHANGE_FRAME_RATE_STRATEGY}, {@link
* #MSG_SET_AUX_EFFECT_INFO}, {@link #MSG_SET_VIDEO_FRAME_METADATA_LISTENER}, {@link * #MSG_SET_AUX_EFFECT_INFO}, {@link #MSG_SET_VIDEO_FRAME_METADATA_LISTENER}, {@link
* #MSG_SET_CAMERA_MOTION_LISTENER}, {@link #MSG_SET_SKIP_SILENCE_ENABLED}, {@link * #MSG_SET_CAMERA_MOTION_LISTENER}, {@link #MSG_SET_SKIP_SILENCE_ENABLED}, {@link
* #MSG_SET_AUDIO_SESSION_ID}, {@link #MSG_SET_WAKEUP_LISTENER}, {@link #MSG_SET_VIDEO_EFFECTS}, * #MSG_SET_AUDIO_SESSION_ID}, {@link #MSG_SET_WAKEUP_LISTENER}, {@link #MSG_SET_VIDEO_EFFECTS} or
* {@link #MSG_SET_VIDEO_FRAME_PROCESSOR_FACTORY} or {@link #MSG_SET_VIDEO_OUTPUT_RESOLUTION}. May * {@link #MSG_SET_VIDEO_OUTPUT_RESOLUTION}. May also be an app-defined value (see {@link
* also be an app-defined value (see {@link #MSG_CUSTOM_BASE}). * #MSG_CUSTOM_BASE}).
*/ */
@Documented @Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
...@@ -109,7 +108,6 @@ public interface Renderer extends PlayerMessage.Target { ...@@ -109,7 +108,6 @@ public interface Renderer extends PlayerMessage.Target {
MSG_SET_AUDIO_SESSION_ID, MSG_SET_AUDIO_SESSION_ID,
MSG_SET_WAKEUP_LISTENER, MSG_SET_WAKEUP_LISTENER,
MSG_SET_VIDEO_EFFECTS, MSG_SET_VIDEO_EFFECTS,
MSG_SET_VIDEO_FRAME_PROCESSOR_FACTORY,
MSG_SET_VIDEO_OUTPUT_RESOLUTION MSG_SET_VIDEO_OUTPUT_RESOLUTION
}) })
public @interface MessageType {} public @interface MessageType {}
...@@ -218,16 +216,11 @@ public interface Renderer extends PlayerMessage.Target { ...@@ -218,16 +216,11 @@ public interface Renderer extends PlayerMessage.Target {
*/ */
int MSG_SET_VIDEO_EFFECTS = 13; int MSG_SET_VIDEO_EFFECTS = 13;
/** /**
* The type of a message that can be passed to a video renderer. The message payload should be a
* {@link VideoFrameProcessor.Factory}.
*/
int MSG_SET_VIDEO_FRAME_PROCESSOR_FACTORY = 14;
/**
* The type of a message that can be passed to a video renderer to set the desired output * The type of a message that can be passed to a video renderer to set the desired output
* resolution. The message payload should be a {@link Size} of the desired output width and * resolution. The message payload should be a {@link Size} of the desired output width and
* height. Use this method only when playing with video {@linkplain Effect effects}. * height. Use this method only when playing with video {@linkplain Effect effects}.
*/ */
int MSG_SET_VIDEO_OUTPUT_RESOLUTION = 15; int MSG_SET_VIDEO_OUTPUT_RESOLUTION = 14;
/** /**
* Applications or extensions may define custom {@code MSG_*} constants that can be passed to * Applications or extensions may define custom {@code MSG_*} constants that can be passed to
* renderers. These custom constants must be greater than or equal to this value. * renderers. These custom constants must be greater than or equal to this value.
......
library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
...@@ -48,7 +48,6 @@ import com.google.android.exoplayer2.util.ConditionVariable; ...@@ -48,7 +48,6 @@ import com.google.android.exoplayer2.util.ConditionVariable;
import com.google.android.exoplayer2.util.Effect; import com.google.android.exoplayer2.util.Effect;
import com.google.android.exoplayer2.util.PriorityTaskManager; import com.google.android.exoplayer2.util.PriorityTaskManager;
import com.google.android.exoplayer2.util.Size; import com.google.android.exoplayer2.util.Size;
import com.google.android.exoplayer2.util.VideoFrameProcessor;
import com.google.android.exoplayer2.video.VideoFrameMetadataListener; import com.google.android.exoplayer2.video.VideoFrameMetadataListener;
import com.google.android.exoplayer2.video.VideoSize; import com.google.android.exoplayer2.video.VideoSize;
import com.google.android.exoplayer2.video.spherical.CameraMotionListener; import com.google.android.exoplayer2.video.spherical.CameraMotionListener;
...@@ -662,13 +661,6 @@ public class SimpleExoPlayer extends BasePlayer ...@@ -662,13 +661,6 @@ public class SimpleExoPlayer extends BasePlayer
} }
@Override @Override
public void setVideoFrameProcessorFactory(
VideoFrameProcessor.Factory videoFrameProcessorFactory) {
blockUntilConstructorFinished();
player.setVideoFrameProcessorFactory(videoFrameProcessorFactory);
}
@Override
public void setSkipSilenceEnabled(boolean skipSilenceEnabled) { public void setSkipSilenceEnabled(boolean skipSilenceEnabled) {
blockUntilConstructorFinished(); blockUntilConstructorFinished();
player.setSkipSilenceEnabled(skipSilenceEnabled); player.setSkipSilenceEnabled(skipSilenceEnabled);
......
library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
...@@ -683,11 +683,6 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer { ...@@ -683,11 +683,6 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
List<Effect> videoEffects = (List<Effect>) checkNotNull(message); List<Effect> videoEffects = (List<Effect>) checkNotNull(message);
videoFrameProcessorManager.setVideoEffects(videoEffects); videoFrameProcessorManager.setVideoEffects(videoEffects);
break; break;
case MSG_SET_VIDEO_FRAME_PROCESSOR_FACTORY:
VideoFrameProcessor.Factory videoFrameProcessorFactory =
(VideoFrameProcessor.Factory) checkNotNull(message);
videoFrameProcessorManager.setVideoFrameProcessorFactory(videoFrameProcessorFactory);
break;
case MSG_SET_VIDEO_OUTPUT_RESOLUTION: case MSG_SET_VIDEO_OUTPUT_RESOLUTION:
Size outputResolution = (Size) checkNotNull(message); Size outputResolution = (Size) checkNotNull(message);
if (outputResolution.getWidth() != 0 if (outputResolution.getWidth() != 0
...@@ -1877,7 +1872,6 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer { ...@@ -1877,7 +1872,6 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
private final ArrayDeque<Pair<Long, Format>> pendingFrameFormats; private final ArrayDeque<Pair<Long, Format>> pendingFrameFormats;
private @MonotonicNonNull Handler handler; private @MonotonicNonNull Handler handler;
private VideoFrameProcessor.@MonotonicNonNull Factory videoFrameProcessorFactory;
@Nullable private VideoFrameProcessor videoFrameProcessor; @Nullable private VideoFrameProcessor videoFrameProcessor;
@Nullable private CopyOnWriteArrayList<Effect> videoEffects; @Nullable private CopyOnWriteArrayList<Effect> videoEffects;
@Nullable private Format inputFormat; @Nullable private Format inputFormat;
...@@ -1939,12 +1933,6 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer { ...@@ -1939,12 +1933,6 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
this.videoEffects.addAll(videoEffects); this.videoEffects.addAll(videoEffects);
} }
/** Sets the {@link VideoFrameProcessor.Factory}. */
public void setVideoFrameProcessorFactory(
VideoFrameProcessor.Factory videoFrameProcessorFactory) {
this.videoFrameProcessorFactory = videoFrameProcessorFactory;
}
/** Returns whether video frame processing is enabled. */ /** Returns whether video frame processing is enabled. */
public boolean isEnabled() { public boolean isEnabled() {
return videoFrameProcessor != null; return videoFrameProcessor != null;
...@@ -2017,69 +2005,66 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer { ...@@ -2017,69 +2005,66 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
VideoFrameProcessorAccessor.createRotationEffect(inputFormat.rotationDegrees)); VideoFrameProcessorAccessor.createRotationEffect(inputFormat.rotationDegrees));
} }
videoFrameProcessorFactory =
videoFrameProcessorFactory == null
? VideoFrameProcessorAccessor.getFrameProcessorFactory()
: videoFrameProcessorFactory;
videoFrameProcessor = videoFrameProcessor =
videoFrameProcessorFactory.create( VideoFrameProcessorAccessor.getFrameProcessorFactory()
renderer.context, .create(
checkNotNull(videoEffects), renderer.context,
DebugViewProvider.NONE, checkNotNull(videoEffects),
inputAndOutputColorInfos.first, DebugViewProvider.NONE,
inputAndOutputColorInfos.second, inputAndOutputColorInfos.first,
/* renderFramesAutomatically= */ false, inputAndOutputColorInfos.second,
/* listenerExecutor= */ handler::post, /* renderFramesAutomatically= */ false,
new VideoFrameProcessor.Listener() { /* listenerExecutor= */ handler::post,
@Override new VideoFrameProcessor.Listener() {
public void onOutputSizeChanged(int width, int height) { @Override
@Nullable Format inputFormat = VideoFrameProcessorManager.this.inputFormat; public void onOutputSizeChanged(int width, int height) {
checkStateNotNull(inputFormat); @Nullable Format inputFormat = VideoFrameProcessorManager.this.inputFormat;
// TODO(b/264889146): Handle Effect that changes output size based on pts. checkStateNotNull(inputFormat);
processedFrameSize = // TODO(b/264889146): Handle Effect that changes output size based on pts.
new VideoSize( processedFrameSize =
width, new VideoSize(
height, width,
// VideoFrameProcessor is configured to produce rotation free height,
// frames. // VideoFrameProcessor is configured to produce rotation free
/* unappliedRotationDegrees= */ 0, // frames.
// VideoFrameProcessor always outputs pixelWidthHeightRatio 1. /* unappliedRotationDegrees= */ 0,
/* pixelWidthHeightRatio= */ 1.f); // VideoFrameProcessor always outputs pixelWidthHeightRatio 1.
pendingOutputSizeChange = true; /* pixelWidthHeightRatio= */ 1.f);
} pendingOutputSizeChange = true;
}
@Override
public void onOutputFrameAvailableForRendering(long presentationTimeUs) { @Override
if (registeredLastFrame) { public void onOutputFrameAvailableForRendering(long presentationTimeUs) {
checkState(lastCodecBufferPresentationTimestampUs != C.TIME_UNSET); if (registeredLastFrame) {
} checkState(lastCodecBufferPresentationTimestampUs != C.TIME_UNSET);
processedFramesTimestampsUs.add(presentationTimeUs); }
// TODO(b/257464707) Support extensively modified media. processedFramesTimestampsUs.add(presentationTimeUs);
if (registeredLastFrame // TODO(b/257464707) Support extensively modified media.
&& presentationTimeUs >= lastCodecBufferPresentationTimestampUs) { if (registeredLastFrame
processedLastFrame = true; && presentationTimeUs >= lastCodecBufferPresentationTimestampUs) {
} processedLastFrame = true;
if (pendingOutputSizeChange) { }
// Report the size change on releasing this frame. if (pendingOutputSizeChange) {
pendingOutputSizeChange = false; // Report the size change on releasing this frame.
pendingOutputSizeChangeNotificationTimeUs = presentationTimeUs; pendingOutputSizeChange = false;
} pendingOutputSizeChangeNotificationTimeUs = presentationTimeUs;
} }
}
@Override
public void onError(VideoFrameProcessingException exception) { @Override
renderer.setPendingPlaybackException( public void onError(VideoFrameProcessingException exception) {
renderer.createRendererException( renderer.setPendingPlaybackException(
exception, renderer.createRendererException(
inputFormat, exception,
PlaybackException.ERROR_CODE_VIDEO_FRAME_PROCESSING_FAILED)); inputFormat,
} PlaybackException.ERROR_CODE_VIDEO_FRAME_PROCESSING_FAILED));
}
@Override
public void onEnded() { @Override
throw new IllegalStateException(); public void onEnded() {
} throw new IllegalStateException();
}); }
});
videoFrameProcessor.registerInputStream(VideoFrameProcessor.INPUT_TYPE_SURFACE); videoFrameProcessor.registerInputStream(VideoFrameProcessor.INPUT_TYPE_SURFACE);
this.initialStreamOffsetUs = initialStreamOffsetUs; this.initialStreamOffsetUs = initialStreamOffsetUs;
} catch (Exception e) { } catch (Exception e) {
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
...@@ -38,7 +38,6 @@ import com.google.android.exoplayer2.trackselection.TrackSelector; ...@@ -38,7 +38,6 @@ import com.google.android.exoplayer2.trackselection.TrackSelector;
import com.google.android.exoplayer2.util.Clock; import com.google.android.exoplayer2.util.Clock;
import com.google.android.exoplayer2.util.Effect; import com.google.android.exoplayer2.util.Effect;
import com.google.android.exoplayer2.util.PriorityTaskManager; import com.google.android.exoplayer2.util.PriorityTaskManager;
import com.google.android.exoplayer2.util.VideoFrameProcessor;
import com.google.android.exoplayer2.video.VideoFrameMetadataListener; import com.google.android.exoplayer2.video.VideoFrameMetadataListener;
import com.google.android.exoplayer2.video.spherical.CameraMotionListener; import com.google.android.exoplayer2.video.spherical.CameraMotionListener;
import java.util.List; import java.util.List;
...@@ -249,12 +248,6 @@ public class StubExoPlayer extends StubPlayer implements ExoPlayer { ...@@ -249,12 +248,6 @@ public class StubExoPlayer extends StubPlayer implements ExoPlayer {
} }
@Override @Override
public void setVideoFrameProcessorFactory(
VideoFrameProcessor.Factory videoFrameProcessorFactory) {
throw new UnsupportedOperationException();
}
@Override
public void setVideoScalingMode(int videoScalingMode) { public void setVideoScalingMode(int videoScalingMode) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
......
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