From b1ebd0e2a68414eb8d7d3aae24b0b6a00e66b9b8 Mon Sep 17 00:00:00 2001 From: tofunmi Date: Tue, 9 May 2023 12:19:29 +0000 Subject: [PATCH] Change order of operations in videoSamplePipeline similar error to https://github.com/androidx/media/commit/9baa6f6be54716271505fa159854afb457977e3cL `registerInputStream` sets the textureManager, so reordering makes sure the textureManager is set before you set the frame info. This is important for texture input, where the frame info provides the width and height. PiperOrigin-RevId: 530579584 --- .../media3/transformer/VideoSamplePipeline.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/VideoSamplePipeline.java b/libraries/transformer/src/main/java/androidx/media3/transformer/VideoSamplePipeline.java index 622f5e1db8..2cff9695a8 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/VideoSamplePipeline.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/VideoSamplePipeline.java @@ -210,12 +210,6 @@ import org.checkerframework.dataflow.qual.Pure; boolean isLast) { if (trackFormat != null) { Size decodedSize = getDecodedSize(trackFormat); - videoFrameProcessor.setInputFrameInfo( - new FrameInfo.Builder(decodedSize.getWidth(), decodedSize.getHeight()) - .setPixelWidthHeightRatio(trackFormat.pixelWidthHeightRatio) - .setOffsetToAddUs(mediaItemOffsetUs.get()) - .build()); - String mimeType = checkNotNull(trackFormat.sampleMimeType); if (MimeTypes.isVideo(mimeType)) { videoFrameProcessor.registerInputStream(INPUT_TYPE_SURFACE); @@ -224,6 +218,11 @@ import org.checkerframework.dataflow.qual.Pure; } else { throw new IllegalArgumentException("MIME type not supported " + mimeType); } + videoFrameProcessor.setInputFrameInfo( + new FrameInfo.Builder(decodedSize.getWidth(), decodedSize.getHeight()) + .setPixelWidthHeightRatio(trackFormat.pixelWidthHeightRatio) + .setOffsetToAddUs(mediaItemOffsetUs.get()) + .build()); } mediaItemOffsetUs.addAndGet(durationUs); }