loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-29 22:36:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not allow video transmuxing if there are video gaps

Browse Source 
PiperOrigin-RevId: 743555458
This commit is contained in:
sheenachhabra 2025-04-03 07:30:20 -07:00 committed by Copybara-Service
parent ee611a1ab8
commit 1f3a5e7d1c
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/transformer/src/main/java/androidx/media3/transformer/TransformerInternal.java
View File

@ -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(

3
libraries/transformer/src/main/java/androidx/media3/transformer/TransformerUtil.java
View File

@ -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()) {