From cf85d1bdc8c2518815ca78aa018157a2e755a667 Mon Sep 17 00:00:00 2001 From: hschlueter Date: Thu, 17 Feb 2022 18:30:41 +0000 Subject: [PATCH] Only allow HEVC output MIME selection in demo for API>=24. The muxer doesn't support HEVC below API 24. The is documented in the TransformationRequest javadoc and the Transformer.Builder will throw if HEVC is requested below API 24 so the option should not be part of the demo for those devices. #mse-bug-week PiperOrigin-RevId: 429343805 --- .../media3/demo/transformer/ConfigurationActivity.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/demos/transformer/src/main/java/androidx/media3/demo/transformer/ConfigurationActivity.java b/demos/transformer/src/main/java/androidx/media3/demo/transformer/ConfigurationActivity.java index efc9e53d7a..b6a447768c 100644 --- a/demos/transformer/src/main/java/androidx/media3/demo/transformer/ConfigurationActivity.java +++ b/demos/transformer/src/main/java/androidx/media3/demo/transformer/ConfigurationActivity.java @@ -33,6 +33,7 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; import androidx.media3.common.MimeTypes; +import androidx.media3.common.util.Util; import java.util.Arrays; import java.util.List; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; @@ -122,11 +123,10 @@ public final class ConfigurationActivity extends AppCompatActivity { videoMimeSpinner = findViewById(R.id.video_mime_spinner); videoMimeSpinner.setAdapter(videoMimeAdapter); videoMimeAdapter.addAll( - SAME_AS_INPUT_OPTION, - MimeTypes.VIDEO_H263, - MimeTypes.VIDEO_H264, - MimeTypes.VIDEO_H265, - MimeTypes.VIDEO_MP4V); + SAME_AS_INPUT_OPTION, MimeTypes.VIDEO_H263, MimeTypes.VIDEO_H264, MimeTypes.VIDEO_MP4V); + if (Util.SDK_INT >= 24) { + videoMimeAdapter.add(MimeTypes.VIDEO_H265); + } ArrayAdapter resolutionHeightAdapter = new ArrayAdapter<>(/* context= */ this, R.layout.spinner_item);