Skip to content

SDK / exoplayer

Go to a project
Commit 4f46e679 by huangdarwin Committed by Ian Baker
Options

Transformer GL: Undo accidental setResolution changes(). 

Accidental changes were introduced in http://https://github.com/androidx/media/commit/c07c4cc95dc4ff625e4f95d8f5c06d31141c6fd8

PiperOrigin-RevId: 406858888
parent c3fbe2e1
Inline Side-by-side
Showing with 0 additions and 33 deletions
libraries/transformer/src/main/java/androidx/media3/transformer/TranscodingTransformer.java
...@@ -43,7 +43,6 @@ import androidx.media3.common.Player; ...@@ -43,7 +43,6 @@ import androidx.media3.common.Player;
import androidx.media3.common.Timeline; import androidx.media3.common.Timeline;
import androidx.media3.common.TracksInfo; import androidx.media3.common.TracksInfo;
import androidx.media3.common.util.Clock; import androidx.media3.common.util.Clock;
import androidx.media3.common.util.Log;
import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.UnstableApi;
import androidx.media3.common.util.Util; import androidx.media3.common.util.Util;
import androidx.media3.exoplayer.DefaultLoadControl; import androidx.media3.exoplayer.DefaultLoadControl;
...@@ -94,16 +93,12 @@ public final class TranscodingTransformer { ...@@ -94,16 +93,12 @@ public final class TranscodingTransformer {
/** A builder for {@link TranscodingTransformer} instances. */ /** A builder for {@link TranscodingTransformer} instances. */
public static final class Builder { public static final class Builder {
// Mandatory field.
private @MonotonicNonNull Context context; private @MonotonicNonNull Context context;
// Optional fields.
private @MonotonicNonNull MediaSourceFactory mediaSourceFactory; private @MonotonicNonNull MediaSourceFactory mediaSourceFactory;
private Muxer.Factory muxerFactory; private Muxer.Factory muxerFactory;
private boolean removeAudio; private boolean removeAudio;
private boolean removeVideo; private boolean removeVideo;
private boolean flattenForSlowMotion; private boolean flattenForSlowMotion;
private int outputHeight;
private String outputMimeType; private String outputMimeType;
@Nullable private String audioMimeType; @Nullable private String audioMimeType;
@Nullable private String videoMimeType; @Nullable private String videoMimeType;
...@@ -128,7 +123,6 @@ public final class TranscodingTransformer { ...@@ -128,7 +123,6 @@ public final class TranscodingTransformer {
this.removeAudio = transcodingTransformer.transformation.removeAudio; this.removeAudio = transcodingTransformer.transformation.removeAudio;
this.removeVideo = transcodingTransformer.transformation.removeVideo; this.removeVideo = transcodingTransformer.transformation.removeVideo;
this.flattenForSlowMotion = transcodingTransformer.transformation.flattenForSlowMotion; this.flattenForSlowMotion = transcodingTransformer.transformation.flattenForSlowMotion;
this.outputHeight = transcodingTransformer.transformation.outputHeight;
this.outputMimeType = transcodingTransformer.transformation.outputMimeType; this.outputMimeType = transcodingTransformer.transformation.outputMimeType;
this.audioMimeType = transcodingTransformer.transformation.audioMimeType; this.audioMimeType = transcodingTransformer.transformation.audioMimeType;
this.videoMimeType = transcodingTransformer.transformation.videoMimeType; this.videoMimeType = transcodingTransformer.transformation.videoMimeType;
...@@ -222,21 +216,6 @@ public final class TranscodingTransformer { ...@@ -222,21 +216,6 @@ public final class TranscodingTransformer {
} }
/** /**
* Sets the output resolution for the video, using the output height. The default value is to
* use the same height as the input. Output width will scale to preserve the input video's
* aspect ratio.
*
* <p>For example, a 1920x1440 video can be scaled to 640x480 by calling setResolution(480).
*
* @param outputHeight The output height for the video, in pixels.
* @return This builder.
*/
public Builder setResolution(int outputHeight) {
this.outputHeight = outputHeight;
return this;
}
/**
* Sets the MIME type of the output. The default value is {@link MimeTypes#VIDEO_MP4}. Supported * Sets the MIME type of the output. The default value is {@link MimeTypes#VIDEO_MP4}. Supported
* values are: * values are:
* *
...@@ -379,12 +358,6 @@ public final class TranscodingTransformer { ...@@ -379,12 +358,6 @@ public final class TranscodingTransformer {
checkState( checkState(
muxerFactory.supportsOutputMimeType(outputMimeType), muxerFactory.supportsOutputMimeType(outputMimeType),
"Unsupported output MIME type: " + outputMimeType); "Unsupported output MIME type: " + outputMimeType);
// TODO(ME): Test with values of 10, 100, 1000).
Log.e("TranscodingTransformer", "outputHeight = " + outputHeight);
if (outputHeight == 0) {
// TODO(ME): get output height from input video.
outputHeight = 480;
}
if (audioMimeType != null) { if (audioMimeType != null) {
checkSampleMimeType(audioMimeType); checkSampleMimeType(audioMimeType);
} }
...@@ -396,7 +369,6 @@ public final class TranscodingTransformer { ...@@ -396,7 +369,6 @@ public final class TranscodingTransformer {
removeAudio, removeAudio,
removeVideo, removeVideo,
flattenForSlowMotion, flattenForSlowMotion,
outputHeight,
outputMimeType, outputMimeType,
audioMimeType, audioMimeType,
videoMimeType); videoMimeType);
......
libraries/transformer/src/main/java/androidx/media3/transformer/Transformation.java
...@@ -24,7 +24,6 @@ import androidx.annotation.Nullable; ...@@ -24,7 +24,6 @@ import androidx.annotation.Nullable;
public final boolean removeAudio; public final boolean removeAudio;
public final boolean removeVideo; public final boolean removeVideo;
public final boolean flattenForSlowMotion; public final boolean flattenForSlowMotion;
public final int outputHeight;
public final String outputMimeType; public final String outputMimeType;
@Nullable public final String audioMimeType; @Nullable public final String audioMimeType;
@Nullable public final String videoMimeType; @Nullable public final String videoMimeType;
...@@ -33,14 +32,12 @@ import androidx.annotation.Nullable; ...@@ -33,14 +32,12 @@ import androidx.annotation.Nullable;
boolean removeAudio, boolean removeAudio,
boolean removeVideo, boolean removeVideo,
boolean flattenForSlowMotion, boolean flattenForSlowMotion,
int outputHeight,
String outputMimeType, String outputMimeType,
@Nullable String audioMimeType, @Nullable String audioMimeType,
@Nullable String videoMimeType) { @Nullable String videoMimeType) {
this.removeAudio = removeAudio; this.removeAudio = removeAudio;
this.removeVideo = removeVideo; this.removeVideo = removeVideo;
this.flattenForSlowMotion = flattenForSlowMotion; this.flattenForSlowMotion = flattenForSlowMotion;
this.outputHeight = outputHeight;
this.outputMimeType = outputMimeType; this.outputMimeType = outputMimeType;
this.audioMimeType = audioMimeType; this.audioMimeType = audioMimeType;
this.videoMimeType = videoMimeType; this.videoMimeType = videoMimeType;
......
libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java
...@@ -299,13 +299,11 @@ public final class Transformer { ...@@ -299,13 +299,11 @@ public final class Transformer {
checkState( checkState(
muxerFactory.supportsOutputMimeType(outputMimeType), muxerFactory.supportsOutputMimeType(outputMimeType),
"Unsupported output MIME type: " + outputMimeType); "Unsupported output MIME type: " + outputMimeType);
int outputHeight = 0; // TODO(ME): How do we get the input height here?
Transformation transformation = Transformation transformation =
new Transformation( new Transformation(
removeAudio, removeAudio,
removeVideo, removeVideo,
flattenForSlowMotion, flattenForSlowMotion,
outputHeight,
outputMimeType, outputMimeType,
/* audioMimeType= */ null, /* audioMimeType= */ null,
/* videoMimeType= */ null); /* videoMimeType= */ null);
......
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