diff --git a/demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/TransformerActivity.java b/demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/TransformerActivity.java index 0f30174a89..5ec929b87c 100644 --- a/demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/TransformerActivity.java +++ b/demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/TransformerActivity.java @@ -317,7 +317,7 @@ public final class TransformerActivity extends AppCompatActivity { if (selectedEffects[5]) { effects.add(MatrixTransformationFactory.createZoomInTransition()); } - transformerBuilder.setVideoFrameEffects(effects.build()); + transformerBuilder.setVideoEffects(effects.build()); } if (bundle.getBoolean(ConfigurationActivity.ENABLE_DEBUG_PREVIEW)) { diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java index 9397c2a036..ff0c57b93f 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java @@ -101,7 +101,7 @@ public final class Transformer { private boolean removeVideo; private String containerMimeType; private TransformationRequest transformationRequest; - private ImmutableList videoFrameEffects; + private ImmutableList videoEffects; private ListenerSet listeners; private DebugViewProvider debugViewProvider; private Looper looper; @@ -125,7 +125,7 @@ public final class Transformer { debugViewProvider = DebugViewProvider.NONE; containerMimeType = MimeTypes.VIDEO_MP4; transformationRequest = new TransformationRequest.Builder().build(); - videoFrameEffects = ImmutableList.of(); + videoEffects = ImmutableList.of(); } /** Creates a builder with the values of the provided {@link Transformer}. */ @@ -137,7 +137,7 @@ public final class Transformer { this.removeVideo = transformer.removeVideo; this.containerMimeType = transformer.containerMimeType; this.transformationRequest = transformer.transformationRequest; - this.videoFrameEffects = transformer.videoFrameEffects; + this.videoEffects = transformer.videoEffects; this.listeners = transformer.listeners; this.looper = transformer.looper; this.encoderFactory = transformer.encoderFactory; @@ -174,8 +174,8 @@ public final class Transformer { * @param effects The {@linkplain GlEffect effects} to apply to each video frame. * @return This builder. */ - public Builder setVideoFrameEffects(List effects) { - this.videoFrameEffects = ImmutableList.copyOf(effects); + public Builder setVideoEffects(List effects) { + this.videoEffects = ImmutableList.copyOf(effects); return this; } @@ -420,7 +420,7 @@ public final class Transformer { removeVideo, containerMimeType, transformationRequest, - videoFrameEffects, + videoEffects, listeners, looper, clock, @@ -544,7 +544,7 @@ public final class Transformer { private final boolean removeVideo; private final String containerMimeType; private final TransformationRequest transformationRequest; - private final ImmutableList videoFrameEffects; + private final ImmutableList videoEffects; private final Looper looper; private final Clock clock; private final Transformer.DebugViewProvider debugViewProvider; @@ -565,7 +565,7 @@ public final class Transformer { boolean removeVideo, String containerMimeType, TransformationRequest transformationRequest, - ImmutableList videoFrameEffects, + ImmutableList videoEffects, ListenerSet listeners, Looper looper, Clock clock, @@ -580,7 +580,7 @@ public final class Transformer { this.removeVideo = removeVideo; this.containerMimeType = containerMimeType; this.transformationRequest = transformationRequest; - this.videoFrameEffects = videoFrameEffects; + this.videoEffects = videoEffects; this.listeners = listeners; this.looper = looper; this.clock = clock; @@ -729,7 +729,7 @@ public final class Transformer { removeVideo, transformationRequest, mediaItem.clippingConfiguration.startsAtKeyFrame, - videoFrameEffects, + videoEffects, encoderFactory, decoderFactory, new FallbackListener(mediaItem, listeners, transformationRequest), @@ -843,7 +843,7 @@ public final class Transformer { private final boolean removeVideo; private final TransformationRequest transformationRequest; private final boolean clippingStartsAtKeyFrame; - private final ImmutableList videoFrameEffects; + private final ImmutableList videoEffects; private final Codec.EncoderFactory encoderFactory; private final Codec.DecoderFactory decoderFactory; private final FallbackListener fallbackListener; @@ -857,7 +857,7 @@ public final class Transformer { boolean removeVideo, TransformationRequest transformationRequest, boolean clippingStartsAtKeyFrame, - ImmutableList videoFrameEffects, + ImmutableList videoEffects, Codec.EncoderFactory encoderFactory, Codec.DecoderFactory decoderFactory, FallbackListener fallbackListener, @@ -869,7 +869,7 @@ public final class Transformer { this.removeVideo = removeVideo; this.transformationRequest = transformationRequest; this.clippingStartsAtKeyFrame = clippingStartsAtKeyFrame; - this.videoFrameEffects = videoFrameEffects; + this.videoEffects = videoEffects; this.encoderFactory = encoderFactory; this.decoderFactory = decoderFactory; this.fallbackListener = fallbackListener; @@ -908,7 +908,7 @@ public final class Transformer { mediaClock, transformationRequest, clippingStartsAtKeyFrame, - videoFrameEffects, + videoEffects, encoderFactory, decoderFactory, asyncErrorListener,