Skip to content

SDK / exoplayer

Go to a project
Commit 1d968c3a by kimvde Committed by christosts
Options

Remove ParcelFileDescriptor output from Transformer 

ParcelFileDescriptor is quite specific and removing it allows to have
less overloads of startTransformation.

A follow-up CL will undeprecate the overload that takes a MediaItem.

PiperOrigin-RevId: 505670321
parent 0d4e29ff
Inline Side-by-side
Showing with 18 additions and 149 deletions
RELEASENOTES.md
......@@ -73,6 +73,8 @@
Use `ExoPlayerAssetLoader.Factory(MediaSource.Factory)` and
`Transformer.Builder.setAssetLoaderFactory(AssetLoader.Factory)`
instead.
* Remove `Transformer.startTransformation(MediaItem,
ParcelFileDescriptor)`.
* Remove deprecated symbols:
* Remove `DefaultAudioSink` constructors, use `DefaultAudioSink.Builder`
instead.
......
libraries/transformer/src/main/java/androidx/media3/transformer/DefaultMuxer.java
......@@ -15,7 +15,6 @@
*/
package androidx.media3.transformer;
import android.os.ParcelFileDescriptor;
import androidx.media3.common.C;
import androidx.media3.common.Format;
import androidx.media3.common.util.UnstableApi;
......@@ -68,11 +67,6 @@ public final class DefaultMuxer implements Muxer {
}
@Override
public Muxer create(ParcelFileDescriptor parcelFileDescriptor) throws MuxerException {
return new DefaultMuxer(muxerFactory.create(parcelFileDescriptor));
}
@Override
public ImmutableList<String> getSupportedSampleMimeTypes(@C.TrackType int trackType) {
return muxerFactory.getSupportedSampleMimeTypes(trackType);
}
......
libraries/transformer/src/main/java/androidx/media3/transformer/FrameworkMuxer.java
......@@ -24,9 +24,7 @@ import android.annotation.SuppressLint;
import android.media.MediaCodec;
import android.media.MediaFormat;
import android.media.MediaMuxer;
import android.os.ParcelFileDescriptor;
import android.util.SparseLongArray;
import androidx.annotation.RequiresApi;
import androidx.media3.common.C;
import androidx.media3.common.Format;
import androidx.media3.common.MimeTypes;
......@@ -75,21 +73,6 @@ import java.nio.ByteBuffer;
return new FrameworkMuxer(mediaMuxer, maxDelayBetweenSamplesMs, videoDurationMs);
}
@RequiresApi(26)
@Override
public FrameworkMuxer create(ParcelFileDescriptor parcelFileDescriptor) throws MuxerException {
MediaMuxer mediaMuxer;
try {
mediaMuxer =
new MediaMuxer(
parcelFileDescriptor.getFileDescriptor(),
MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4);
} catch (IOException e) {
throw new MuxerException("Error creating muxer", e);
}
return new FrameworkMuxer(mediaMuxer, maxDelayBetweenSamplesMs, videoDurationMs);
}
@Override
public ImmutableList<String> getSupportedSampleMimeTypes(@C.TrackType int trackType) {
if (trackType == C.TRACK_TYPE_VIDEO) {
......
libraries/transformer/src/main/java/androidx/media3/transformer/Muxer.java
......@@ -15,7 +15,6 @@
*/
package androidx.media3.transformer;
import android.os.ParcelFileDescriptor;
import androidx.media3.common.C;
import androidx.media3.common.Format;
import androidx.media3.common.MimeTypes;
......@@ -60,18 +59,6 @@ public interface Muxer {
Muxer create(String path) throws MuxerException;
/**
* Returns a new muxer writing to a file descriptor.
*
* @param parcelFileDescriptor A readable and writable {@link ParcelFileDescriptor} of the
* output. The file referenced by this ParcelFileDescriptor should not be used before the
* muxer is released. It is the responsibility of the caller to close the
* ParcelFileDescriptor. This can be done after this method returns.
* @throws IllegalArgumentException If the file descriptor is invalid.
* @throws MuxerException If an error occurs opening the output file descriptor for writing.
*/
Muxer create(ParcelFileDescriptor parcelFileDescriptor) throws MuxerException;
/**
* Returns the supported sample {@linkplain MimeTypes MIME types} for the given {@link
* C.TrackType}.
*/
......
libraries/transformer/src/main/java/androidx/media3/transformer/MuxerWrapper.java
......@@ -23,7 +23,6 @@ import static java.lang.Math.max;
import static java.lang.Math.min;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import android.os.ParcelFileDescriptor;
import android.util.SparseArray;
import androidx.annotation.IntRange;
import androidx.annotation.Nullable;
......@@ -65,8 +64,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
*/
private static final long MAX_TRACK_WRITE_AHEAD_US = Util.msToUs(500);
@Nullable private final String outputPath;
@Nullable private final ParcelFileDescriptor outputParcelFileDescriptor;
private final String outputPath;
private final Muxer.Factory muxerFactory;
private final Listener listener;
private final SparseArray<TrackInfo> trackTypeToInfo;
......@@ -82,17 +80,8 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
private boolean isAborted;
private @MonotonicNonNull Muxer muxer;
public MuxerWrapper(
@Nullable String outputPath,
@Nullable ParcelFileDescriptor outputParcelFileDescriptor,
Muxer.Factory muxerFactory,
Listener listener) {
if (outputPath == null && outputParcelFileDescriptor == null) {
throw new NullPointerException("Both output path and ParcelFileDescriptor are null");
}
public MuxerWrapper(String outputPath, Muxer.Factory muxerFactory, Listener listener) {
this.outputPath = outputPath;
this.outputParcelFileDescriptor = outputParcelFileDescriptor;
this.muxerFactory = muxerFactory;
this.listener = listener;
......@@ -302,25 +291,13 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
@EnsuresNonNull("muxer")
private void ensureMuxerInitialized() throws Muxer.MuxerException {
if (muxer == null) {
if (outputPath != null) {
muxer = muxerFactory.create(outputPath);
} else {
checkNotNull(outputParcelFileDescriptor);
muxer = muxerFactory.create(outputParcelFileDescriptor);
}
muxer = muxerFactory.create(outputPath);
}
}
/** Returns the current size in bytes of the output, or {@link C#LENGTH_UNSET} if unavailable. */
private long getCurrentOutputSizeBytes() {
long fileSize = C.LENGTH_UNSET;
if (outputPath != null) {
fileSize = new File(outputPath).length();
} else if (outputParcelFileDescriptor != null) {
fileSize = outputParcelFileDescriptor.getStatSize();
}
long fileSize = new File(outputPath).length();
return fileSize > 0 ? fileSize : C.LENGTH_UNSET;
}
......
libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java
......@@ -21,10 +21,8 @@ import static java.lang.annotation.ElementType.TYPE_USE;
import android.content.Context;
import android.os.Looper;
import android.os.ParcelFileDescriptor;
import androidx.annotation.IntDef;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.annotation.VisibleForTesting;
import androidx.media3.common.C;
import androidx.media3.common.DebugViewProvider;
......@@ -151,8 +149,8 @@ public final class Transformer {
/**
* @deprecated Set the {@linkplain AudioProcessor audio processors} in an {@link
* EditedMediaItem}, and pass it to {@link #startTransformation(EditedMediaItem, String)} or
* {@link #startTransformation(EditedMediaItem, ParcelFileDescriptor)} instead.
* EditedMediaItem}, and pass it to {@link #startTransformation(EditedMediaItem, String)}
* instead.
*/
@CanIgnoreReturnValue
@Deprecated
......@@ -163,8 +161,7 @@ public final class Transformer {
/**
* @deprecated Set the {@linkplain Effect video effects} in an {@link EditedMediaItem}, and pass
* it to {@link #startTransformation(EditedMediaItem, String)} or {@link
* #startTransformation(EditedMediaItem, ParcelFileDescriptor)} instead.
* it to {@link #startTransformation(EditedMediaItem, String)} instead.
*/
@CanIgnoreReturnValue
@Deprecated
......@@ -176,7 +173,7 @@ public final class Transformer {
/**
* @deprecated Use {@link EditedMediaItem.Builder#setRemoveAudio(boolean)} to remove the audio
* from the {@link EditedMediaItem} passed to {@link #startTransformation(EditedMediaItem,
* String)} or {@link #startTransformation(EditedMediaItem, ParcelFileDescriptor)} instead.
* String)} instead.
*/
@CanIgnoreReturnValue
@Deprecated
......@@ -188,7 +185,7 @@ public final class Transformer {
/**
* @deprecated Use {@link EditedMediaItem.Builder#setRemoveVideo(boolean)} to remove the video
* from the {@link EditedMediaItem} passed to {@link #startTransformation(EditedMediaItem,
* String)} or {@link #startTransformation(EditedMediaItem, ParcelFileDescriptor)} instead.
* String)} instead.
*/
@CanIgnoreReturnValue
@Deprecated
......@@ -200,7 +197,7 @@ public final class Transformer {
/**
* @deprecated Use {@link EditedMediaItem.Builder#setFlattenForSlowMotion(boolean)} to flatten
* the {@link EditedMediaItem} passed to {@link #startTransformation(EditedMediaItem,
* String)} or {@link #startTransformation(EditedMediaItem, ParcelFileDescriptor)} instead.
* String)} instead.
*/
@CanIgnoreReturnValue
@Deprecated
......@@ -279,8 +276,7 @@ public final class Transformer {
/**
* @deprecated Set the {@link FrameProcessor.Factory} in an {@link EditedMediaItem}, and pass it
* to {@link #startTransformation(EditedMediaItem, String)} or {@link
* #startTransformation(EditedMediaItem, ParcelFileDescriptor)} instead.
* to {@link #startTransformation(EditedMediaItem, String)} instead.
*/
@CanIgnoreReturnValue
@Deprecated
......@@ -673,42 +669,7 @@ public final class Transformer {
* @throws IllegalStateException If a transformation is already in progress.
*/
public void startTransformation(EditedMediaItem editedMediaItem, String path) {
startTransformationInternal(editedMediaItem, path, /* parcelFileDescriptor= */ null);
}
/**
* Starts an asynchronous operation to transform the given {@link MediaItem}.
*
* <p>The transformation state is notified through the {@linkplain Builder#addListener(Listener)
* listener}.
*
* <p>Concurrent transformations on the same Transformer object are not allowed.
*
* <p>If no custom {@link Muxer.Factory} is specified, the output is an MP4 file.
*
* <p>The output can contain at most one video track and one audio track. Other track types are
* ignored. For adaptive bitrate, if no custom {@link AssetLoader.Factory} is specified, the
* highest bitrate video and audio streams are selected.
*
* <p>If encoding the output's video track is needed, the output frames' dimensions will be
* swapped if the height is larger than the width. This is to improve compatibility among
* different device encoders.
*
* @param editedMediaItem The {@link MediaItem} to transform, with the transformations to apply to
* it.
* @param parcelFileDescriptor A readable and writable {@link ParcelFileDescriptor} of the output.
* The file referenced by this ParcelFileDescriptor should not be used before the
* transformation is completed. It is the responsibility of the caller to close the
* ParcelFileDescriptor. This can be done after this method returns.
* @throws IllegalArgumentException If the file descriptor is invalid.
* @throws IllegalArgumentException If the {@link MediaItem} is not supported.
* @throws IllegalStateException If this method is called from the wrong thread.
* @throws IllegalStateException If a transformation is already in progress.
*/
@RequiresApi(26)
public void startTransformation(
EditedMediaItem editedMediaItem, ParcelFileDescriptor parcelFileDescriptor) {
startTransformationInternal(editedMediaItem, /* path= */ null, parcelFileDescriptor);
startTransformationInternal(editedMediaItem, path);
}
/**
......@@ -728,34 +689,10 @@ public final class Transformer {
.setFlattenForSlowMotion(flattenForSlowMotion)
.setEffects(new Effects(audioProcessors, videoEffects, frameProcessorFactory))
.build();
startTransformationInternal(editedMediaItem, path, /* parcelFileDescriptor= */ null);
}
/**
* @deprecated Use {@link #startTransformation(EditedMediaItem, ParcelFileDescriptor)} instead.
*/
@Deprecated
@RequiresApi(26)
public void startTransformation(MediaItem mediaItem, ParcelFileDescriptor parcelFileDescriptor) {
if (!mediaItem.clippingConfiguration.equals(MediaItem.ClippingConfiguration.UNSET)
&& flattenForSlowMotion) {
throw new IllegalArgumentException(
"Clipping is not supported when slow motion flattening is requested");
}
EditedMediaItem editedMediaItem =
new EditedMediaItem.Builder(mediaItem)
.setRemoveAudio(removeAudio)
.setRemoveVideo(removeVideo)
.setFlattenForSlowMotion(flattenForSlowMotion)
.setEffects(new Effects(audioProcessors, videoEffects, frameProcessorFactory))
.build();
startTransformationInternal(editedMediaItem, /* path= */ null, parcelFileDescriptor);
startTransformationInternal(editedMediaItem, path);
}
private void startTransformationInternal(
EditedMediaItem editedMediaItem,
@Nullable String path,
@Nullable ParcelFileDescriptor parcelFileDescriptor) {
private void startTransformationInternal(EditedMediaItem editedMediaItem, String path) {
verifyApplicationThread();
if (transformerInternal != null) {
throw new IllegalStateException("There is already a transformation in progress.");
......@@ -771,7 +708,6 @@ public final class Transformer {
context,
editedMediaItem,
path,
parcelFileDescriptor,
transformationRequest,
generateSilentAudio,
assetLoaderFactory,
......
libraries/transformer/src/main/java/androidx/media3/transformer/TransformerInternal.java
......@@ -28,7 +28,6 @@ import android.content.Context;
import android.os.HandlerThread;
import android.os.Looper;
import android.os.Message;
import android.os.ParcelFileDescriptor;
import androidx.annotation.IntDef;
import androidx.annotation.Nullable;
import androidx.media3.common.C;
......@@ -113,8 +112,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
public TransformerInternal(
Context context,
EditedMediaItem editedMediaItem,
@Nullable String outputPath,
@Nullable ParcelFileDescriptor outputParcelFileDescriptor,
String outputPath,
TransformationRequest transformationRequest,
boolean generateSilentAudio,
AssetLoader.Factory assetLoaderFactory,
......@@ -144,8 +142,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
.setFlattenVideoForSlowMotion(editedMediaItem.flattenForSlowMotion)
.createAssetLoader(editedMediaItem.mediaItem, internalLooper, componentListener);
samplePipelines = new ArrayList<>();
muxerWrapper =
new MuxerWrapper(outputPath, outputParcelFileDescriptor, muxerFactory, componentListener);
muxerWrapper = new MuxerWrapper(outputPath, muxerFactory, componentListener);
transformerConditionVariable = new ConditionVariable();
transformationResultBuilder = new TransformationResult.Builder();
// It's safe to use "this" because we don't send a message before exiting the constructor.
......
libraries/transformer/src/test/java/androidx/media3/transformer/TransformerEndToEndTest.java
......@@ -39,7 +39,6 @@ import android.os.Handler;
import android.os.HandlerThread;
import android.os.Looper;
import android.os.Message;
import android.os.ParcelFileDescriptor;
import android.view.Surface;
import androidx.annotation.Nullable;
import androidx.media3.common.C;
......@@ -1141,12 +1140,6 @@ public final class TransformerEndToEndTest {
}
@Override
public Muxer create(ParcelFileDescriptor parcelFileDescriptor) throws Muxer.MuxerException {
testMuxer = new TestMuxer("FD:" + parcelFileDescriptor.getFd(), defaultMuxerFactory);
return testMuxer;
}
@Override
public ImmutableList<String> getSupportedSampleMimeTypes(@C.TrackType int trackType) {
return defaultMuxerFactory.getSupportedSampleMimeTypes(trackType);
}
......
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