From a23f655cf4a4fbc88b086de7d0ef7a57bad2b576 Mon Sep 17 00:00:00 2001 From: samrobinson Date: Mon, 5 Aug 2024 08:07:21 -0700 Subject: [PATCH] Check AssetLoader supports output type required by TransformerInternal. PiperOrigin-RevId: 659557063 --- .../androidx/media3/transformer/SequenceAssetLoader.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/SequenceAssetLoader.java b/libraries/transformer/src/main/java/androidx/media3/transformer/SequenceAssetLoader.java index 28bf548583..2ce97eb3fd 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/SequenceAssetLoader.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/SequenceAssetLoader.java @@ -229,7 +229,13 @@ import java.util.concurrent.atomic.AtomicInteger; inputFormat); if (!isCurrentAssetFirstAsset) { - return isAudio ? decodeAudio : decodeVideo; + boolean decode = isAudio ? decodeAudio : decodeVideo; + if (decode) { + checkArgument((supportedOutputTypes & SUPPORTED_OUTPUT_TYPE_DECODED) != 0); + } else { + checkArgument((supportedOutputTypes & SUPPORTED_OUTPUT_TYPE_ENCODED) != 0); + } + return decode; } boolean addForcedAudioTrack = forceAudioTrack && reportedTrackCount.get() == 1 && !isAudio;