Skip to content

SDK / exoplayer

Go to a project
Commit 89e14989 by kimvde Committed by Rohit Singh
Options

Remove setScale and setRotationDegrees from TransformationRequest 

Also remove usages of TransformationRequest convenience methods
(setScale, setRotationDegrees and setResolution).

Some usages of setResolution can't be removed yet because they are used
for fallback.

PiperOrigin-RevId: 502415748
parent 2656284e
Inline Side-by-side
Showing with 74 additions and 150 deletions
demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/TransformerActivity.java
...@@ -58,9 +58,11 @@ import com.google.android.exoplayer2.effect.GlTextureProcessor; ...@@ -58,9 +58,11 @@ import com.google.android.exoplayer2.effect.GlTextureProcessor;
import com.google.android.exoplayer2.effect.HslAdjustment; import com.google.android.exoplayer2.effect.HslAdjustment;
import com.google.android.exoplayer2.effect.OverlayEffect; import com.google.android.exoplayer2.effect.OverlayEffect;
import com.google.android.exoplayer2.effect.OverlaySettings; import com.google.android.exoplayer2.effect.OverlaySettings;
import com.google.android.exoplayer2.effect.Presentation;
import com.google.android.exoplayer2.effect.RgbAdjustment; import com.google.android.exoplayer2.effect.RgbAdjustment;
import com.google.android.exoplayer2.effect.RgbFilter; import com.google.android.exoplayer2.effect.RgbFilter;
import com.google.android.exoplayer2.effect.RgbMatrix; import com.google.android.exoplayer2.effect.RgbMatrix;
import com.google.android.exoplayer2.effect.ScaleToFitTransformation;
import com.google.android.exoplayer2.effect.SingleColorLut; import com.google.android.exoplayer2.effect.SingleColorLut;
import com.google.android.exoplayer2.effect.TextOverlay; import com.google.android.exoplayer2.effect.TextOverlay;
import com.google.android.exoplayer2.effect.TextureOverlay; import com.google.android.exoplayer2.effect.TextureOverlay;
...@@ -278,43 +280,51 @@ public final class TransformerActivity extends AppCompatActivity { ...@@ -278,43 +280,51 @@ public final class TransformerActivity extends AppCompatActivity {
if (videoMimeType != null) { if (videoMimeType != null) {
requestBuilder.setVideoMimeType(videoMimeType); requestBuilder.setVideoMimeType(videoMimeType);
} }
requestBuilder.setHdrMode(bundle.getInt(ConfigurationActivity.HDR_MODE));
transformerBuilder.setTransformationRequest(requestBuilder.build());
transformerBuilder.setAudioProcessors(createAudioProcessorsFromBundle(bundle));
ImmutableList.Builder<Effect> effectsListBuilder =
new ImmutableList.Builder<Effect>().addAll(createVideoEffectsFromBundle(bundle));
float scaleX = bundle.getFloat(ConfigurationActivity.SCALE_X, /* defaultValue= */ 1);
float scaleY = bundle.getFloat(ConfigurationActivity.SCALE_Y, /* defaultValue= */ 1);
float rotateDegrees =
bundle.getFloat(ConfigurationActivity.ROTATE_DEGREES, /* defaultValue= */ 0);
if (scaleX != 1f || scaleY != 1f || rotateDegrees != 0f) {
effectsListBuilder.add(
new ScaleToFitTransformation.Builder()
.setScale(scaleX, scaleY)
.setRotationDegrees(rotateDegrees)
.build());
}
int resolutionHeight = int resolutionHeight =
bundle.getInt( bundle.getInt(
ConfigurationActivity.RESOLUTION_HEIGHT, /* defaultValue= */ C.LENGTH_UNSET); ConfigurationActivity.RESOLUTION_HEIGHT, /* defaultValue= */ C.LENGTH_UNSET);
if (resolutionHeight != C.LENGTH_UNSET) { if (resolutionHeight != C.LENGTH_UNSET) {
requestBuilder.setResolution(resolutionHeight); effectsListBuilder.add(Presentation.createForHeight(resolutionHeight));
} }
transformerBuilder.setVideoEffects(effectsListBuilder.build());
float scaleX = bundle.getFloat(ConfigurationActivity.SCALE_X, /* defaultValue= */ 1);
float scaleY = bundle.getFloat(ConfigurationActivity.SCALE_Y, /* defaultValue= */ 1);
requestBuilder.setScale(scaleX, scaleY);
float rotateDegrees =
bundle.getFloat(ConfigurationActivity.ROTATE_DEGREES, /* defaultValue= */ 0);
requestBuilder.setRotationDegrees(rotateDegrees);
requestBuilder.setHdrMode(bundle.getInt(ConfigurationActivity.HDR_MODE));
transformerBuilder transformerBuilder
.setTransformationRequest(requestBuilder.build())
.setRemoveAudio(bundle.getBoolean(ConfigurationActivity.SHOULD_REMOVE_AUDIO)) .setRemoveAudio(bundle.getBoolean(ConfigurationActivity.SHOULD_REMOVE_AUDIO))
.setRemoveVideo(bundle.getBoolean(ConfigurationActivity.SHOULD_REMOVE_VIDEO)) .setRemoveVideo(bundle.getBoolean(ConfigurationActivity.SHOULD_REMOVE_VIDEO))
.experimentalSetForceSilentAudio(
bundle.getBoolean(ConfigurationActivity.FORCE_SILENT_AUDIO))
.setEncoderFactory( .setEncoderFactory(
new DefaultEncoderFactory.Builder(this.getApplicationContext()) new DefaultEncoderFactory.Builder(this.getApplicationContext())
.setEnableFallback(bundle.getBoolean(ConfigurationActivity.ENABLE_FALLBACK)) .setEnableFallback(bundle.getBoolean(ConfigurationActivity.ENABLE_FALLBACK))
.build()); .build());
transformerBuilder.setAudioProcessors(createAudioProcessorsFromBundle(bundle)); if (!bundle.getBoolean(ConfigurationActivity.ABORT_SLOW_TRANSFORMATION)) {
transformerBuilder.setVideoEffects(createVideoEffectsFromBundle(bundle)); transformerBuilder.setMuxerFactory(
new DefaultMuxer.Factory(/* maxDelayBetweenSamplesMs= */ C.TIME_UNSET));
}
if (bundle.getBoolean(ConfigurationActivity.ENABLE_DEBUG_PREVIEW)) { if (bundle.getBoolean(ConfigurationActivity.ENABLE_DEBUG_PREVIEW)) {
transformerBuilder.setDebugViewProvider(new DemoDebugViewProvider()); transformerBuilder.setDebugViewProvider(new DemoDebugViewProvider());
} }
if (!bundle.getBoolean(ConfigurationActivity.ABORT_SLOW_TRANSFORMATION)) { transformerBuilder.experimentalSetForceSilentAudio(
transformerBuilder.setMuxerFactory( bundle.getBoolean(ConfigurationActivity.FORCE_SILENT_AUDIO));
new DefaultMuxer.Factory(/* maxDelayBetweenSamplesMs= */ C.TIME_UNSET));
}
} }
return transformerBuilder return transformerBuilder
......
library/effect/src/main/java/com/google/android/exoplayer2/effect/ScaleToFitTransformation.java
...@@ -72,6 +72,10 @@ public final class ScaleToFitTransformation implements MatrixTransformation { ...@@ -72,6 +72,10 @@ public final class ScaleToFitTransformation implements MatrixTransformation {
* *
* <p>The default value, 0, corresponds to not applying any rotation. * <p>The default value, 0, corresponds to not applying any rotation.
* *
* <p>The output frame's width and height are automatically adjusted to preserve all input
* pixels. The rotated input frame is fitted inside an enclosing black rectangle if its edges
* aren't parallel to the x and y axes.
*
* @param rotationDegrees The counterclockwise rotation, in degrees. * @param rotationDegrees The counterclockwise rotation, in degrees.
* @return This builder. * @return This builder.
*/ */
......
library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/TransformerEndToEndTest.java
...@@ -26,6 +26,8 @@ import androidx.test.core.app.ApplicationProvider; ...@@ -26,6 +26,8 @@ import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.effect.Presentation;
import com.google.common.collect.ImmutableList;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
...@@ -42,8 +44,7 @@ public class TransformerEndToEndTest { ...@@ -42,8 +44,7 @@ public class TransformerEndToEndTest {
public void videoEditing_completesWithConsistentFrameCount() throws Exception { public void videoEditing_completesWithConsistentFrameCount() throws Exception {
Transformer transformer = Transformer transformer =
new Transformer.Builder(context) new Transformer.Builder(context)
.setTransformationRequest( .setVideoEffects(ImmutableList.of(Presentation.createForHeight(480)))
new TransformationRequest.Builder().setResolution(480).build())
.setEncoderFactory( .setEncoderFactory(
new DefaultEncoderFactory.Builder(context).setEnableFallback(false).build()) new DefaultEncoderFactory.Builder(context).setEnableFallback(false).build())
.build(); .build();
...@@ -66,8 +67,7 @@ public class TransformerEndToEndTest { ...@@ -66,8 +67,7 @@ public class TransformerEndToEndTest {
Transformer transformer = Transformer transformer =
new Transformer.Builder(context) new Transformer.Builder(context)
.setRemoveAudio(true) .setRemoveAudio(true)
.setTransformationRequest( .setVideoEffects(ImmutableList.of(Presentation.createForHeight(480)))
new TransformationRequest.Builder().setResolution(480).build())
.setEncoderFactory( .setEncoderFactory(
new DefaultEncoderFactory.Builder(context).setEnableFallback(false).build()) new DefaultEncoderFactory.Builder(context).setEnableFallback(false).build())
.build(); .build();
......
library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/HdrEditingTest.java
...@@ -30,6 +30,7 @@ import androidx.test.core.app.ApplicationProvider; ...@@ -30,6 +30,7 @@ import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.effect.ScaleToFitTransformation;
import com.google.android.exoplayer2.transformer.EncoderUtil; import com.google.android.exoplayer2.transformer.EncoderUtil;
import com.google.android.exoplayer2.transformer.TransformationException; import com.google.android.exoplayer2.transformer.TransformationException;
import com.google.android.exoplayer2.transformer.TransformationRequest; import com.google.android.exoplayer2.transformer.TransformationRequest;
...@@ -39,6 +40,7 @@ import com.google.android.exoplayer2.transformer.TransformerAndroidTestRunner; ...@@ -39,6 +40,7 @@ import com.google.android.exoplayer2.transformer.TransformerAndroidTestRunner;
import com.google.android.exoplayer2.util.Log; import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import com.google.android.exoplayer2.video.ColorInfo; import com.google.android.exoplayer2.video.ColorInfo;
import com.google.common.collect.ImmutableList;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
...@@ -121,8 +123,9 @@ public class HdrEditingTest { ...@@ -121,8 +123,9 @@ public class HdrEditingTest {
Transformer transformer = Transformer transformer =
new Transformer.Builder(context) new Transformer.Builder(context)
.setTransformationRequest( .setVideoEffects(
new TransformationRequest.Builder().setRotationDegrees(180).build()) ImmutableList.of(
new ScaleToFitTransformation.Builder().setRotationDegrees(180).build()))
.build(); .build();
TransformationTestResult transformationTestResult = TransformationTestResult transformationTestResult =
...@@ -144,8 +147,9 @@ public class HdrEditingTest { ...@@ -144,8 +147,9 @@ public class HdrEditingTest {
Transformer transformer = Transformer transformer =
new Transformer.Builder(context) new Transformer.Builder(context)
.setTransformationRequest( .setVideoEffects(
new TransformationRequest.Builder().setRotationDegrees(180).build()) ImmutableList.of(
new ScaleToFitTransformation.Builder().setRotationDegrees(180).build()))
.build(); .build();
TransformationTestResult transformationTestResult = TransformationTestResult transformationTestResult =
...@@ -169,8 +173,9 @@ public class HdrEditingTest { ...@@ -169,8 +173,9 @@ public class HdrEditingTest {
AtomicBoolean isToneMappingFallbackApplied = new AtomicBoolean(); AtomicBoolean isToneMappingFallbackApplied = new AtomicBoolean();
Transformer transformer = Transformer transformer =
new Transformer.Builder(context) new Transformer.Builder(context)
.setTransformationRequest( .setVideoEffects(
new TransformationRequest.Builder().setRotationDegrees(180).build()) ImmutableList.of(
new ScaleToFitTransformation.Builder().setRotationDegrees(180).build()))
.addListener( .addListener(
new Transformer.Listener() { new Transformer.Listener() {
@Override @Override
...@@ -222,8 +227,9 @@ public class HdrEditingTest { ...@@ -222,8 +227,9 @@ public class HdrEditingTest {
AtomicBoolean isToneMappingFallbackApplied = new AtomicBoolean(); AtomicBoolean isToneMappingFallbackApplied = new AtomicBoolean();
Transformer transformer = Transformer transformer =
new Transformer.Builder(context) new Transformer.Builder(context)
.setTransformationRequest( .setVideoEffects(
new TransformationRequest.Builder().setRotationDegrees(180).build()) ImmutableList.of(
new ScaleToFitTransformation.Builder().setRotationDegrees(180).build()))
.addListener( .addListener(
new Transformer.Listener() { new Transformer.Listener() {
@Override @Override
...@@ -257,7 +263,6 @@ public class HdrEditingTest { ...@@ -257,7 +263,6 @@ public class HdrEditingTest {
TransformationException.ERROR_CODE_HDR_ENCODING_UNSUPPORTED, TransformationException.ERROR_CODE_HDR_ENCODING_UNSUPPORTED,
TransformationException.ERROR_CODE_DECODING_FORMAT_UNSUPPORTED); TransformationException.ERROR_CODE_DECODING_FORMAT_UNSUPPORTED);
assertThat(isFallbackListenerInvoked.get()).isFalse(); assertThat(isFallbackListenerInvoked.get()).isFalse();
return;
} }
} }
......
library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/RepeatedTranscodeTest.java
...@@ -23,11 +23,13 @@ import android.net.Uri; ...@@ -23,11 +23,13 @@ import android.net.Uri;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.effect.ScaleToFitTransformation;
import com.google.android.exoplayer2.transformer.AndroidTestUtil; import com.google.android.exoplayer2.transformer.AndroidTestUtil;
import com.google.android.exoplayer2.transformer.TransformationRequest; import com.google.android.exoplayer2.transformer.TransformationRequest;
import com.google.android.exoplayer2.transformer.TransformationTestResult; import com.google.android.exoplayer2.transformer.TransformationTestResult;
import com.google.android.exoplayer2.transformer.Transformer; import com.google.android.exoplayer2.transformer.Transformer;
import com.google.android.exoplayer2.transformer.TransformerAndroidTestRunner; import com.google.android.exoplayer2.transformer.TransformerAndroidTestRunner;
import com.google.common.collect.ImmutableList;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import org.junit.Test; import org.junit.Test;
...@@ -46,8 +48,9 @@ public final class RepeatedTranscodeTest { ...@@ -46,8 +48,9 @@ public final class RepeatedTranscodeTest {
new TransformerAndroidTestRunner.Builder( new TransformerAndroidTestRunner.Builder(
context, context,
new Transformer.Builder(context) new Transformer.Builder(context)
.setTransformationRequest( .setVideoEffects(
new TransformationRequest.Builder().setRotationDegrees(45).build()) ImmutableList.of(
new ScaleToFitTransformation.Builder().setRotationDegrees(45).build()))
.setEncoderFactory(new AndroidTestUtil.ForceEncodeEncoderFactory(context)) .setEncoderFactory(new AndroidTestUtil.ForceEncodeEncoderFactory(context))
.build()) .build())
.build(); .build();
...@@ -76,8 +79,9 @@ public final class RepeatedTranscodeTest { ...@@ -76,8 +79,9 @@ public final class RepeatedTranscodeTest {
context, context,
new Transformer.Builder(context) new Transformer.Builder(context)
.setRemoveAudio(true) .setRemoveAudio(true)
.setTransformationRequest( .setVideoEffects(
new TransformationRequest.Builder().setRotationDegrees(45).build()) ImmutableList.of(
new ScaleToFitTransformation.Builder().setRotationDegrees(45).build()))
.setEncoderFactory(new AndroidTestUtil.ForceEncodeEncoderFactory(context)) .setEncoderFactory(new AndroidTestUtil.ForceEncodeEncoderFactory(context))
.build()) .build())
.build(); .build();
......
library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/ToneMapHdrToSdrUsingMediaCodecTest.java
...@@ -27,12 +27,14 @@ import androidx.test.core.app.ApplicationProvider; ...@@ -27,12 +27,14 @@ import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.effect.ScaleToFitTransformation;
import com.google.android.exoplayer2.transformer.TransformationException; import com.google.android.exoplayer2.transformer.TransformationException;
import com.google.android.exoplayer2.transformer.TransformationRequest; import com.google.android.exoplayer2.transformer.TransformationRequest;
import com.google.android.exoplayer2.transformer.TransformationTestResult; import com.google.android.exoplayer2.transformer.TransformationTestResult;
import com.google.android.exoplayer2.transformer.Transformer; import com.google.android.exoplayer2.transformer.Transformer;
import com.google.android.exoplayer2.transformer.TransformerAndroidTestRunner; import com.google.android.exoplayer2.transformer.TransformerAndroidTestRunner;
import com.google.android.exoplayer2.util.Log; import com.google.android.exoplayer2.util.Log;
import com.google.common.collect.ImmutableList;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
...@@ -145,8 +147,10 @@ public class ToneMapHdrToSdrUsingMediaCodecTest { ...@@ -145,8 +147,10 @@ public class ToneMapHdrToSdrUsingMediaCodecTest {
.setTransformationRequest( .setTransformationRequest(
new TransformationRequest.Builder() new TransformationRequest.Builder()
.setHdrMode(TransformationRequest.HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_MEDIACODEC) .setHdrMode(TransformationRequest.HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_MEDIACODEC)
.setRotationDegrees(180)
.build()) .build())
.setVideoEffects(
ImmutableList.of(
new ScaleToFitTransformation.Builder().setRotationDegrees(180).build()))
.addListener( .addListener(
new Transformer.Listener() { new Transformer.Listener() {
@Override @Override
...@@ -191,8 +195,10 @@ public class ToneMapHdrToSdrUsingMediaCodecTest { ...@@ -191,8 +195,10 @@ public class ToneMapHdrToSdrUsingMediaCodecTest {
.setTransformationRequest( .setTransformationRequest(
new TransformationRequest.Builder() new TransformationRequest.Builder()
.setHdrMode(TransformationRequest.HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_MEDIACODEC) .setHdrMode(TransformationRequest.HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_MEDIACODEC)
.setRotationDegrees(180)
.build()) .build())
.setVideoEffects(
ImmutableList.of(
new ScaleToFitTransformation.Builder().setRotationDegrees(180).build()))
.addListener( .addListener(
new Transformer.Listener() { new Transformer.Listener() {
@Override @Override
......
library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/TransformationTest.java
...@@ -29,6 +29,7 @@ import android.net.Uri; ...@@ -29,6 +29,7 @@ import android.net.Uri;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.effect.ScaleToFitTransformation;
import com.google.android.exoplayer2.transformer.AndroidTestUtil; import com.google.android.exoplayer2.transformer.AndroidTestUtil;
import com.google.android.exoplayer2.transformer.AndroidTestUtil.ForceEncodeEncoderFactory; import com.google.android.exoplayer2.transformer.AndroidTestUtil.ForceEncodeEncoderFactory;
import com.google.android.exoplayer2.transformer.DefaultEncoderFactory; import com.google.android.exoplayer2.transformer.DefaultEncoderFactory;
...@@ -37,6 +38,7 @@ import com.google.android.exoplayer2.transformer.Transformer; ...@@ -37,6 +38,7 @@ import com.google.android.exoplayer2.transformer.Transformer;
import com.google.android.exoplayer2.transformer.TransformerAndroidTestRunner; import com.google.android.exoplayer2.transformer.TransformerAndroidTestRunner;
import com.google.android.exoplayer2.transformer.VideoEncoderSettings; import com.google.android.exoplayer2.transformer.VideoEncoderSettings;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import com.google.common.collect.ImmutableList;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
...@@ -195,8 +197,9 @@ public class TransformationTest { ...@@ -195,8 +197,9 @@ public class TransformationTest {
Transformer transformer = Transformer transformer =
new Transformer.Builder(context) new Transformer.Builder(context)
.setTransformationRequest( .setVideoEffects(
new TransformationRequest.Builder().setRotationDegrees(45).build()) ImmutableList.of(
new ScaleToFitTransformation.Builder().setRotationDegrees(45).build()))
.build(); .build();
new TransformerAndroidTestRunner.Builder(context, transformer) new TransformerAndroidTestRunner.Builder(context, transformer)
......
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformationRequest.java
...@@ -109,9 +109,6 @@ public final class TransformationRequest { ...@@ -109,9 +109,6 @@ public final class TransformationRequest {
public static final class Builder { public static final class Builder {
private boolean flattenForSlowMotion; private boolean flattenForSlowMotion;
private float scaleX;
private float scaleY;
private float rotationDegrees;
private int outputHeight; private int outputHeight;
@Nullable private String audioMimeType; @Nullable private String audioMimeType;
@Nullable private String videoMimeType; @Nullable private String videoMimeType;
...@@ -124,16 +121,11 @@ public final class TransformationRequest { ...@@ -124,16 +121,11 @@ public final class TransformationRequest {
* {@link TransformationRequest}. * {@link TransformationRequest}.
*/ */
public Builder() { public Builder() {
scaleX = 1;
scaleY = 1;
outputHeight = C.LENGTH_UNSET; outputHeight = C.LENGTH_UNSET;
} }
private Builder(TransformationRequest transformationRequest) { private Builder(TransformationRequest transformationRequest) {
this.flattenForSlowMotion = transformationRequest.flattenForSlowMotion; this.flattenForSlowMotion = transformationRequest.flattenForSlowMotion;
this.scaleX = transformationRequest.scaleX;
this.scaleY = transformationRequest.scaleY;
this.rotationDegrees = transformationRequest.rotationDegrees;
this.outputHeight = transformationRequest.outputHeight; this.outputHeight = transformationRequest.outputHeight;
this.audioMimeType = transformationRequest.audioMimeType; this.audioMimeType = transformationRequest.audioMimeType;
this.videoMimeType = transformationRequest.videoMimeType; this.videoMimeType = transformationRequest.videoMimeType;
...@@ -176,42 +168,6 @@ public final class TransformationRequest { ...@@ -176,42 +168,6 @@ public final class TransformationRequest {
} }
/** /**
* Sets the x and y axis scaling factors to apply to each frame's width and height, stretching
* the video along these axes appropriately.
*
* <p>The default value for {@code scaleX} and {@code scaleY}, 1, corresponds to not scaling
* along the x and y axes, respectively.
*
* @param scaleX The multiplier by which the frame will scale horizontally, along the x-axis.
* @param scaleY The multiplier by which the frame will scale vertically, along the y-axis.
* @return This builder.
*/
@CanIgnoreReturnValue
public Builder setScale(float scaleX, float scaleY) {
this.scaleX = scaleX;
this.scaleY = scaleY;
return this;
}
/**
* Sets the rotation, in degrees, counterclockwise, to apply to each frame.
*
* <p>The output frame's width and height are automatically adjusted to preserve all input
* pixels. The rotated input frame is fitted inside an enclosing black rectangle if its edges
* aren't parallel to the x and y axes.
*
* <p>The default value, 0, corresponds to not applying any rotation.
*
* @param rotationDegrees The counterclockwise rotation, in degrees.
* @return This builder.
*/
@CanIgnoreReturnValue
public Builder setRotationDegrees(float rotationDegrees) {
this.rotationDegrees = rotationDegrees;
return this;
}
/**
* Sets the output resolution using the output height of the displayed video. * Sets the output resolution using the output height of the displayed video.
* *
* <p>Output width of the displayed video will scale to preserve the video's aspect ratio after * <p>Output width of the displayed video will scale to preserve the video's aspect ratio after
...@@ -219,9 +175,7 @@ public final class TransformationRequest { ...@@ -219,9 +175,7 @@ public final class TransformationRequest {
* *
* <p>For example, a 1920x1440 video can be scaled to 640x480 by calling setResolution(480). * <p>For example, a 1920x1440 video can be scaled to 640x480 by calling setResolution(480).
* *
* <p>The default value, {@link C#LENGTH_UNSET}, leaves the width and height unchanged unless * <p>The default value, {@link C#LENGTH_UNSET}, leaves the width and height unchanged.
* {@linkplain #setScale(float,float) scaling} or @linkplain #setRotationDegrees(float)
* rotation} are requested.
* *
* <p>Note that the output encoded video's dimensions may be swapped from the displayed video's * <p>Note that the output encoded video's dimensions may be swapped from the displayed video's
* dimensions, if the displayed video's height > width. This is to improve compatibility among * dimensions, if the displayed video's height > width. This is to improve compatibility among
...@@ -335,14 +289,7 @@ public final class TransformationRequest { ...@@ -335,14 +289,7 @@ public final class TransformationRequest {
/** Builds a {@link TransformationRequest} instance. */ /** Builds a {@link TransformationRequest} instance. */
public TransformationRequest build() { public TransformationRequest build() {
return new TransformationRequest( return new TransformationRequest(
flattenForSlowMotion, flattenForSlowMotion, outputHeight, audioMimeType, videoMimeType, hdrMode);
scaleX,
scaleY,
rotationDegrees,
outputHeight,
audioMimeType,
videoMimeType,
hdrMode);
} }
} }
...@@ -353,26 +300,6 @@ public final class TransformationRequest { ...@@ -353,26 +300,6 @@ public final class TransformationRequest {
*/ */
public final boolean flattenForSlowMotion; public final boolean flattenForSlowMotion;
/** /**
* The requested scale factor, on the x-axis, of the output video, or 1 if inferred from the
* input.
*
* @see Builder#setScale(float, float)
*/
public final float scaleX;
/**
* The requested scale factor, on the y-axis, of the output video, or 1 if inferred from the
* input.
*
* @see Builder#setScale(float, float)
*/
public final float scaleY;
/**
* The requested rotation, in degrees, of the output video, or 0 if inferred from the input.
*
* @see Builder#setRotationDegrees(float)
*/
public final float rotationDegrees;
/**
* The requested height of the output video, or {@link C#LENGTH_UNSET} if inferred from the input. * The requested height of the output video, or {@link C#LENGTH_UNSET} if inferred from the input.
* *
* @see Builder#setResolution(int) * @see Builder#setResolution(int)
...@@ -401,18 +328,12 @@ public final class TransformationRequest { ...@@ -401,18 +328,12 @@ public final class TransformationRequest {
private TransformationRequest( private TransformationRequest(
boolean flattenForSlowMotion, boolean flattenForSlowMotion,
float scaleX,
float scaleY,
float rotationDegrees,
int outputHeight, int outputHeight,
@Nullable String audioMimeType, @Nullable String audioMimeType,
@Nullable String videoMimeType, @Nullable String videoMimeType,
@HdrMode int hdrMode) { @HdrMode int hdrMode) {
this.flattenForSlowMotion = flattenForSlowMotion; this.flattenForSlowMotion = flattenForSlowMotion;
this.scaleX = scaleX;
this.scaleY = scaleY;
this.rotationDegrees = rotationDegrees;
this.outputHeight = outputHeight; this.outputHeight = outputHeight;
this.audioMimeType = audioMimeType; this.audioMimeType = audioMimeType;
this.videoMimeType = videoMimeType; this.videoMimeType = videoMimeType;
...@@ -429,9 +350,6 @@ public final class TransformationRequest { ...@@ -429,9 +350,6 @@ public final class TransformationRequest {
} }
TransformationRequest that = (TransformationRequest) o; TransformationRequest that = (TransformationRequest) o;
return flattenForSlowMotion == that.flattenForSlowMotion return flattenForSlowMotion == that.flattenForSlowMotion
&& scaleX == that.scaleX
&& scaleY == that.scaleY
&& rotationDegrees == that.rotationDegrees
&& outputHeight == that.outputHeight && outputHeight == that.outputHeight
&& Util.areEqual(audioMimeType, that.audioMimeType) && Util.areEqual(audioMimeType, that.audioMimeType)
&& Util.areEqual(videoMimeType, that.videoMimeType) && Util.areEqual(videoMimeType, that.videoMimeType)
...@@ -441,9 +359,6 @@ public final class TransformationRequest { ...@@ -441,9 +359,6 @@ public final class TransformationRequest {
@Override @Override
public int hashCode() { public int hashCode() {
int result = (flattenForSlowMotion ? 1 : 0); int result = (flattenForSlowMotion ? 1 : 0);
result = 31 * result + Float.floatToIntBits(scaleX);
result = 31 * result + Float.floatToIntBits(scaleY);
result = 31 * result + Float.floatToIntBits(rotationDegrees);
result = 31 * result + outputHeight; result = 31 * result + outputHeight;
result = 31 * result + (audioMimeType != null ? audioMimeType.hashCode() : 0); result = 31 * result + (audioMimeType != null ? audioMimeType.hashCode() : 0);
result = 31 * result + (videoMimeType != null ? videoMimeType.hashCode() : 0); result = 31 * result + (videoMimeType != null ? videoMimeType.hashCode() : 0);
......
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java
...@@ -167,9 +167,7 @@ public final class Transformer { ...@@ -167,9 +167,7 @@ public final class Transformer {
* Sets the {@link Effect} instances to apply to each video frame. * Sets the {@link Effect} instances to apply to each video frame.
* *
* <p>The {@link Effect} instances are applied before any {@linkplain * <p>The {@link Effect} instances are applied before any {@linkplain
* TransformationRequest.Builder#setScale(float, float) scale}, {@linkplain * TransformationRequest.Builder#setResolution(int) resolution} change specified in the {@link
* TransformationRequest.Builder#setRotationDegrees(float) rotation}, or {@linkplain
* TransformationRequest.Builder#setResolution(int) resolution} changes specified in the {@link
* #setTransformationRequest(TransformationRequest) TransformationRequest} but after {@linkplain * #setTransformationRequest(TransformationRequest) TransformationRequest} but after {@linkplain
* TransformationRequest.Builder#setFlattenForSlowMotion(boolean) slow-motion flattening}. * TransformationRequest.Builder#setFlattenForSlowMotion(boolean) slow-motion flattening}.
* *
......
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerInternal.java
...@@ -571,15 +571,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; ...@@ -571,15 +571,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
if (inputFormat.pixelWidthHeightRatio != 1f) { if (inputFormat.pixelWidthHeightRatio != 1f) {
return true; return true;
} }
if (transformationRequest.rotationDegrees != 0f) {
return true;
}
if (transformationRequest.scaleX != 1f) {
return true;
}
if (transformationRequest.scaleY != 1f) {
return true;
}
// The decoder rotates encoded frames for display by inputFormat.rotationDegrees. // The decoder rotates encoded frames for display by inputFormat.rotationDegrees.
int decodedHeight = int decodedHeight =
(inputFormat.rotationDegrees % 180 == 0) ? inputFormat.height : inputFormat.width; (inputFormat.rotationDegrees % 180 == 0) ? inputFormat.height : inputFormat.width;
......
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/VideoSamplePipeline.java
...@@ -34,7 +34,6 @@ import com.google.android.exoplayer2.C; ...@@ -34,7 +34,6 @@ import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.decoder.DecoderInputBuffer; import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
import com.google.android.exoplayer2.effect.Presentation; import com.google.android.exoplayer2.effect.Presentation;
import com.google.android.exoplayer2.effect.ScaleToFitTransformation;
import com.google.android.exoplayer2.util.Consumer; import com.google.android.exoplayer2.util.Consumer;
import com.google.android.exoplayer2.util.DebugViewProvider; import com.google.android.exoplayer2.util.DebugViewProvider;
import com.google.android.exoplayer2.util.Effect; import com.google.android.exoplayer2.util.Effect;
...@@ -133,15 +132,6 @@ import org.checkerframework.dataflow.qual.Pure; ...@@ -133,15 +132,6 @@ import org.checkerframework.dataflow.qual.Pure;
ImmutableList.Builder<Effect> effectsListBuilder = ImmutableList.Builder<Effect> effectsListBuilder =
new ImmutableList.Builder<Effect>().addAll(effects); new ImmutableList.Builder<Effect>().addAll(effects);
if (transformationRequest.scaleX != 1f
|| transformationRequest.scaleY != 1f
|| transformationRequest.rotationDegrees != 0f) {
effectsListBuilder.add(
new ScaleToFitTransformation.Builder()
.setScale(transformationRequest.scaleX, transformationRequest.scaleY)
.setRotationDegrees(transformationRequest.rotationDegrees)
.build());
}
if (transformationRequest.outputHeight != C.LENGTH_UNSET) { if (transformationRequest.outputHeight != C.LENGTH_UNSET) {
effectsListBuilder.add(Presentation.createForHeight(transformationRequest.outputHeight)); effectsListBuilder.add(Presentation.createForHeight(transformationRequest.outputHeight));
} }
......
library/transformer/src/test/java/com/google/android/exoplayer2/transformer/TransformationRequestTest.java
...@@ -38,8 +38,6 @@ public class TransformationRequestTest { ...@@ -38,8 +38,6 @@ public class TransformationRequestTest {
.setFlattenForSlowMotion(true) .setFlattenForSlowMotion(true)
.setAudioMimeType(MimeTypes.AUDIO_AAC) .setAudioMimeType(MimeTypes.AUDIO_AAC)
.setVideoMimeType(MimeTypes.VIDEO_H264) .setVideoMimeType(MimeTypes.VIDEO_H264)
.setRotationDegrees(45)
.setScale(/* scaleX= */ 1f, /* scaleY= */ 2f)
.build(); .build();
} }
} }
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