From 1f3a5e7d1c5fab2bcad0bec05e2deaea1651191f Mon Sep 17 00:00:00 2001 From: sheenachhabra Date: Thu, 3 Apr 2025 07:30:20 -0700 Subject: [PATCH] Do not allow video transmuxing if there are video gaps PiperOrigin-RevId: 743555458 --- .../java/androidx/media3/transformer/TransformerInternal.java | 3 +-- .../main/java/androidx/media3/transformer/TransformerUtil.java | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerInternal.java b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerInternal.java index 10641dff33..9dded38f80 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerInternal.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerInternal.java @@ -756,8 +756,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; private void createEncodedSampleExporter(@C.TrackType int trackType) { checkState(assetLoaderInputTracker.getSampleExporter(trackType) == null); checkArgument( - trackType != TRACK_TYPE_AUDIO || !composition.sequences.get(sequenceIndex).hasGaps(), - "Gaps can not be transmuxed."); + !composition.sequences.get(sequenceIndex).hasGaps(), "Gaps can not be transmuxed."); assetLoaderInputTracker.registerSampleExporter( trackType, new EncodedSampleExporter( diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerUtil.java b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerUtil.java index 7a0445244f..d0803721cc 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerUtil.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerUtil.java @@ -18,7 +18,6 @@ package androidx.media3.transformer; import static androidx.media3.common.ColorInfo.SDR_BT709_LIMITED; import static androidx.media3.common.ColorInfo.isTransferHdr; -import static androidx.media3.common.util.Assertions.checkArgument; import static androidx.media3.exoplayer.mediacodec.MediaCodecUtil.getAlternativeCodecMimeType; import static androidx.media3.transformer.Composition.HDR_MODE_KEEP_HDR; import static androidx.media3.transformer.Composition.HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_OPEN_GL; @@ -91,8 +90,6 @@ public final class TransformerUtil { MuxerWrapper muxerWrapper) { if (composition.sequences.size() > 1 || composition.sequences.get(sequenceIndex).editedMediaItems.size() > 1) { - checkArgument( - !composition.hasGaps() || !composition.transmuxAudio, "Gaps can not be transmuxed."); return !composition.transmuxAudio; } if (composition.hasGaps()) {